Imported Upstream version 0.8.998upstream/0.8.998

157 files changed, 18188 insertions, 25209 deletions

diff --git a/docs/Makefile.am b/docs/Makefile.am
index 5a3da7e06..a1d1b9b37 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,50 +1,6 @@
 if WITH_DOCS
 
-SUBDIRS = libnm-glib libnm-util
-
-INCLUDES = \
-	-I$(top_srcdir)/include \
-	-I$(top_srcdir)/libnm-util
-
-noinst_PROGRAMS = \
-	generate-settings-spec
-
-generate_settings_spec_SOURCES = \
-	generate-settings-spec.c
-
-generate_settings_spec_CPPFLAGS = \
-	$(GLIB_CFLAGS) \
-	$(DBUS_CFLAGS)
-
-generate_settings_spec_LDADD = \
-	$(top_builddir)/libnm-util/libnm-util.la \
-	$(GLIB_LIBS) \
-	$(DBUS_LIBS)
-
-XSLTPROC = xsltproc --xinclude --nonet
-XMLS = $(wildcard $(top_srcdir)/introspection/nm-*.xml)
-
-OTHER_FILES= \
-	$(top_srcdir)/introspection/all.xml \
-	$(top_srcdir)/introspection/generic-types.xml \
-	$(top_srcdir)/introspection/errors.xml \
-	$(top_srcdir)/introspection/vpn-errors.xml \
-	$(top_srcdir)/tools/doc-generator.xsl \
-	$(top_srcdir)/introspection/generic-types.xml
-
-GENERATED_FILES = spec.html settings-spec.html
-
-spec.html: $(XMLS) $(OTHER_FILES)
-	$(XSLTPROC) $(top_srcdir)/tools/doc-generator.xsl $(top_srcdir)/introspection/all.xml > $@
-
-settings-spec.html: generate-settings-spec $(top_builddir)/libnm-util/libnm-util.la
-	$(builddir)/generate-settings-spec $(builddir)/settings-spec.html
-
-all: $(GENERATED_FILES)
-
-EXTRA_DIST = $(GENERATED_FILES)
-
-CLEANFILES = $(GENERATED_FILES)
+SUBDIRS = api libnm-glib libnm-util
 
 endif
 
diff --git a/docs/Makefile.in b/docs/Makefile.in
index 59da07ac7..80884d5ca 100644
--- a/docs/Makefile.in
+++ b/docs/Makefile.in
@@ -14,7 +14,6 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
@@ -34,61 +33,34 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-@WITH_DOCS_TRUE@noinst_PROGRAMS = generate-settings-spec$(EXEEXT)
 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/gtk-doc.m4 $(top_srcdir)/m4/intltool.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)/configure.ac
+	$(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)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-PROGRAMS = $(noinst_PROGRAMS)
-am__generate_settings_spec_SOURCES_DIST = generate-settings-spec.c
-@WITH_DOCS_TRUE@am_generate_settings_spec_OBJECTS = generate_settings_spec-generate-settings-spec.$(OBJEXT)
-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)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
-am__v_lt_0 = --silent
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
-CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
-am__v_CCLD_0 = @echo "  CCLD  " $@;
 AM_V_GEN = $(am__v_GEN_$(V))
 am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
 am__v_GEN_0 = @echo "  GEN   " $@;
-SOURCES = $(generate_settings_spec_SOURCES)
-DIST_SOURCES = $(am__generate_settings_spec_SOURCES_DIST)
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
+SOURCES =
+DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
 	install-dvi-recursive install-exec-recursive \
@@ -103,7 +75,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
 	distdir
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = libnm-glib libnm-util
+DIST_SUBDIRS = api libnm-glib libnm-util
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 am__relativize = \
   dir0=`pwd`; \
@@ -131,7 +103,6 @@ am__relativize = \
   done; \
   reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
-ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -140,8 +111,6 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -158,6 +127,7 @@ DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCLIENT_VERSION = @DHCLIENT_VERSION@
 DHCPCD_PATH = @DHCPCD_PATH@
 DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -166,6 +136,7 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GIO_CFLAGS = @GIO_CFLAGS@
 GIO_LIBS = @GIO_LIBS@
@@ -174,8 +145,8 @@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_LIBS = @GLIB_LIBS@
 GMODULE_CFLAGS = @GMODULE_CFLAGS@
 GMODULE_LIBS = @GMODULE_LIBS@
-GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
 GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
 GREP = @GREP@
@@ -190,13 +161,23 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
 INTLLIBS = @INTLLIBS@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 IPTABLES_PATH = @IPTABLES_PATH@
+IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
+IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
@@ -204,6 +185,8 @@ LIBDL = @LIBDL@
 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
 LIBM = @LIBM@
 LIBNL_CFLAGS = @LIBNL_CFLAGS@
 LIBNL_LIBS = @LIBNL_LIBS@
@@ -212,13 +195,15 @@ LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
 NM = @NM@
 NMEDIT = @NMEDIT@
@@ -244,12 +229,9 @@ PKGCONFIG_PATH = @PKGCONFIG_PATH@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-POFILES = @POFILES@
 POLKIT_CFLAGS = @POLKIT_CFLAGS@
 POLKIT_LIBS = @POLKIT_LIBS@
 POSUB = @POSUB@
-PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
 PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
 RANLIB = @RANLIB@
 RESOLVCONF_PATH = @RESOLVCONF_PATH@
@@ -264,10 +246,13 @@ UUID_CFLAGS = @UUID_CFLAGS@
 UUID_LIBS = @UUID_LIBS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -316,40 +301,10 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-@WITH_DOCS_TRUE@SUBDIRS = libnm-glib libnm-util
-@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.c
-
-@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_srcdir)/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.html
-@WITH_DOCS_TRUE@EXTRA_DIST = $(GENERATED_FILES)
-@WITH_DOCS_TRUE@CLEANFILES = $(GENERATED_FILES)
+@WITH_DOCS_TRUE@SUBDIRS = api libnm-glib libnm-util
 all: all-recursive
 
 .SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -381,69 +336,6 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
 
-clean-noinstPROGRAMS:
-	@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
-	echo " rm -f" $$list; \
-	rm -f $$list || exit $$?; \
-	test -n "$(EXEEXT)" || exit 0; \
-	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-	echo " rm -f" $$list; \
-	rm -f $$list
-generate-settings-spec$(EXEEXT): $(generate_settings_spec_OBJECTS) $(generate_settings_spec_DEPENDENCIES) 
-	@rm -f generate-settings-spec$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(generate_settings_spec_OBJECTS) $(generate_settings_spec_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@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_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ $<
-
-.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_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ `$(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_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-generate_settings_spec-generate-settings-spec.o: generate-settings-spec.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(generate_settings_spec_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT generate_settings_spec-generate-settings-spec.o -MD -MP -MF $(DEPDIR)/generate_settings_spec-generate-settings-spec.Tpo -c -o generate_settings_spec-generate-settings-spec.o `test -f 'generate-settings-spec.c' || echo '$(srcdir)/'`generate-settings-spec.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/generate_settings_spec-generate-settings-spec.Tpo $(DEPDIR)/generate_settings_spec-generate-settings-spec.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='generate-settings-spec.c' object='generate_settings_spec-generate-settings-spec.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(generate_settings_spec_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o generate_settings_spec-generate-settings-spec.o `test -f 'generate-settings-spec.c' || echo '$(srcdir)/'`generate-settings-spec.c
-
-generate_settings_spec-generate-settings-spec.obj: generate-settings-spec.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(generate_settings_spec_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT generate_settings_spec-generate-settings-spec.obj -MD -MP -MF $(DEPDIR)/generate_settings_spec-generate-settings-spec.Tpo -c -o generate_settings_spec-generate-settings-spec.obj `if test -f 'generate-settings-spec.c'; then $(CYGPATH_W) 'generate-settings-spec.c'; else $(CYGPATH_W) '$(srcdir)/generate-settings-spec.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/generate_settings_spec-generate-settings-spec.Tpo $(DEPDIR)/generate_settings_spec-generate-settings-spec.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='generate-settings-spec.c' object='generate_settings_spec-generate-settings-spec.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(generate_settings_spec_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o generate_settings_spec-generate-settings-spec.obj `if test -f 'generate-settings-spec.c'; then $(CYGPATH_W) 'generate-settings-spec.c'; else $(CYGPATH_W) '$(srcdir)/generate-settings-spec.c'; fi`
-
 mostlyclean-libtool:
 	-rm -f *.lo
 
@@ -645,7 +537,7 @@ distdir: $(DISTFILES)
 	done
 check-am: all-am
 check: check-recursive
-all-am: Makefile $(PROGRAMS)
+all-am: Makefile
 installdirs: installdirs-recursive
 installdirs-am:
 install: install-recursive
@@ -665,7 +557,6 @@ install-strip:
 mostlyclean-generic:
 
 clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -676,14 +567,11 @@ maintainer-clean-generic:
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-recursive
 
-clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \
-	mostlyclean-am
+clean-am: clean-generic clean-libtool mostlyclean-am
 
 distclean: distclean-recursive
-	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
+distclean-am: clean-am distclean-generic distclean-tags
 
 dvi: dvi-recursive
 
@@ -726,14 +614,12 @@ install-ps-am:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
-	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-recursive
 
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
 
 pdf: pdf-recursive
 
@@ -750,28 +636,19 @@ uninstall-am:
 
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
 	all all-am check check-am clean clean-generic clean-libtool \
-	clean-noinstPROGRAMS ctags ctags-recursive distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
+	ctags ctags-recursive distclean distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
 	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
 	uninstall uninstall-am
 
 
-@WITH_DOCS_TRUE@spec.html: $(XMLS) $(OTHER_FILES)
-@WITH_DOCS_TRUE@	$(XSLTPROC) $(top_srcdir)/tools/doc-generator.xsl $(top_srcdir)/introspection/all.xml > $@
-
-@WITH_DOCS_TRUE@settings-spec.html: generate-settings-spec $(top_builddir)/libnm-util/libnm-util.la
-@WITH_DOCS_TRUE@	$(builddir)/generate-settings-spec $(builddir)/settings-spec.html
-
-@WITH_DOCS_TRUE@all: $(GENERATED_FILES)
-
 # 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.
 .NOEXPORT:
diff --git a/docs/api/Makefile.am b/docs/api/Makefile.am
new file mode 100644
index 000000000..687d9cfb1
--- /dev/null
+++ b/docs/api/Makefile.am
@@ -0,0 +1,88 @@
+GENERATE_SETTINGS_SPEC_SOURCE = generate-settings-spec.c
+
+AUTOMAKE_OPTIONS = 1.7
+
+if WITH_DOCS
+
+INCLUDES = \
+	-I$(top_srcdir)/include \
+	-I$(top_srcdir)/libnm-util
+
+noinst_PROGRAMS = \
+	generate-settings-spec
+
+generate_settings_spec_SOURCES = \
+	$(GENERATE_SETTINGS_SPEC_SOURCE)
+
+generate_settings_spec_CPPFLAGS = \
+	$(GLIB_CFLAGS) \
+	$(DBUS_CFLAGS)
+
+generate_settings_spec_LDADD = \
+	$(top_builddir)/libnm-util/libnm-util.la \
+	$(GLIB_LIBS) \
+	$(DBUS_LIBS)
+
+XSLTPROC = xsltproc --xinclude --nonet
+XMLS = $(wildcard $(top_srcdir)/introspection/nm-*.xml)
+
+OTHER_FILES= \
+	$(top_srcdir)/introspection/all.xml \
+	$(top_srcdir)/introspection/generic-types.xml \
+	$(top_srcdir)/introspection/errors.xml \
+	$(top_srcdir)/introspection/vpn-errors.xml \
+	$(top_srcdir)/tools/doc-generator.xsl \
+	$(top_srcdir)/introspection/generic-types.xml
+
+GENERATED_FILES = spec.html settings-spec.xml
+
+spec.html: $(XMLS) $(OTHER_FILES) html-build.stamp
+	$(XSLTPROC) $(top_srcdir)/tools/doc-generator.xsl $(top_srcdir)/introspection/all.xml > $@
+	mkdir -p $(builddir)/html/
+	cp $@ $(builddir)/html/
+
+settings-spec.xml: generate-settings-spec $(top_builddir)/libnm-util/libnm-util.la
+	rm -f $(builddir)/$@
+	$(builddir)/generate-settings-spec $(builddir)/$@
+
+all: $(GENERATED_FILES)
+
+####################################
+
+# The name of the module.
+DOC_MODULE=NetworkManager
+
+# The top-level SGML file.
+DOC_MAIN_SGML_FILE=network-manager-docs.xml
+
+# Extra options to supply to gtkdoc-mkdb
+MKDB_OPTIONS=--sgml-mode --output-format=xml
+
+# Extra options to supply to gtkdoc-mktmpl
+MKTMPL_OPTIONS=
+
+# Non-autogenerated SGML files to be included in $(DOC_MAIN_SGML_FILE)
+content_files = \
+	version.xml \
+	settings-spec.xml \
+	migrating-to-09.xml \
+	$(NULL)
+
+include $(top_srcdir)/gtk-doc.make
+
+####################################
+
+EXTRA_DIST += $(GENERATED_FILES)
+CLEANFILES += $(GENERATED_FILES)
+
+else
+
+EXTRA_DIST = $(GENERATE_SETTINGS_SPEC_SOURCE)
+CLEANFILES =
+
+endif
+
+EXTRA_DIST += version.xml.in
+
+CLEANFILES += html/* tmpl/* xml/*
+
diff --git a/docs/api/Makefile.in b/docs/api/Makefile.in
new file mode 100644
index 000000000..34935449a
--- /dev/null
+++ b/docs/api/Makefile.in
@@ -0,0 +1,934 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# -*- mode: makefile -*-
+
+####################################
+# Everything below here is generic #
+####################################
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+@WITH_DOCS_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)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES = version.xml
+CONFIG_CLEAN_VPATH_FILES =
+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)
+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)
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+am__v_lt_0 = --silent
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo "  CC    " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo "  CCLD  " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+SOURCES = $(generate_settings_spec_SOURCES)
+DIST_SOURCES = $(am__generate_settings_spec_SOURCES_DIST)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DBUS_CFLAGS = @DBUS_CFLAGS@
+DBUS_LIBS = @DBUS_LIBS@
+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@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+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@
+GMODULE_CFLAGS = @GMODULE_CFLAGS@
+GMODULE_LIBS = @GMODULE_LIBS@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
+GNUTLS_LIBS = @GNUTLS_LIBS@
+GREP = @GREP@
+GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
+GUDEV_CFLAGS = @GUDEV_CFLAGS@
+GUDEV_LIBS = @GUDEV_LIBS@
+HTML_DIR = @HTML_DIR@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+IPTABLES_PATH = @IPTABLES_PATH@
+IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
+IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
+KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBDL = @LIBDL@
+LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
+LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
+LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBM = @LIBM@
+LIBNL_CFLAGS = @LIBNL_CFLAGS@
+LIBNL_LIBS = @LIBNL_LIBS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NM = @NM@
+NMEDIT = @NMEDIT@
+NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
+NM_MICRO_VERSION = @NM_MICRO_VERSION@
+NM_MINOR_VERSION = @NM_MINOR_VERSION@
+NM_VERSION = @NM_VERSION@
+NSS_CFLAGS = @NSS_CFLAGS@
+NSS_LIBS = @NSS_LIBS@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKGCONFIG_PATH = @PKGCONFIG_PATH@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+POLKIT_CFLAGS = @POLKIT_CFLAGS@
+POLKIT_LIBS = @POLKIT_LIBS@
+POSUB = @POSUB@
+PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
+RANLIB = @RANLIB@
+RESOLVCONF_PATH = @RESOLVCONF_PATH@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
+UDEV_BASE_DIR = @UDEV_BASE_DIR@
+USE_NLS = @USE_NLS@
+UUID_CFLAGS = @UUID_CFLAGS@
+UUID_LIBS = @UUID_LIBS@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+systemdsystemunitdir = @systemdsystemunitdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+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_srcdir)/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
+
+####################################
+
+# The name of the module.
+@WITH_DOCS_TRUE@DOC_MODULE = NetworkManager
+
+# The top-level SGML file.
+@WITH_DOCS_TRUE@DOC_MAIN_SGML_FILE = network-manager-docs.xml
+
+# Extra options to supply to gtkdoc-mkdb
+@WITH_DOCS_TRUE@MKDB_OPTIONS = --sgml-mode --output-format=xml
+
+# Extra options to supply to gtkdoc-mktmpl
+@WITH_DOCS_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) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+@GTK_DOC_USE_LIBTOOL_TRUE@@WITH_DOCS_TRUE@GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+@GTK_DOC_USE_LIBTOOL_FALSE@@WITH_DOCS_TRUE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+@GTK_DOC_USE_LIBTOOL_TRUE@@WITH_DOCS_TRUE@GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(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
+
+# 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
+
+@WITH_DOCS_FALSE@EXTRA_DIST = $(GENERATE_SETTINGS_SPEC_SOURCE) \
+@WITH_DOCS_FALSE@	version.xml.in
+
+####################################
+@WITH_DOCS_TRUE@EXTRA_DIST = $(SETUP_FILES) $(GENERATED_FILES) \
+@WITH_DOCS_TRUE@	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@	setup.stamp 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
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/gtk-doc.make $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/api/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu docs/api/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+version.xml: $(top_builddir)/config.status $(srcdir)/version.xml.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+
+clean-noinstPROGRAMS:
+	@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
+generate-settings-spec$(EXEEXT): $(generate_settings_spec_OBJECTS) $(generate_settings_spec_DEPENDENCIES) 
+	@rm -f generate-settings-spec$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(generate_settings_spec_OBJECTS) $(generate_settings_spec_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@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_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ $<
+
+.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_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ `$(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_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+
+generate_settings_spec-generate-settings-spec.o: generate-settings-spec.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(generate_settings_spec_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT generate_settings_spec-generate-settings-spec.o -MD -MP -MF $(DEPDIR)/generate_settings_spec-generate-settings-spec.Tpo -c -o generate_settings_spec-generate-settings-spec.o `test -f 'generate-settings-spec.c' || echo '$(srcdir)/'`generate-settings-spec.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/generate_settings_spec-generate-settings-spec.Tpo $(DEPDIR)/generate_settings_spec-generate-settings-spec.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='generate-settings-spec.c' object='generate_settings_spec-generate-settings-spec.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(generate_settings_spec_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o generate_settings_spec-generate-settings-spec.o `test -f 'generate-settings-spec.c' || echo '$(srcdir)/'`generate-settings-spec.c
+
+generate_settings_spec-generate-settings-spec.obj: generate-settings-spec.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(generate_settings_spec_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT generate_settings_spec-generate-settings-spec.obj -MD -MP -MF $(DEPDIR)/generate_settings_spec-generate-settings-spec.Tpo -c -o generate_settings_spec-generate-settings-spec.obj `if test -f 'generate-settings-spec.c'; then $(CYGPATH_W) 'generate-settings-spec.c'; else $(CYGPATH_W) '$(srcdir)/generate-settings-spec.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/generate_settings_spec-generate-settings-spec.Tpo $(DEPDIR)/generate_settings_spec-generate-settings-spec.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='generate-settings-spec.c' object='generate_settings_spec-generate-settings-spec.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(generate_settings_spec_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o generate_settings_spec-generate-settings-spec.obj `if test -f 'generate-settings-spec.c'; then $(CYGPATH_W) 'generate-settings-spec.c'; else $(CYGPATH_W) '$(srcdir)/generate-settings-spec.c'; fi`
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	set x; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+@WITH_DOCS_FALSE@dist-hook:
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+	$(MAKE) $(AM_MAKEFLAGS) \
+	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
+	  dist-hook
+check-am: all-am
+check: check-am
+@WITH_DOCS_FALSE@all-local:
+all-am: Makefile $(PROGRAMS) all-local
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+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:
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-local clean-noinstPROGRAMS \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-local distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-data-local
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic \
+	maintainer-clean-local
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-local
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am all-local check check-am clean \
+	clean-generic clean-libtool clean-local clean-noinstPROGRAMS \
+	ctags dist-hook distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-local distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-data-local install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic \
+	maintainer-clean-local mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-local
+
+
+@WITH_DOCS_TRUE@spec.html: $(XMLS) $(OTHER_FILES) html-build.stamp
+@WITH_DOCS_TRUE@	$(XSLTPROC) $(top_srcdir)/tools/doc-generator.xsl $(top_srcdir)/introspection/all.xml > $@
+@WITH_DOCS_TRUE@	mkdir -p $(builddir)/html/
+@WITH_DOCS_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)/$@
+
+@WITH_DOCS_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:
+
+@WITH_DOCS_TRUE@docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
+
+@WITH_DOCS_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 'gtk-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 -p $(abs_srcdir)/$$file $(abs_builddir)/; \
+@WITH_DOCS_TRUE@	       done \
+@WITH_DOCS_TRUE@	   fi; \
+@WITH_DOCS_TRUE@	   test -f $(abs_srcdir)/tmpl && \
+@WITH_DOCS_TRUE@	       cp -rp $(abs_srcdir)/tmpl $(abs_builddir)/; \
+@WITH_DOCS_TRUE@	fi
+@WITH_DOCS_TRUE@	@touch setup-build.stamp
+
+@WITH_DOCS_TRUE@setup.stamp: setup-build.stamp
+@WITH_DOCS_TRUE@	@true
+
+#### scan ####
+
+@WITH_DOCS_TRUE@scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
+@WITH_DOCS_TRUE@	@echo 'gtk-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@	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_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
+
+#### templates ####
+
+@WITH_DOCS_TRUE@tmpl-build.stamp: setup.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
+@WITH_DOCS_TRUE@	@echo 'gtk-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
+
+@WITH_DOCS_TRUE@tmpl.stamp: tmpl-build.stamp
+@WITH_DOCS_TRUE@	@true
+
+@WITH_DOCS_TRUE@$(srcdir)/tmpl/*.sgml:
+@WITH_DOCS_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 'gtk-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
+
+@WITH_DOCS_TRUE@sgml.stamp: sgml-build.stamp
+@WITH_DOCS_TRUE@	@true
+
+#### html ####
+
+@WITH_DOCS_TRUE@html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
+@WITH_DOCS_TRUE@	@echo 'gtk-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 "\-\-path"; \
+@WITH_DOCS_TRUE@	if test "$(?)" = "0"; then \
+@WITH_DOCS_TRUE@	  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 'gtk-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
+
+#### pdf ####
+
+@WITH_DOCS_TRUE@pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
+@WITH_DOCS_TRUE@	@echo 'gtk-doc: Building PDF'
+@WITH_DOCS_TRUE@	@rm -rf $(DOC_MODULE).pdf
+@WITH_DOCS_TRUE@	@mkpdf_imgdirs=""; \
+@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_imgdirs | grep >/dev/null "\-\-imgdir=$$part "; \
+@WITH_DOCS_TRUE@	    if test $$? != 0; then \
+@WITH_DOCS_TRUE@	      mkpdf_imgdirs="$$mkpdf_imgdirs --imgdir=$$part"; \
+@WITH_DOCS_TRUE@	    fi; \
+@WITH_DOCS_TRUE@	  done; \
+@WITH_DOCS_TRUE@	fi; \
+@WITH_DOCS_TRUE@	gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
+@WITH_DOCS_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 $(srcdir)/html/*`; \
+@WITH_DOCS_TRUE@	if test "$$installfiles" = '$(srcdir)/html/*'; \
+@WITH_DOCS_TRUE@	then echo '-- 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 '-- Installing '$$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@	    mv -f $${installdir}/$(DOC_MODULE).devhelp \
+@WITH_DOCS_TRUE@	      $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
+@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}
+
+#
+# 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 $(build)/tmpl/*.sgml $(distdir)/tmpl
+@WITH_DOCS_TRUE@	cp $(builddir)/html/* $(distdir)/html
+@WITH_DOCS_TRUE@	-cp $(builddir)/$(DOC_MODULE).pdf $(distdir)/
+@WITH_DOCS_TRUE@	-cp $(build)/$(DOC_MODULE).types $(distdir)/
+@WITH_DOCS_TRUE@	-cp $(build)/$(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
+
+# 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.
+.NOEXPORT:
diff --git a/docs/libnm-glib/tmpl/libnm-glib-unused.sgml b/docs/api/NetworkManager-overrides.txt
index e69de29bb..e69de29bb 100644
--- a/docs/libnm-glib/tmpl/libnm-glib-unused.sgml
+++ b/docs/api/NetworkManager-overrides.txt
diff --git a/docs/libnm-util/tmpl/libnm-util-unused.sgml b/docs/api/NetworkManager-sections.txt
index e69de29bb..e69de29bb 100644
--- a/docs/libnm-util/tmpl/libnm-util-unused.sgml
+++ b/docs/api/NetworkManager-sections.txt
diff --git a/docs/generate-settings-spec.c b/docs/api/generate-settings-spec.c
index 6ec8f7c5e..9c15314fd 100644
--- a/docs/generate-settings-spec.c
+++ b/docs/api/generate-settings-spec.c
@@ -42,6 +42,7 @@
 #include <nm-setting-pppoe.h>
 #include <nm-setting-serial.h>
 #include <nm-setting-vpn.h>
+#include <nm-setting-wimax.h>
 #include <nm-setting-wired.h>
 #include <nm-setting-wireless.h>
 #include <nm-setting-wireless-security.h>
@@ -63,6 +64,7 @@ static SettingNewFunc funcs[] = {
 	nm_setting_pppoe_new,
 	nm_setting_serial_new,
 	nm_setting_vpn_new,
+	nm_setting_wimax_new,
 	nm_setting_wired_new,
 	nm_setting_wireless_new,
 	nm_setting_wireless_security_new,
@@ -94,7 +96,6 @@ static TypeNameElement name_map[] = {
 static void
 write_one_setting (FILE *f, SettingNewFunc func)
 {
-	int w;
 	NMSetting *s;
 	GParamSpec **props, **iter;
 	guint num;
@@ -102,19 +103,28 @@ write_one_setting (FILE *f, SettingNewFunc func)
 	s = func ();
 
 	/* write out section header */
-	w = fprintf (f, "<p><h2>Setting name: '%s'</h2></p>\n", nm_setting_get_name (s));
+	(void) fprintf (f,
+		"<table>\n"
+		"  <title>%s setting</title>\n"
+		"  <tgroup cols=\"4\">\n"
+		"    <thead>\n"
+		"      <row>\n"
+		"        <entry>Key Name</entry>\n"
+		"        <entry>Value Type</entry>\n"
+		"        <entry>Default Value</entry>\n"
+		"        <entry>Value Description</entry>\n"
+		"      </row>\n"
+		"    </thead>\n"
+		"    <tbody>\n",
+		nm_setting_get_name (s));
 
-	w = fprintf (f, "<table cellspacing=10 border=0 cellpadding=2>\n");
-	w = fprintf (f, "<th align=left>Key Name</th>\n");
-	w = fprintf (f, "<th align=left>Value Type</th>\n");
-	w = fprintf (f, "<th align=left>Default Value</th>\n");
-	w = fprintf (f, "<th align=left>Value Description</th>\n");
 	props = g_object_class_list_properties (G_OBJECT_GET_CLASS (G_OBJECT (s)), &num);
 	for (iter = props; iter && *iter; iter++) {
 		const char *key_name, *value_type, *value_desc;
 		char *default_value;
 		TypeNameElement *name_iter;
 		GValue value = { 0, };
+		char *flags_str = NULL;
 
 		value_type = g_type_name (G_PARAM_SPEC_VALUE_TYPE (*iter));
 		for (name_iter = &name_map[0]; name_iter && name_iter->gvalue_name; name_iter++) {
@@ -141,17 +151,31 @@ write_one_setting (FILE *f, SettingNewFunc func)
 			g_object_get (G_OBJECT (s), NM_SETTING_NAME, &default_value, NULL);
 		}
 
-		w = fprintf (f, "<tr align=left valign=top>\n");
-		w = fprintf (f, "<td><strong>%s</strong></td>\n", key_name);
-		w = fprintf (f, "<td>%s</td>\n", value_type);
-		w = fprintf (f, "<td>%s</td>\n", default_value ? default_value : "");
-		w = fprintf (f, "<td>%s</td>\n", value_desc);
-		w = fprintf (f, "</tr>\n");
-
+		if (g_str_has_suffix (key_name, "-flags"))
+			flags_str = g_strdup_printf (" (see <xref linkend=\"secrets-flags\"/> for flag values)");
+
+		(void) fprintf (f,
+			"      <row>\n"
+			"        <entry><screen>%s</screen></entry>\n"
+			"        <entry><screen>%s</screen></entry>\n"
+			"        <entry><screen>%s</screen></entry>\n"
+			"        <entry>%s%s</entry>\n"
+			"      </row>\n",
+			key_name,
+			value_type,
+			default_value ? default_value : "",
+			value_desc,
+			flags_str ? flags_str : "");
+
+		g_free (flags_str);
 		g_free (default_value);
 	}
 
-	w = fprintf (f, "</table><br/>\n");
+	(void) fprintf (f,
+		"    </tbody>\n"
+		"  </tgroup>\n"
+		"</table>\n");
+
 	g_object_unref (s);
 }
 
@@ -160,7 +184,6 @@ main (int argc, char *argv[])
 {
 	GError *error = NULL;
 	FILE *f;
-	int w;
 	SettingNewFunc *fptr;
 
 	if (argc != 2) {
@@ -181,14 +204,22 @@ main (int argc, char *argv[])
 		_exit (3);
 	}
 
-	w = fprintf (f, "<html>\n<head>\n");
-	w = fprintf (f, "<title>NetworkManager " PACKAGE_VERSION " Settings Specification</title>");
-	w = fprintf (f, "</head>\n<body>\n");
+	(void) fprintf (f,
+		"<?xml version=\"1.0\"?>\n"
+		"<!DOCTYPE chapter PUBLIC \"-//OASIS//DTD DocBook XML V4.3//EN\"\n"
+		"               \"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd\" [\n"
+		"<!ENTITY %% local.common.attrib \"xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'\">"
+		"]>"
+		"<section>\n"
+		"  <title>Configuration Settings</title>\n"
+		"  <para>\n");
 
 	for (fptr = funcs; fptr && *fptr; fptr++)
 		write_one_setting (f, *fptr);
 
-	w = fprintf (f, "</body>\n</html>\n");
+	(void) fprintf (f,
+		"  </para>\n"
+		"</section>\n");
 
 	fclose (f);
 	_exit (0);
diff --git a/docs/api/html/NetworkManager.devhelp b/docs/api/html/NetworkManager.devhelp
new file mode 100644
index 000000000..6bf8834ae
--- /dev/null
+++ b/docs/api/html/NetworkManager.devhelp
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!DOCTYPE book PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "">
+<book xmlns="http://www.devhelp.net/book" title="NetworkManager D-Bus Reference Manual" link="index.html" author="Dan Williams" name="NetworkManager">
+  <chapters>
+    <sub name="D-Bus API Reference" link="ref-dbus.html"/>
+    <sub name="Network Configuration Setting Specification" link="ref-settings.html">
+      <sub name="Configuration Settings" link="ref-settings.html#id554381"/>
+      <sub name="Secret flag types" link="secrets-flags.html"/>
+    </sub>
+    <sub name="Migrating from NetworkManager 0.8 to NetworkManager 0.9" link="ref-migrating.html">
+      <sub name="Architecture and D-Bus API Changes in 0.9" link="ref-migrating.html#id537843">
+        <sub name="Elimination of the User Settings Service" link="ref-migrating.html#id551050"/>
+        <sub name="User Secret Agents" link="ref-migrating.html#id532968"/>
+        <sub name="Settings Service Interface Changes" link="ref-migrating.html#id545506"/>
+        <sub name="Connection Object Interface Changes" link="ref-migrating.html#id546055"/>
+        <sub name="Permissions Methods Consolidation" link="ref-migrating.html#id560506"/>
+        <sub name="AddConnection Returns Object Path of New Connection" link="ref-migrating.html#id566633"/>
+        <sub name="Support for WiMAX Devices" link="ref-migrating.html#id523443"/>
+        <sub name="New Device States" link="ref-migrating.html#id565603"/>
+        <sub name="New Active Connection State" link="ref-migrating.html#id534542"/>
+        <sub name="Consolidated Modem Devices" link="ref-migrating.html#id533386"/>
+        <sub name="Secret Property Flags" link="ref-migrating.html#id514244"/>
+        <sub name="Deprecated Methods Removed" link="ref-migrating.html#id529216"/>
+      </sub>
+    </sub>
+    <sub name="Index" link="ix01.html"/>
+    <sub name="License" link="license.html"/>
+  </chapters>
+  <functions/>
+</book>
diff --git a/docs/api/html/NetworkManager.devhelp2 b/docs/api/html/NetworkManager.devhelp2
new file mode 100644
index 000000000..76576f4ab
--- /dev/null
+++ b/docs/api/html/NetworkManager.devhelp2
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!DOCTYPE book PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "">
+<book xmlns="http://www.devhelp.net/book" title="NetworkManager D-Bus Reference Manual" link="index.html" author="Dan Williams" name="NetworkManager" version="2" language="c">
+  <chapters>
+    <sub name="D-Bus API Reference" link="ref-dbus.html"/>
+    <sub name="Network Configuration Setting Specification" link="ref-settings.html">
+      <sub name="Configuration Settings" link="ref-settings.html#id554381"/>
+      <sub name="Secret flag types" link="secrets-flags.html"/>
+    </sub>
+    <sub name="Migrating from NetworkManager 0.8 to NetworkManager 0.9" link="ref-migrating.html">
+      <sub name="Architecture and D-Bus API Changes in 0.9" link="ref-migrating.html#id537843">
+        <sub name="Elimination of the User Settings Service" link="ref-migrating.html#id551050"/>
+        <sub name="User Secret Agents" link="ref-migrating.html#id532968"/>
+        <sub name="Settings Service Interface Changes" link="ref-migrating.html#id545506"/>
+        <sub name="Connection Object Interface Changes" link="ref-migrating.html#id546055"/>
+        <sub name="Permissions Methods Consolidation" link="ref-migrating.html#id560506"/>
+        <sub name="AddConnection Returns Object Path of New Connection" link="ref-migrating.html#id566633"/>
+        <sub name="Support for WiMAX Devices" link="ref-migrating.html#id523443"/>
+        <sub name="New Device States" link="ref-migrating.html#id565603"/>
+        <sub name="New Active Connection State" link="ref-migrating.html#id534542"/>
+        <sub name="Consolidated Modem Devices" link="ref-migrating.html#id533386"/>
+        <sub name="Secret Property Flags" link="ref-migrating.html#id514244"/>
+        <sub name="Deprecated Methods Removed" link="ref-migrating.html#id529216"/>
+      </sub>
+    </sub>
+    <sub name="Index" link="ix01.html"/>
+    <sub name="License" link="license.html"/>
+  </chapters>
+  <functions/>
+</book>
diff --git a/docs/api/html/home.png b/docs/api/html/home.png
new file mode 100644
index 000000000..17003611d
--- /dev/null
+++ b/docs/api/html/home.png
diff --git a/docs/api/html/index.html b/docs/api/html/index.html
new file mode 100644
index 000000000..e418ad07d
--- /dev/null
+++ b/docs/api/html/index.html
@@ -0,0 +1,93 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>NetworkManager D-Bus Reference Manual</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<link rel="home" href="index.html" title="NetworkManager D-Bus Reference Manual">
+<link rel="next" href="ref-dbus.html" title="D-Bus API Reference">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="book">
+<div class="titlepage">
+<div>
+<div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">NetworkManager D-Bus Reference Manual</p></th></tr></table></div>
+<div><div class="authorgroup"><div class="author">
+<h3 class="author">
+<span class="firstname">Dan</span> <span class="surname">Williams</span>
+</h3>
+<div class="affiliation"><div class="address"><p><br>
+	    <code class="email">&lt;<a class="email" href="mailto:dcbw@redhat.com">dcbw@redhat.com</a>&gt;</code><br>
+	  </p></div></div>
+</div></div></div>
+<div><p class="releaseinfo">Version 0.8.998
+</p></div>
+<div><p class="copyright">Copyright © 2011 The NetworkManager Authors</p></div>
+<div><div class="legalnotice">
+<a name="id484261"></a><p>
+	Permission is granted to copy, distribute and/or modify this
+	document under the terms of the <em class="citetitle">GNU Free
+	Documentation License</em>, Version 1.1 or any later
+	version published by the Free Software Foundation with no
+	Invariant Sections, no Front-Cover Texts, and no Back-Cover
+	Texts. You may obtain a copy of the <em class="citetitle">GNU Free
+	Documentation License</em> from the Free Software
+	Foundation by visiting <a class="ulink" href="http://www.fsf.org" target="_top">their Web site</a> or by writing
+	to:
+
+	</p>
+<div class="address"><p><br>
+	  The Free Software Foundation, Inc.,<br>
+	  <span class="street">59 Temple Place</span> - Suite 330,<br>
+	  <span class="city">Boston</span>, <span class="state">MA</span> <span class="postcode">02111-1307</span>,<br>
+	  <span class="country">USA</span><br>
+	</p></div>
+<p>
+      </p>
+<p>
+	Many of the names used by companies to distinguish their
+	products and services are claimed as trademarks. Where those
+	names appear in any GNOME documentation, and those trademarks
+	are made aware to the members of the GNOME Documentation
+	Project, the names have been printed in caps or initial caps.
+      </p>
+</div></div>
+</div>
+<hr>
+</div>
+<div class="toc"><dl>
+<dt><span class="chapter"><a href="ref-dbus.html">D-Bus API Reference</a></span></dt>
+<dt><span class="chapter"><a href="ref-settings.html">Network Configuration Setting Specification</a></span></dt>
+<dd><dl>
+<dt><span class="section"><a href="ref-settings.html#id554381">Configuration Settings</a></span></dt>
+<dt><span class="section"><a href="secrets-flags.html">Secret flag types</a></span></dt>
+</dl></dd>
+<dt><span class="chapter"><a href="ref-migrating.html">Migrating from NetworkManager 0.8 to NetworkManager 0.9</a></span></dt>
+<dd><dl>
+<dt><span class="section"><a href="ref-migrating.html#id537843">Architecture and D-Bus API Changes in 0.9</a></span></dt>
+<dd><dl>
+<dt><span class="section"><a href="ref-migrating.html#id551050">Elimination of the User Settings Service</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#id532968">User Secret Agents</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#id545506">Settings Service Interface Changes</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#id546055">Connection Object Interface Changes</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#id560506">Permissions Methods Consolidation</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#id566633">AddConnection Returns Object Path of New Connection</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#id523443">Support for WiMAX Devices</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#id565603">New Device States</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#id534542">New Active Connection State</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#id533386">Consolidated Modem Devices</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#id514244">Secret Property Flags</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#id529216">Deprecated Methods Removed</a></span></dt>
+</dl></dd>
+</dl></dd>
+<dt><span class="index"><a href="ix01.html">Index</a></span></dt>
+<dt><span class="appendix"><a href="license.html">A. License</a></span></dt>
+</dl></div>
+</div>
+<div class="footer">
+<hr>
+          Generated by GTK-Doc V1.17</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/api/html/ix01.html b/docs/api/html/ix01.html
new file mode 100644
index 000000000..fe82a551d
--- /dev/null
+++ b/docs/api/html/ix01.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Index</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<link rel="home" href="index.html" title="NetworkManager D-Bus Reference Manual">
+<link rel="up" href="index.html" title="NetworkManager D-Bus Reference Manual">
+<link rel="prev" href="ref-migrating.html" title="Migrating from NetworkManager 0.8 to NetworkManager 0.9">
+<link rel="next" href="license.html" title="Appendix A. License">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle">
+<td><a accesskey="p" href="ref-migrating.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
+<td> </td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
+<th width="100%" align="center">NetworkManager D-Bus Reference Manual</th>
+<td><a accesskey="n" href="license.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="index">
+<div class="titlepage"><div><div><h2 class="title">
+<a name="id514153"></a>Index</h2></div></div></div>
+<div class="index"></div>
+</div>
+<div class="footer">
+<hr>
+          Generated by GTK-Doc V1.17</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/api/html/left.png b/docs/api/html/left.png
new file mode 100644
index 000000000..2d05b3d5b
--- /dev/null
+++ b/docs/api/html/left.png
diff --git a/docs/api/html/license.html b/docs/api/html/license.html
new file mode 100644
index 000000000..fc0b0a38b
--- /dev/null
+++ b/docs/api/html/license.html
@@ -0,0 +1,385 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Appendix A. License</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<link rel="home" href="index.html" title="NetworkManager D-Bus Reference Manual">
+<link rel="up" href="index.html" title="NetworkManager D-Bus Reference Manual">
+<link rel="prev" href="ix01.html" title="Index">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle">
+<td><a accesskey="p" href="ix01.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
+<td> </td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
+<th width="100%" align="center">NetworkManager D-Bus Reference Manual</th>
+<td> </td>
+</tr></table>
+<div class="appendix">
+<div class="titlepage"><div><div><h2 class="title">
+<a name="license"></a>Appendix A. License</h2></div></div></div>
+<p>
+</p>
+<pre class="programlisting">Unless a COPYING file in a subdirectory or file-specific license headers
+specify a different license, the following applies to all files in this
+directory and all subdirectories.
+
+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
+(at your option) any later version.
+
+
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    &lt;one line to give the program's name and a brief idea of what it does.&gt;
+    Copyright (C) &lt;year&gt;  &lt;name of author&gt;
+
+    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
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year  name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  &lt;signature of Ty Coon&gt;, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
+
+</pre>
+<p>
+    </p>
+</div>
+<div class="footer">
+<hr>
+          Generated by GTK-Doc V1.17</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/api/html/ref-dbus.html b/docs/api/html/ref-dbus.html
new file mode 100644
index 000000000..29392bed4
--- /dev/null
+++ b/docs/api/html/ref-dbus.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>D-Bus API Reference</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<link rel="home" href="index.html" title="NetworkManager D-Bus Reference Manual">
+<link rel="up" href="index.html" title="NetworkManager D-Bus Reference Manual">
+<link rel="prev" href="index.html" title="NetworkManager D-Bus Reference Manual">
+<link rel="next" href="ref-settings.html" title="Network Configuration Setting Specification">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle">
+<td><a accesskey="p" href="index.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
+<td> </td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
+<th width="100%" align="center">NetworkManager D-Bus Reference Manual</th>
+<td><a accesskey="n" href="ref-settings.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="chapter">
+<div class="titlepage"><div><div><h2 class="title">
+<a name="ref-dbus"></a>D-Bus API Reference</h2></div></div></div>
+<p>
+      This part documents the D-Bus interface used to access the
+      NetworkManager daemon.
+    </p>
+<a class="ulink" href="spec.html" target="_top">spec.html</a>
+</div>
+<div class="footer">
+<hr>
+          Generated by GTK-Doc V1.17</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/api/html/ref-migrating.html b/docs/api/html/ref-migrating.html
new file mode 100644
index 000000000..a08e8f081
--- /dev/null
+++ b/docs/api/html/ref-migrating.html
@@ -0,0 +1,539 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Migrating from NetworkManager 0.8 to NetworkManager 0.9</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<link rel="home" href="index.html" title="NetworkManager D-Bus Reference Manual">
+<link rel="up" href="index.html" title="NetworkManager D-Bus Reference Manual">
+<link rel="prev" href="secrets-flags.html" title="Secret flag types">
+<link rel="next" href="ix01.html" title="Index">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle">
+<td><a accesskey="p" href="secrets-flags.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
+<td> </td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
+<th width="100%" align="center">NetworkManager D-Bus Reference Manual</th>
+<td><a accesskey="n" href="ix01.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="chapter">
+<div class="titlepage"><div><div><h2 class="title">
+<a name="ref-migrating"></a>Migrating from NetworkManager 0.8 to NetworkManager 0.9</h2></div></div></div>
+<div class="toc"><dl>
+<dt><span class="section"><a href="ref-migrating.html#id537843">Architecture and D-Bus API Changes in 0.9</a></span></dt>
+<dd><dl>
+<dt><span class="section"><a href="ref-migrating.html#id551050">Elimination of the User Settings Service</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#id532968">User Secret Agents</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#id545506">Settings Service Interface Changes</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#id546055">Connection Object Interface Changes</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#id560506">Permissions Methods Consolidation</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#id566633">AddConnection Returns Object Path of New Connection</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#id523443">Support for WiMAX Devices</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#id565603">New Device States</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#id534542">New Active Connection State</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#id533386">Consolidated Modem Devices</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#id514244">Secret Property Flags</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#id529216">Deprecated Methods Removed</a></span></dt>
+</dl></dd>
+</dl></div>
+<p>
+    NetworkManager 0.9 is a new major version of NetworkManager that breaks
+    both API and ABI compared to previous versions.  These changes are
+    intended to make communication with NetworkManager much simpler, especially
+    for network control and configuration programs.  Thankfully, most changes
+    are not difficult to implement, and the advantages of the simpler
+    architecture of NetworkManager 0.9 greatly outweight the effort of
+    updating client programs.
+  </p>
+<div class="section">
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">
+<a name="id537843"></a>Architecture and D-Bus API Changes in 0.9</h2></div></div></div>
+<p>
+      This section details the architectural and D-Bus API changes in
+      NetworkManager 0.9.
+    </p>
+<div class="section">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="id551050"></a>Elimination of the User Settings Service</h3></div></div></div>
+<p>
+      Previously there were two "settings services", or D-Bus services that
+      provided and saved network configuration information.  NetworkManager
+      owned the "system" settings service, and one user-level applet owned the
+      "user" settings service.  Now, the "user" settings service has been
+      eliminated, so clients only have to track one D-Bus service to read and
+      update network configuration.  The functionality of the old user settings
+      service has been replaced with a "permissions" key on each connection
+      object to preserve the ability to restrict which users can use the
+      connection, and with a "secret agent" D-Bus API for user-session-level
+      secure storage of network secrets and passwords.
+    </p>
+<p>
+      Elimination of the user settings service provides the following advantages
+      for clients of NetworkManager:
+      </p>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem">Simpler discovery of network configuration and change tracking</li>
+<li class="listitem">Simpler storage of user-level network secrets by control applets</li>
+<li class="listitem">Correct operation of fast-user switching and multi-seat configurations</li>
+<li class="listitem">More granular network connection permissions for system administrators</li>
+<li class="listitem">Connections are now system-wide by default (unless restricted by the user or system administrator)</li>
+<li class="listitem">Easier deployment of user-specific connections (ie, VPNs)</li>
+</ul></div>
+<p>
+    </p>
+<p>
+      With this change, D-Bus methods that previously took a "service name"
+      argument (like
+      <code class="literal">org.freedesktop.NetworkManager.ActivateConnection</code>) and
+      objects with service name properties (like ActiveConnection objects) no
+      longer have those arguments or properties.
+    </p>
+<p>
+      <span class="strong"><strong>Action:</strong></span> if you develop a network control
+      applet that talks to NetworkManager and used to provide a user settings
+      service, you can eliminate that code and rely on NetworkManager for all
+      storage of network configuration.  Your applet should now implement the
+      Secret Agent D-Bus API (see below) to store user-specific secrets, and
+      add legacy user-specific configuration to NetworkManager when run.  More
+      information about both these changes follows.
+    </p>
+</div>
+<div class="section">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="id532968"></a>User Secret Agents</h3></div></div></div>
+<p>
+      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
+      system-wide storage (and thus available to all users).  To allow this
+      functionality the concept of agents has been introduced.  Using the new
+      <a class="ulink" href="spec.html#org.freedesktop.NetworkManager.AgentManager" target="_top">
+      <code class="literal">org.freedesktop.NetworkManager.AgentManager</code></a>
+      D-Bus interface provided by NetworkManager, user applications can register
+      themselves as "secret agents", ie programs capable of saving and providing
+      secrets to NetworkManager.  The agent should export the
+      <a class="ulink" href="spec.html#org.freedesktop.NetworkManager.SecretAgent" target="_top">
+      <code class="literal">org.freedesktop.NetworkManager.SecretAgent</code></a>
+      D-Bus interface, but should NOT claim a bus name on the system or session
+      bus.  Instead, NetworkManager talks to the agent directly over the D-Bus
+      connection which the agent used to register itself.
+    </p>
+<p>
+      Each agent must send a unique identifier to NetworkManager when it
+      registers.  This identifier must follow certain rules (see the NM D-Bus
+      API documentation for more details) but looks essentially the same as
+      a D-Bus service name.  Only one agent using a given identifier may be
+      registered at the same time.  The agent is automatically unregistered
+      if it disconnects from D-Bus or exits.
+    </p>
+<p>
+      When NetworkManager requires secrets during the attempt to connect to a
+      network, and no secrets are available from the internal settings service,
+      NetworkManager queries each registered agent for secrets.  Agents that
+      are in "active" user sessions (as determined by ConsoleKit) are preferred
+      over inactive ones.  Only agents belonging to users who have permission
+      to view and modify the connection are queried.  For more information on
+      connection permissions, see below.
+    </p>
+      When secrets are requested, the agent is also sent a set of flags that
+      modify the behavior of the request.  By default, the agent should never
+      attempt to query the user for secrets, but should simply return any
+      available saved secrets.  Other flags allow the agent to explicitly
+      request new secrets from the user.
+    <p>
+      <span class="strong"><strong>Action:</strong></span> the parts of a previous user
+      settings service that handled secrets may be easily repurposed as the bulk
+      of the implementation of a secret agent.  The agent is sent all available
+      connection settings, and from those should be able to retrieve or save
+      any saved user secrets, or to request new secrets from the user.
+    </p>
+</div>
+<div class="section">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="id545506"></a>Settings Service Interface Changes</h3></div></div></div>
+<p>
+      With the elimination of the user settings service, the old
+      <code class="literal">org.freedesktop.NetworkManagerUserSettings</code> and
+      <code class="literal">org.freedesktop.NetworkManagerSystemSettings</code> D-Bus
+      service names are no longer used.  Instead NetworkManager provides the
+      settings service using its own D-Bus service name,
+      <code class="literal">org.freedesktop.NetworkManager</code>.  The object path of
+      the settings service remains unchanged.
+    </p>
+<p>
+      Additionally, the D-Bus interface of the settings service has changed
+      to <a class="ulink" href="spec.html#org.freedesktop.NetworkManager.Settings" target="_top">
+      <code class="literal">org.freedesktop.NetworkManager.Settings</code></a> from
+      the old interface name of
+      <code class="literal">org.freedesktop.NetworkManagerSettings</code>, and the old
+      <code class="literal">org.freedesktop.NetworkManagerSettings.System</code>
+      interface has been merged into the new
+      <a class="ulink" href="spec.html#org.freedesktop.NetworkManager.Settings" target="_top">
+      <code class="literal">org.freedesktop.NetworkManager.Settings</code></a> interface
+      as the split no longer made sense. This includes the
+      <code class="literal">SaveHostname</code> method and the <code class="literal">Hostname</code>
+      and <code class="literal">CanModify</code> properties.
+    </p>
+<p>
+      <span class="strong"><strong>Action:</strong></span> change the service name that
+      your application uses to request system network settings to
+      <code class="literal">org.freedesktop.NetworkManager</code>, and update the D-Bus
+      interface that codes uses to talk to the settings service to
+      <a class="ulink" href="spec.html#org.freedesktop.NetworkManager.Settings" target="_top">
+      <code class="literal">org.freedesktop.NetworkManager.Settings</code></a>.
+      Listen for hostname changes using the new interface name as well.
+    </p>
+</div>
+<div class="section">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="id546055"></a>Connection Object Interface Changes</h3></div></div></div>
+<p>
+      Consistent with the interface changes to the Settings object, the
+      Connection object's D-Bus interface has changed to
+      <a class="ulink" href="spec.html#org.freedesktop.NetworkManager.Settings.Connection" target="_top">
+      <code class="literal">org.freedesktop.NetworkManager.Settings.Connection</code></a>
+      from the previous 
+      <code class="literal">org.freedesktop.NetworkManagerSettings.Connection</code>.
+    </p>
+<p>
+      Additionally, the
+      <code class="literal">org.freedesktop.NetworkManager.Settings.Connection.Updated</code>
+      signal of the Connection object no longer includes the updated settings
+      data argument, as that might allow users who are not authorized to
+      view the connection details to do so.  Instead, when a client receives the
+      Updated signal, it should requery the Connection's settings with the
+      <code class="literal">org.freedesktop.NetworkManager.Settings.Connection.GetSettings</code>
+      method.  If the client receives an error as a result of this method call,
+      it should assume the connection has been deleted.
+    </p>
+<p>
+      <span class="strong"><strong>Action:</strong></span> where code manipulates
+      Connection objects, update the D-Bus interface that code uses to be
+      <code class="literal">org.freedesktop.NetworkManager.Settings.Connection</code>.
+      Additionally, code that listens for the
+      <code class="literal">org.freedesktop.NetworkManager.Settings.Connection.Updated</code>
+      signal should no longer expect the new settings data as an argument, but
+      instead should request the new settings data using the
+      <code class="literal">org.freedesktop.NetworkManager.Settings.Connection.GetSettings</code>
+      method.
+    </p>
+</div>
+<div class="section">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="id560506"></a>Permissions Methods Consolidation</h3></div></div></div>
+<p>
+      Previously there were two D-Bus method calls to retrieve the list of
+      operations that a user client could perform, and two signals notifying
+      callers that they should recheck permissions.  Those two calls were:
+      </p>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem">
+<code class="literal">org.freedesktop.NetworkManagerSettings.System.GetPermissions</code>
+          which returned a bitfield of operations the caller was allowed to
+          perform related to modify system network settings and the machine
+          hostname
+        </li>
+<li class="listitem">
+<code class="literal">org.freedesktop.NetworkManager.GetPermissions</code> which
+          returned a dictionary mapping permission names to result strings like
+          "yes", "auth", or "no", relating to network control permissions like
+          the ability to enable or disable WiFi.
+        </li>
+</ul></div>
+<p>
+      These two calls have been consolidated into an enhanced
+      <code class="literal">org.freedesktop.NetworkManager.GetPermissions</code> call that
+      uses the same arguments, but includes all permissions, including those which
+      the settings service used to handle.
+    </p>
+<p>
+      With this change, the bitfield items from
+      <code class="literal">org.freedesktop.NetworkManagerSettings.System.GetPermissions</code>
+      are now string-based permissions.  The mapping is as follows:
+      </p>
+<div class="table">
+<a name="id555187"></a><p class="title"><b>Table 17. </b></p>
+<div class="table-contents"><table border="1">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>Old bitfield value</th>
+<th>New permission name</th>
+</tr></thead>
+<tbody>
+<tr>
+<td><pre class="screen">0x1 (connection-modify)</pre></td>
+<td>
+                <code class="literal">org.freedesktop.NetworkManager.settings.modify.system</code>
+                or <code class="literal">org.freedesktop.NetworkManager.settings.modify.system</code>
+                depending on the permissions of the connection.
+              </td>
+</tr>
+<tr>
+<td><pre class="screen">0x2 (wifi-share-protected)</pre></td>
+<td>
+                <code class="literal">org.freedesktop.NetworkManager.wifi.share.protected</code>
+              </td>
+</tr>
+<tr>
+<td><pre class="screen">0x4 (wifi-share-open)</pre></td>
+<td>
+                <code class="literal">org.freedesktop.NetworkManager.wifi.share.open</code>
+              </td>
+</tr>
+<tr>
+<td><pre class="screen">0x8 (hostname-modify)</pre></td>
+<td>
+                <code class="literal">org.freedesktop.NetworkManager.settings.modify.hostname</code>
+              </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<p><br class="table-break">
+    </p>
+<p>
+      <span class="strong"><strong>Action:</strong></span> modify handling of existing
+      code that checks permissions to recognize the new permissions names for
+      old system settings permissions, and remove code that used to call
+      <code class="literal">org.freedesktop.NetworkManagerSettings.System.GetPermissions</code>.
+    </p>
+</div>
+<div class="section">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="id566633"></a>AddConnection Returns Object Path of New Connection</h3></div></div></div>
+<p>
+      The <a class="ulink" href="spec.html#org.freedesktop.NetworkManager.Settings" target="_top">
+      <code class="literal">org.freedesktop.NetworkManager.Settings.AddConnection</code>
+      </a> method call now returns the object path of the newly added
+      connection. Previously, if code wanted to manipulate a connection
+      post-addition, it had to wait for the new connection to be announced via
+      the NewConnection signal by matching connection UUIDs.  Now the object
+      path is returned and this workaround is no longer required.
+    </p>
+<p>
+      <span class="strong"><strong>Action:</strong></span> update code that adds new
+      connections to handle the object path returned from AddConnection, and
+      remove workarounds for finding the new connection via signals.
+    </p>
+</div>
+<div class="section">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="id523443"></a>Support for WiMAX Devices</h3></div></div></div>
+<p>
+      NetworkManager now supports Intel WiMAX mobile broadband devices.  A
+      corresponding device type (<code class="literal">NM_DEVICE_TYPE_WIMAX</code>) and
+      a new <a class="ulink" href="spec.html#org.freedesktop.NetworkManager.Device.WiMax" target="_top">
+      <code class="literal">org.freedesktop.NetworkManager.Device.WiMax</code></a>
+      D-Bus interface have been added.  Furthermore, to support connection to
+      different WiMAX Network Service Providers (NSPs) the
+      <a class="ulink" href="spec.html#org.freedesktop.NetworkManager.Device.WiMax.Nsp" target="_top">
+      <code class="literal">org.freedesktop.NetworkManager.Device.WiMax.Nsp</code></a>
+      interface has been added to access information about each available
+      WiMAX network.
+    </p>
+<p>
+      <span class="strong"><strong>Action:</strong></span> update code that handles
+      devices and/or displays status to users to recognize the new device type,
+      and to display available WiMAX NSPs similar to how WiFi Access Points
+      are displayed. Also update code that creates new connections to allow
+      creation of new WiMAX connections.
+    </p>
+</div>
+<div class="section">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="id565603"></a>New Device States</h3></div></div></div>
+<p>
+      A few <a class="ulink" href="spec.html#type-NM_DEVICE_STATE" target="_top">new device states</a>
+      have been added, and all device states have been renumbered for flexibility.
+      The new devices states IP_CHECK, SECONDARIES, and DEACTIVATING.
+    </p>
+<p>
+      <span class="strong"><strong>Action:</strong></span> where code checks device state
+      or shows UI indication of the device's state, make sure the new device
+      states are processed correctly, and that code in switch()-type statements
+      is updated to handle the new states.
+    </p>
+</div>
+<div class="section">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="id534542"></a>New Active Connection State</h3></div></div></div>
+<p>
+      Along with the new device states, an
+      <a class="ulink" href="spec.html#type-NM_ACTIVE_CONNECTION_STATE" target="_top">additional
+      ActiveConnection state</a> has been added: DEACTIVATING.  This state
+      is entered when the connection is being torn down and deactivated.
+    </p>
+<p>
+      <span class="strong"><strong>Action:</strong></span> where code checks active
+      connection states or shows UI indication of active connection states, make
+      sure the DEACTIVATING state is processed correctly, and that code in
+      switch()-type statements is updated to handle it.
+    </p>
+</div>
+<div class="section">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="id533386"></a>Consolidated Modem Devices</h3></div></div></div>
+<p>
+      Many new mobile broadband devices support multiple access families, like
+      Qualcomm Gobi cards (CDMA/EVDO and GSM/UMTS), or multi-mode EVDO/LTE
+      or UMTS/LTE modems like the Pantech UML290.  The previous hard split
+      between CDMA/EVDO and GSM/UMTS device classes was not flexible enough to
+      deal with these new multi-mode devices.  Thus the previously separate
+      CDMA and GSM device classes have been combined into a single Modem
+      device class, which exposes both hardware "ModemCapabilities" and
+      runtime "CurrentCapabilities" which represent generic access technology
+      families like CDMA/EVDO, GSM/UMTS, and LTE which the device supports.
+      ModemCapabilities indicate all the access technology families which the
+      modem is capable of supporting, while CurrentCapabilities indicate the
+      immediate access technology families the device supports without reloading
+      the firmware and thus restarting the device.
+    </p>
+<p>
+      Along with this change, the
+      <code class="literal">org.freedesktop.NetworkManager.Device.Serial</code>
+      interface has been removed as it's functionality will be incorporated
+      into the 
+      <a class="ulink" href="spec.html#org.freedesktop.NetworkManager.Device.Modem" target="_top">
+      <code class="literal">org.freedesktop.NetworkManager.Device.Modem</code></a>
+      interface in the future.
+    </p>
+<p>
+      <span class="strong"><strong>Action:</strong></span> combine code that checks for
+      the old CDMA and GSM device types, and instead handle the new Modem device
+      type.  Where behavior must change based on the capabilities of the device,
+      check the CurrentCapabilities device property to determine whether to
+      treat the device as CDMA, GSM, or LTE for purposes of configuration and
+      status.
+    </p>
+</div>
+<div class="section">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="id514244"></a>Secret Property Flags</h3></div></div></div>
+<p>
+      In the Connection object's configuration properties, each setting's secret
+      properties (like WiFi passphrases, or public key passwords, etc) now has
+      an associated "flags" property that changes how NetworkManager treats the
+      secret.  The "flags" property is a bitfield of one or more of the
+      following values:
+      </p>
+<div class="table">
+<a name="id514253"></a><p class="title"><b>Table 18. </b></p>
+<div class="table-contents"><table border="1">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>Flag Value</th>
+<th>Meaning</th>
+</tr></thead>
+<tbody>
+<tr>
+<td><pre class="screen">0x00 (none)</pre></td>
+<td>
+                NetworkManager is responsible for providing and storing this
+                secret (default)
+              </td>
+</tr>
+<tr>
+<td><pre class="screen">0x01 (agent-owned)</pre></td>
+<td>
+                A user secret agent is responsible for providing and storing
+                this secret; when it is required agents will be asked to
+                retrieve it
+              </td>
+</tr>
+<tr>
+<td><pre class="screen">0x02 (not saved)</pre></td>
+<td>
+                The secret is not saved, and should be requested each time it
+                is required.  Used for OTP/token configurations where the
+                secret changes periodically, or if the user simply wants to
+                manually enter the secret each time.
+              </td>
+</tr>
+<tr>
+<td><pre class="screen">0x04 (not required)</pre></td>
+<td>
+                In situations where it cannot be automatically determined that
+                the secret is required (some VPNs and PPP providers dont require
+                all possible secrets) this flag indicates that the specific
+                secret is not required.
+              </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<p><br class="table-break">
+    </p>
+<p>
+      <span class="strong"><strong>Action:</strong></span> user interface code which
+      handles entry of connection secrets should be updated to read and set
+      secret flags.  For example, code that creates new VPN connections may want
+      to set the "agent-owned" flag to ensure that the user's VPN password is
+      not available to all users.  EAP-TLS and VPN interface code might add a
+      checkbox that toggles the "not saved" bit to indicate that the
+      password/PIN code should be requested from a hardware token each time it
+      is required.
+    </p>
+</div>
+<div class="section">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="id529216"></a>Deprecated Methods Removed</h3></div></div></div>
+<p>
+      A few methods and signals of the <code class="literal">org.freedesktop.NetworkManager</code>
+      interface deprecated in version 0.7 have been removed.  All the
+      replacement methods and signals have existed since version 0.7 and so are
+      not new to this version of NetworkManager, but some older programs may
+      be using removed items.  The following table lists the removed items and
+      their replacements:
+      </p>
+<div class="table">
+<a name="id529230"></a><p class="title"><b>Table 19. </b></p>
+<div class="table-contents"><table border="1">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>Removed Item</th>
+<th>Replacement</th>
+</tr></thead>
+<tbody>
+<tr>
+<td><pre class="screen">StateChange signal</pre></td>
+<td>
+                Use the <code class="literal">StateChanged</code> signal, which has the
+                same arguments.
+              </td>
+</tr>
+<tr>
+<td><pre class="screen">sleep() and wake() methods</pre></td>
+<td>
+                Use the <code class="literal">Sleep()</code> method instead, which takes
+                a boolean argument indicating whether NetworkManager should
+                go to sleep or wake up.
+              </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<p><br class="table-break">
+    </p>
+<p>
+      <span class="strong"><strong>Action:</strong></span> update code to use these
+      replacement methods and properties where it used old deprecated ones
+    </p>
+</div>
+</div>
+</div>
+<div class="footer">
+<hr>
+          Generated by GTK-Doc V1.17</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/api/html/ref-settings.html b/docs/api/html/ref-settings.html
new file mode 100644
index 000000000..aaa4bbd3a
--- /dev/null
+++ b/docs/api/html/ref-settings.html
@@ -0,0 +1,1337 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Network Configuration Setting Specification</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<link rel="home" href="index.html" title="NetworkManager D-Bus Reference Manual">
+<link rel="up" href="index.html" title="NetworkManager D-Bus Reference Manual">
+<link rel="prev" href="ref-dbus.html" title="D-Bus API Reference">
+<link rel="next" href="secrets-flags.html" title="Secret flag types">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle">
+<td><a accesskey="p" href="ref-dbus.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
+<td> </td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
+<th width="100%" align="center">NetworkManager D-Bus Reference Manual</th>
+<td><a accesskey="n" href="secrets-flags.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="chapter">
+<div class="titlepage"><div><div><h2 class="title">
+<a name="ref-settings"></a>Network Configuration Setting Specification</h2></div></div></div>
+<div class="toc"><dl>
+<dt><span class="section"><a href="ref-settings.html#id554381">Configuration Settings</a></span></dt>
+<dt><span class="section"><a href="secrets-flags.html">Secret flag types</a></span></dt>
+</dl></div>
+<p>
+      This part documents the properties and value types of each "Setting"
+      object that composes the basic unit of NetworkManager configuration,
+      the "Connection".  Each Connection object is simply a dictionary mapping
+      setting names (like "wimax" or "bluetooth") to a dictionary of
+      key/value pairs that represents each itself.
+    </p>
+<div class="section">
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">
+<a name="id554381"></a>Configuration Settings</h2></div></div></div>
+<p>
+</p>
+<div class="table">
+<a name="id554388"></a><p class="title"><b>Table 1. 802-1x setting</b></p>
+<div class="table-contents"><table summary="802-1x setting" border="1">
+<colgroup>
+<col>
+<col>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>Key Name</th>
+<th>Value Type</th>
+<th>Default Value</th>
+<th>Value Description</th>
+</tr></thead>
+<tbody>
+<tr>
+<td><pre class="screen">name</pre></td>
+<td><pre class="screen">string</pre></td>
+<td><pre class="screen">802-1x</pre></td>
+<td>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.</td>
+</tr>
+<tr>
+<td><pre class="screen">eap</pre></td>
+<td><pre class="screen">array of string</pre></td>
+<td><pre class="screen">[]</pre></td>
+<td>The allowed EAP method to be used when authenticating to the network with 802.1x. Valid methods are: 'leap', 'md5', 'tls', 'peap', 'ttls', and 'fast'. Each method requires different configuration using the properties of this setting; refer to wpa_supplicant documentation for the allowed combinations.</td>
+</tr>
+<tr>
+<td><pre class="screen">identity</pre></td>
+<td><pre class="screen">string</pre></td>
+<td><pre class="screen"></pre></td>
+<td>Identity string for EAP authentication methods.  Often the user's user or login name.</td>
+</tr>
+<tr>
+<td><pre class="screen">anonymous-identity</pre></td>
+<td><pre class="screen">string</pre></td>
+<td><pre class="screen"></pre></td>
+<td>Anonymous identity string for EAP authentication methods.  Used as the unencrypted identity with EAP types that support different tunneled identity like EAP-TTLS.</td>
+</tr>
+<tr>
+<td><pre class="screen">ca-cert</pre></td>
+<td><pre class="screen">byte array</pre></td>
+<td><pre class="screen">[]</pre></td>
+<td>Contains the CA certificate if used by the EAP method specified in the 'eap' property.  Certificate data is specified using a 'scheme'; two are currently supported: blob and path.  When using the blob scheme (which is backwards compatible with NM 0.7.x) this property should be set to the certificate's DER encoded data.  When using the path scheme, this property should be set to the full UTF-8 encoded path of the certificate, prefixed with the string 'file://' and ending with a terminating NULL byte.  This property can be unset even if the EAP method supports CA certificates, but this allows man-in-the-middle attacks and is NOT recommended.</td>
+</tr>
+<tr>
+<td><pre class="screen">ca-path</pre></td>
+<td><pre class="screen">string</pre></td>
+<td><pre class="screen"></pre></td>
+<td>UTF-8 encoded path to a directory containing PEM or DER formatted certificates to be added to the verification chain in addition to the certificate specified in the 'ca-cert' property.</td>
+</tr>
+<tr>
+<td><pre class="screen">client-cert</pre></td>
+<td><pre class="screen">byte array</pre></td>
+<td><pre class="screen">[]</pre></td>
+<td>Contains the client certificate if used by the EAP method specified in the 'eap' property.  Certificate data is specified using a 'scheme'; two are currently supported: blob and path.  When using the blob scheme (which is backwards compatible with NM 0.7.x) this property should be set to the certificate's DER encoded data.  When using the path scheme, this property should be set to the full UTF-8 encoded path of the certificate, prefixed with the string 'file://' and ending with a terminating NULL byte.</td>
+</tr>
+<tr>
+<td><pre class="screen">phase1-peapver</pre></td>
+<td><pre class="screen">string</pre></td>
+<td><pre class="screen"></pre></td>
+<td>Forces which PEAP version is used when PEAP is set as the EAP method in 'eap' property.  When unset, the version reported by the server will be used.  Sometimes when using older RADIUS servers, it is necessary to force the client to use a particular PEAP version.  To do so, this property may be set to '0' or '1' to force that specific PEAP version.</td>
+</tr>
+<tr>
+<td><pre class="screen">phase1-peaplabel</pre></td>
+<td><pre class="screen">string</pre></td>
+<td><pre class="screen"></pre></td>
+<td>Forces use of the new PEAP label during key derivation.  Some RADIUS servers may require forcing the new PEAP label to interoperate with PEAPv1.  Set to '1' to force use of the new PEAP label.  See the wpa_supplicant documentation for more details.</td>
+</tr>
+<tr>
+<td><pre class="screen">phase1-fast-provisioning</pre></td>
+<td><pre class="screen">string</pre></td>
+<td><pre class="screen"></pre></td>
+<td>Enables or disables in-line provisioning of EAP-FAST credentials when FAST is specified as the EAP method in the #NMSetting8021x:eap property. Allowed values are '0' (disabled), '1' (allow unauthenticated provisioning), '2' (allow authenticated provisioning), and '3' (allow both authenticated and unauthenticated provisioning).  See the wpa_supplicant documentation for more details.</td>
+</tr>
+<tr>
+<td><pre class="screen">phase2-auth</pre></td>
+<td><pre class="screen">string</pre></td>
+<td><pre class="screen"></pre></td>
+<td>Specifies the allowed 'phase 2' inner non-EAP authentication methods when an EAP method that uses an inner TLS tunnel is specified in the 'eap' property. Recognized non-EAP phase2 methods are 'pap', 'chap', 'mschap', 'mschapv2', 'gtc', 'otp', 'md5', and 'tls'.  Each 'phase 2' inner method requires specific parameters for successful authentication; see the wpa_supplicant documentation for more details.</td>
+</tr>
+<tr>
+<td><pre class="screen">phase2-autheap</pre></td>
+<td><pre class="screen">string</pre></td>
+<td><pre class="screen"></pre></td>
+<td>Specifies the allowed 'phase 2' inner EAP-based authentication methods when an EAP method that uses an inner TLS tunnel is specified in the 'eap' property. Recognized EAP-based 'phase 2' methods are 'md5', 'mschapv2', 'otp', 'gtc', and 'tls'. Each 'phase 2' inner method requires specific parameters for successful authentication; see the wpa_supplicant documentation for more details.</td>
+</tr>
+<tr>
+<td><pre class="screen">phase2-ca-cert</pre></td>
+<td><pre class="screen">byte array</pre></td>
+<td><pre class="screen">[]</pre></td>
+<td>Contains the 'phase 2' CA certificate if used by the EAP method specified in the 'phase2-auth' or 'phase2-autheap' properties.  Certificate data is specified using a 'scheme'; two are currentlysupported: blob and path. When using the blob scheme (which is backwards compatible with NM 0.7.x) this property should be set to the certificate's DER encoded data. When using the path scheme, this property should be set to the full UTF-8 encoded path of the certificate, prefixed with the string 'file://' and ending with a terminating NULL byte.  This property can be unset even if the EAP method supports CA certificates, but this allows man-in-the-middle attacks and is NOT recommended.</td>
+</tr>
+<tr>
+<td><pre class="screen">phase2-ca-path</pre></td>
+<td><pre class="screen">string</pre></td>
+<td><pre class="screen"></pre></td>
+<td>UTF-8 encoded path to a directory containing PEM or DER formatted certificates to be added to the verification chain in addition to the certificate specified in the 'phase2-ca-cert' property.</td>
+</tr>
+<tr>
+<td><pre class="screen">phase2-client-cert</pre></td>
+<td><pre class="screen">byte array</pre></td>
+<td><pre class="screen">[]</pre></td>
+<td>Contains the 'phase 2' client certificate if used by the EAP method specified in the 'phase2-eap' or 'phase2-autheap' properties. Certificate data is specified using a 'scheme'; two are currently supported: blob and path.  When using the blob scheme (which is backwards compatible with NM 0.7.x) this property should be set to the certificate's DER encoded data.  When using the path scheme, this property should be set to the full UTF-8 encoded path of the certificate, prefixed with the string 'file://' and ending with a terminating NULL byte.</td>
+</tr>
+<tr>
+<td><pre class="screen">password</pre></td>
+<td><pre class="screen">string</pre></td>
+<td><pre class="screen"></pre></td>
+<td>Password used for EAP authentication methods.</td>
+</tr>
+<tr>
+<td><pre class="screen">password-flags</pre></td>
+<td><pre class="screen">uint32</pre></td>
+<td><pre class="screen">0</pre></td>
+<td>Flags indicating how to handle the 802.1x password. (see <a class="xref" href="secrets-flags.html" title="Secret flag types">the section called “Secret flag types”</a> for flag values)</td>
+</tr>
+<tr>
+<td><pre class="screen">private-key</pre></td>
+<td><pre class="screen">byte array</pre></td>
+<td><pre class="screen">[]</pre></td>
+<td>Contains the private key when the 'eap' property is set to 'tls'.  Key data is specified using a 'scheme'; two are currently supported: blob and path. When using the blob scheme and private keys, this property should be set to the key's encrypted PEM encoded data. When using private keys with the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string 'file://' and ending with a terminating NULL byte.  When using PKCS#12 format private keys and the blob scheme, this property should be set to the PKCS#12 data and the 'private-key-password' property must be set to password used to decrypt the PKCS#12 certificate and key.  When using PKCS#12 files and the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string 'file://' and and ending with a terminating NULL byte, and as with the blob scheme the 'private-key-password' property must be set to the password used to decode the PKCS#12 private key and certificate.</td>
+</tr>
+<tr>
+<td><pre class="screen">private-key-password</pre></td>
+<td><pre class="screen">string</pre></td>
+<td><pre class="screen"></pre></td>
+<td>The password used to decrypt the private key specified in the 'private-key' property when the private key either uses the path scheme, or if the private key is a PKCS#12 format key.</td>
+</tr>
+<tr>
+<td><pre class="screen">private-key-password-flags</pre></td>
+<td><pre class="screen">uint32</pre></td>
+<td><pre class="screen">0</pre></td>
+<td>Flags indicating how to handle the 802.1x private key password. (see <a class="xref" href="secrets-flags.html" title="Secret flag types">the section called “Secret flag types”</a> for flag values)</td>
+</tr>
+<tr>
+<td><pre class="screen">phase2-private-key</pre></td>
+<td><pre class="screen">byte array</pre></td>
+<td><pre class="screen">[]</pre></td>
+<td>Contains the 'phase 2' inner private key when the 'phase2-eap' or 'phase2-autheap' property is set to 'tls'.  Key data is specified using a 'scheme'; two are currently supported: blob and path. When using the blob scheme and private keys, this property should be set to the key's encrypted PEM encoded data. When using private keys with the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string 'file://' and ending with a terminating NULL byte.  When using PKCS#12 format private keys and the blob scheme, this property should be set to the PKCS#12 data and the 'phase2-private-key-password' property must be set to password used to decrypt the PKCS#12 certificate and key.  When using PKCS#12 files and the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string 'file://' and and ending with a terminating NULL byte, and as with the blob scheme the 'phase2-private-key-password' property must be set to the password used to decode the PKCS#12 private key and certificate.</td>
+</tr>
+<tr>
+<td><pre class="screen">phase2-private-key-password</pre></td>
+<td><pre class="screen">string</pre></td>
+<td><pre class="screen"></pre></td>
+<td>The password used to decrypt the 'phase 2' private key specified in the 'private-key' property when the phase2 private key either uses the path scheme, or if the phase2 private key is a PKCS#12 format key.</td>
+</tr>
+<tr>
+<td><pre class="screen">phase2-private-key-password-flags</pre></td>
+<td><pre class="screen">uint32</pre></td>
+<td><pre class="screen">0</pre></td>
+<td>Flags indicating how to handle the 802.1x phase2 private key password. (see <a class="xref" href="secrets-flags.html" title="Secret flag types">the section called “Secret flag types”</a> for flag values)</td>
+</tr>
+<tr>
+<td><pre class="screen">system-ca-certs</pre></td>
+<td><pre class="screen">boolean</pre></td>
+<td><pre class="screen">FALSE</pre></td>
+<td>When TRUE, overrides 'ca-path' and 'phase2-ca-path' properties using the system CA directory specified at configure time with the --system-ca-path switch.  The certificates in this directory are added to the verification chain in addition to any certificates specified by the 'ca-cert' and 'phase2-ca-cert' properties.</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<p><br class="table-break">
+</p>
+<div class="table">
+<a name="id541403"></a><p class="title"><b>Table 2. bluetooth setting</b></p>
+<div class="table-contents"><table summary="bluetooth setting" border="1">
+<colgroup>
+<col>
+<col>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>Key Name</th>
+<th>Value Type</th>
+<th>Default Value</th>
+<th>Value Description</th>
+</tr></thead>
+<tbody>
+<tr>
+<td><pre class="screen">name</pre></td>
+<td><pre class="screen">string</pre></td>
+<td><pre class="screen">bluetooth</pre></td>
+<td>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.</td>
+</tr>
+<tr>
+<td><pre class="screen">bdaddr</pre></td>
+<td><pre class="screen">byte array</pre></td>
+<td><pre class="screen">[]</pre></td>
+<td>The Bluetooth address of the device</td>
+</tr>
+<tr>
+<td><pre class="screen">type</pre></td>
+<td><pre class="screen">string</pre></td>
+<td><pre class="screen"></pre></td>
+<td>Either 'dun' for Dial-Up Networking connections or 'panu' for Personal Area Networking connections.</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<p><br class="table-break">
+</p>
+<div class="table">
+<a name="id541536"></a><p class="title"><b>Table 3. cdma setting</b></p>
+<div class="table-contents"><table summary="cdma setting" border="1">
+<colgroup>
+<col>
+<col>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>Key Name</th>
+<th>Value Type</th>
+<th>Default Value</th>
+<th>Value Description</th>
+</tr></thead>
+<tbody>
+<tr>
+<td><pre class="screen">name</pre></td>
+<td><pre class="screen">string</pre></td>
+<td><pre class="screen">cdma</pre></td>
+<td>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.</td>
+</tr>
+<tr>
+<td><pre class="screen">number</pre></td>
+<td><pre class="screen">string</pre></td>
+<td><pre class="screen"></pre></td>
+<td>Number to dial when establishing a PPP data session with the CDMA-based mobile broadband network.  If not specified, the default number (#777) is used when required.</td>
+</tr>
+<tr>
+<td><pre class="screen">username</pre></td>
+<td><pre class="screen">string</pre></td>
+<td><pre class="screen"></pre></td>
+<td>Username used to authenticate with the network, if required.  Note that many providers do not require a username or accept any username.</td>
+</tr>
+<tr>
+<td><pre class="screen">password</pre></td>
+<td><pre class="screen">string</pre></td>
+<td><pre class="screen"></pre></td>
+<td>Password used to authenticate with the network, if required.  Note that many providers do not require a password or accept any password.</td>
+</tr>
+<tr>
+<td><pre class="screen">password-flags</pre></td>
+<td><pre class="screen">uint32</pre></td>
+<td><pre class="screen">0</pre></td>
+<td>Flags indicating how to handle the CDMA password. (see <a class="xref" href="secrets-flags.html" title="Secret flag types">the section called “Secret flag types”</a> for flag values)</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<p><br class="table-break">
+</p>
+<div class="table">
+<a name="id541734"></a><p class="title"><b>Table 4. connection setting</b></p>
+<div class="table-contents"><table summary="connection setting" border="1">
+<colgroup>
+<col>
+<col>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>Key Name</th>
+<th>Value Type</th>
+<th>Default Value</th>
+<th>Value Description</th>
+</tr></thead>
+<tbody>
+<tr>
+<td><pre class="screen">name</pre></td>
+<td><pre class="screen">string</pre></td>
+<td><pre class="screen">connection</pre></td>
+<td>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.</td>
+</tr>
+<tr>
+<td><pre class="screen">id</pre></td>
+<td><pre class="screen">string</pre></td>
+<td><pre class="screen"></pre></td>
+<td>User-readable connection identifier/name.  Must be one or more characters and may change over the lifetime of the connection if the user decides to rename it.</td>
+</tr>
+<tr>
+<td><pre class="screen">uuid</pre></td>
+<td><pre class="screen">string</pre></td>
+<td><pre class="screen"></pre></td>
+<td>Universally unique connection identifier.  Must be in the format '2815492f-7e56-435e-b2e9-246bd7cdc664' (ie, contains only hexadecimal characters and '-'). The UUID should be assigned when the connection is created and never changed as long as the connection still applies to the same network.  For example, it should not be changed when the user changes the connection's 'id', but should be recreated when the WiFi SSID, mobile broadband network provider, or the connection type changes.</td>
+</tr>
+<tr>
+<td><pre class="screen">type</pre></td>
+<td><pre class="screen">string</pre></td>
+<td><pre class="screen"></pre></td>
+<td>Base type of the connection.  For hardware-dependent connections, should contain the setting name of the hardware-type specific setting (ie, '802-3-ethernet' or '802-11-wireless' or 'bluetooth', etc), and for non-hardware dependent connections like VPN or otherwise, should contain the setting name of that setting type (ie, 'vpn' or 'bridge', etc).</td>
+</tr>
+<tr>
+<td><pre class="screen">permissions</pre></td>
+<td><pre class="screen">array of string</pre></td>
+<td><pre class="screen">[]</pre></td>
+<td>An array of strings defining what access a given user has to this connection.  If this is NULL or empty, all users are allowed to access this connection.  Otherwise a user is allowed to access this connection if and only if they are in this array. Each entry is of the form "[type]:[id]:[reserved]", for example: "user:dcbw:blah"  At this time only the 'user' [type] is allowed.  Any other values are ignored and reserved for future use.  [id] is the username that this permission refers to, which may not contain the ':' character.  Any [reserved] information (if present) must be ignored and is reserved for future use.  All of [type], [id], and [reserved] must be valid UTF-8.</td>
+</tr>
+<tr>
+<td><pre class="screen">autoconnect</pre></td>
+<td><pre class="screen">boolean</pre></td>
+<td><pre class="screen">TRUE</pre></td>
+<td>If TRUE, NetworkManager will activate this connection when its network resources are available.  If FALSE, the connection must be manually activated by the user or some other mechanism.</td>
+</tr>
+<tr>
+<td><pre class="screen">timestamp</pre></td>
+<td><pre class="screen">uint64</pre></td>
+<td><pre class="screen">0</pre></td>
+<td>Timestamp (in seconds since the Unix Epoch) that the connection was last successfully activated.  Settings services should update the connection timestamp periodically when the connection is active to ensure that an active connection has the latest timestamp.</td>
+</tr>
+<tr>
+<td><pre class="screen">read-only</pre></td>
+<td><pre class="screen">boolean</pre></td>
+<td><pre class="screen">FALSE</pre></td>
+<td>If TRUE, the connection is read-only and cannot be changed by the user or any other mechanism.  This is normally set for system connections whose plugin cannot yet write updated connections back out.</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<p><br class="table-break">
+</p>
+<div class="table">
+<a name="id542035"></a><p class="title"><b>Table 5. gsm setting</b></p>
+<div class="table-contents"><table summary="gsm setting" border="1">
+<colgroup>
+<col>
+<col>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>Key Name</th>
+<th>Value Type</th>
+<th>Default Value</th>
+<th>Value Description</th>
+</tr></thead>
+<tbody>
+<tr>
+<td><pre class="screen">name</pre></td>
+<td><pre class="screen">string</pre></td>
+<td><pre class="screen">gsm</pre></td>
+<td>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.</td>
+</tr>
+<tr>
+<td><pre class="screen">number</pre></td>
+<td><pre class="screen">string</pre></td>
+<td><pre class="screen"></pre></td>
+<td>Number to dial when establishing a PPP data session with the GSM-based mobile broadband network.  In most cases, leave the number blank and a number selecting the APN specified in the 'apn' property will be used automatically when required.</td>
+</tr>
+<tr>
+<td><pre class="screen">username</pre></td>
+<td><pre class="screen">string</pre></td>
+<td><pre class="screen"></pre></td>
+<td>Username used to authenticate with the network, if required.  Note that many providers do not require a username or accept any username.</td>
+</tr>
+<tr>
+<td><pre class="screen">password</pre></td>
+<td><pre class="screen">string</pre></td>
+<td><pre class="screen"></pre></td>
+<td>Password used to authenticate with the network, if required.  Note that many providers do not require a password or accept any password.</td>
+</tr>
+<tr>
+<td><pre class="screen">password-flags</pre></td>
+<td><pre class="screen">uint32</pre></td>
+<td><pre class="screen">0</pre></td>
+<td>Flags indicating how to handle the GSM password. (see <a class="xref" href="secrets-flags.html" title="Secret flag types">the section called “Secret flag types”</a> for flag values)</td>
+</tr>
+<tr>
+<td><pre class="screen">apn</pre></td>
+<td><pre class="screen">string</pre></td>
+<td><pre class="screen"></pre></td>
+<td>The GPRS Access Point Name specifying the APN used when establishing a data session with the GSM-based network.  The APN often determines how the user will be billed for their network usage and whether the user has access to the Internet or just a provider-specific walled-garden, so it is important to use the correct APN for the user's mobile broadband plan.  The APN may only be composed of the characters a-z, 0-9, ., and - per GSM 03.60 Section 14.9.</td>
+</tr>
+<tr>
+<td><pre class="screen">network-id</pre></td>
+<td><pre class="screen">string</pre></td>
+<td><pre class="screen"></pre></td>
+<td>The Network ID (GSM LAI format, ie MCC-MNC) to force specific network registration.  If the Network ID is specified, NetworkManager will attempt to force the device to register only on the specified network.  This can be used to ensure that the device does not roam when direct roaming control of the device is not otherwise possible.</td>
+</tr>
+<tr>
+<td><pre class="screen">network-type</pre></td>
+<td><pre class="screen">int32</pre></td>
+<td><pre class="screen">-1</pre></td>
+<td>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.</td>
+</tr>
+<tr>
+<td><pre class="screen">pin</pre></td>
+<td><pre class="screen">string</pre></td>
+<td><pre class="screen"></pre></td>
+<td>If the SIM is locked with a PIN it must be unlocked before any other operations are requested.  Specify the PIN here to allow operation of the device.</td>
+</tr>
+<tr>
+<td><pre class="screen">pin-flags</pre></td>
+<td><pre class="screen">uint32</pre></td>
+<td><pre class="screen">0</pre></td>
+<td>Flags indicating how to handle the GSM SIM PIN. (see <a class="xref" href="secrets-flags.html" title="Secret flag types">the section called “Secret flag types”</a> for flag values)</td>
+</tr>
+<tr>
+<td><pre class="screen">allowed-bands</pre></td>
+<td><pre class="screen">uint32</pre></td>
+<td><pre class="screen">1</pre></td>
+<td>Bitfield of allowed frequency bands.  Note that not all devices allow frequency band control.</td>
+</tr>
+<tr>
+<td><pre class="screen">home-only</pre></td>
+<td><pre class="screen">boolean</pre></td>
+<td><pre class="screen">FALSE</pre></td>
+<td>When TRUE, only connections to the home network will be allowed.  Connections to roaming networks will not be made.</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<p><br class="table-break">
+</p>
+<div class="table">
+<a name="id542460"></a><p class="title"><b>Table 6. ipv4 setting</b></p>
+<div class="table-contents"><table summary="ipv4 setting" border="1">
+<colgroup>
+<col>
+<col>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>Key Name</th>
+<th>Value Type</th>
+<th>Default Value</th>
+<th>Value Description</th>
+</tr></thead>
+<tbody>
+<tr>
+<td><pre class="screen">name</pre></td>
+<td><pre class="screen">string</pre></td>
+<td><pre class="screen">ipv4</pre></td>
+<td>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.</td>
+</tr>
+<tr>
+<td><pre class="screen">method</pre></td>
+<td><pre class="screen">string</pre></td>
+<td><pre class="screen"></pre></td>
+<td>IPv4 configuration method.  If 'auto' is specified then the appropriate automatic method (DHCP, PPP, etc) is used for the interface and most other properties can be left unset.  If 'link-local' is specified, then a link-local address in the 169.254/16 range will be assigned to the interface.  If 'manual' is specified, static IP addressing is used and at least one IP address must be given in the 'addresses' property.  If 'shared' is specified (indicating that this connection will provide network access to other computers) then the interface is assigned an address in the 10.42.x.1/24 range and a DHCP and forwarding DNS server are started, and the interface is NAT-ed to the current default network connection.  'disabled' means IPv4 will not be used on this connection.  This property must be set.</td>
+</tr>
+<tr>
+<td><pre class="screen">dns</pre></td>
+<td><pre class="screen">array of uint32</pre></td>
+<td><pre class="screen">[]</pre></td>
+<td>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.</td>
+</tr>
+<tr>
+<td><pre class="screen">dns-search</pre></td>
+<td><pre class="screen">array of string</pre></td>
+<td><pre class="screen">[]</pre></td>
+<td>List of DNS search domains.  For the 'auto' method, these search domains are appended to those returned by automatic configuration. Search domains cannot be used with the 'shared', 'link-local', or 'disabled' methods as there is no upstream network.  In all other methods, these search domains are used as the only search domains for this connection.</td>
+</tr>
+<tr>
+<td><pre class="screen">addresses</pre></td>
+<td><pre class="screen">array of array of uint32</pre></td>
+<td><pre class="screen">[]</pre></td>
+<td>Array of IPv4 address structures.  Each IPv4 address structure is composed of 3 32-bit values; the first being the IPv4 address (network byte order), the second the prefix (1 - 32), and last the IPv4 gateway (network byte order). The gateway may be left as 0 if no gateway exists for that subnet.  For the 'auto' method, given IP addresses are appended to those returned by automatic configuration.  Addresses cannot be used with the 'shared', 'link-local', or 'disabled' methods as addressing is either automatic or disabled with these methods.</td>
+</tr>
+<tr>
+<td><pre class="screen">routes</pre></td>
+<td><pre class="screen">array of array of uint32</pre></td>
+<td><pre class="screen">[]</pre></td>
+<td>Array of IPv4 route structures.  Each IPv4 route structure is composed of 4 32-bit values; the first being the destination IPv4 network or address (network byte order), the second the destination network or address prefix (1 - 32), the third being the next-hop (network byte order) if any, and the fourth being the route metric. For the 'auto' method, given IP routes are appended to those returned by automatic configuration.  Routes cannot be used with the 'shared', 'link-local', or 'disabled', methods as there is no upstream network.</td>
+</tr>
+<tr>
+<td><pre class="screen">ignore-auto-routes</pre></td>
+<td><pre class="screen">boolean</pre></td>
+<td><pre class="screen">FALSE</pre></td>
+<td>When the method is set to 'auto' and this property to TRUE, automatically configured routes are ignored and only routes specified in the 'routes' property, if any, are used.</td>
+</tr>
+<tr>
+<td><pre class="screen">ignore-auto-dns</pre></td>
+<td><pre class="screen">boolean</pre></td>
+<td><pre class="screen">FALSE</pre></td>
+<td>When the method is set to 'auto' and this property to TRUE, automatically configured nameservers and search domains are ignored and only nameservers and search domains specified in the 'dns' and 'dns-search' properties, if any, are used.</td>
+</tr>
+<tr>
+<td><pre class="screen">dhcp-client-id</pre></td>
+<td><pre class="screen">string</pre></td>
+<td><pre class="screen"></pre></td>
+<td>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.</td>
+</tr>
+<tr>
+<td><pre class="screen">dhcp-send-hostname</pre></td>
+<td><pre class="screen">boolean</pre></td>
+<td><pre class="screen">TRUE</pre></td>
+<td>If TRUE, a hostname is sent to the DHCP server when acquiring a lease.  Some DHCP servers use this hostname to update DNS databases, essentially providing a static hostname for the computer.  If the 'dhcp-hostname' property is empty and this property is TRUE, the current persistent hostname of the computer is sent.</td>
+</tr>
+<tr>
+<td><pre class="screen">dhcp-hostname</pre></td>
+<td><pre class="screen">string</pre></td>
+<td><pre class="screen"></pre></td>
+<td>If the 'dhcp-send-hostname' property is TRUE, then the specified name will be sent to the DHCP server when acquiring a lease.</td>
+</tr>
+<tr>
+<td><pre class="screen">never-default</pre></td>
+<td><pre class="screen">boolean</pre></td>
+<td><pre class="screen">FALSE</pre></td>
+<td>If TRUE, this connection will never be the default IPv4 connection, meaning it will never be assigned the default route by NetworkManager.</td>
+</tr>
+<tr>
+<td><pre class="screen">may-fail</pre></td>
+<td><pre class="screen">boolean</pre></td>
+<td><pre class="screen">FALSE</pre></td>
+<td>If TRUE, allow overall network configuration to proceed even if IPv4 configuration times out. Note that at least one IP configuration must succeed or overall network configuration will still fail.  For example, in IPv6-only networks, setting this property to TRUE allows the overall network configuration to succeed if IPv4 configuration fails but IPv6 configuration completes successfully.</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<p><br class="table-break">
+</p>
+<div class="table">
+<a name="id571362"></a><p class="title"><b>Table 7. ipv6 setting</b></p>
+<div class="table-contents"><table summary="ipv6 setting" border="1">
+<colgroup>
+<col>
+<col>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>Key Name</th>
+<th>Value Type</th>
+<th>Default Value</th>
+<th>Value Description</th>
+</tr></thead>
+<tbody>
+<tr>
+<td><pre class="screen">name</pre></td>
+<td><pre class="screen">string</pre></td>
+<td><pre class="screen">ipv6</pre></td>
+<td>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.</td>
+</tr>
+<tr>
+<td><pre class="screen">method</pre></td>
+<td><pre class="screen">string</pre></td>
+<td><pre class="screen"></pre></td>
+<td>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.</td>
+</tr>
+<tr>
+<td><pre class="screen">dns</pre></td>
+<td><pre class="screen">array of byte array</pre></td>
+<td><pre class="screen">[]</pre></td>
+<td>Array of DNS servers, where each member of the array is a byte array containing the IPv6 address of the DNS server (in network byte order). For the 'auto' method, these DNS servers are appended to those (if any) returned by automatic configuration.  DNS servers cannot be used with the 'shared' or 'link-local' methods as there is no usptream network.  In all other methods, these DNS servers are used as the only DNS servers for this connection.</td>
+</tr>
+<tr>
+<td><pre class="screen">dns-search</pre></td>
+<td><pre class="screen">array of string</pre></td>
+<td><pre class="screen">[]</pre></td>
+<td>List of DNS search domains.  For the 'auto' method, these search domains are appended to those returned by automatic configuration. Search domains cannot be used with the 'shared' or 'link-local' methods as there is no upstream network.  In all other methods, these search domains are used as the only search domains for this connection.</td>
+</tr>
+<tr>
+<td><pre class="screen">addresses</pre></td>
+<td><pre class="screen">array of (byte array, uint32, byte array)</pre></td>
+<td><pre class="screen">[]</pre></td>
+<td>Array of IPv6 address structures.  Each IPv6 address structure is composed of 3 members, the first being a byte array containing the IPv6 address (network byte order), the second a 32-bit integer containing the IPv6 address prefix, and the third a byte array containing the IPv6 address (network byte order) of the gateway associated with this address, if any. If no gateway is given, the third element should be given as all zeros.  For the 'auto' method, given IP addresses are appended to those returned by automatic configuration.  Addresses cannot be used with the 'shared' or 'link-local' methods as the interface is automatically assigned an address with these methods.</td>
+</tr>
+<tr>
+<td><pre class="screen">routes</pre></td>
+<td><pre class="screen">array of (byte array, uint32, byte array, uint32)</pre></td>
+<td><pre class="screen">[]</pre></td>
+<td>Array of IPv6 route structures.  Each IPv6 route structure is composed of 4 members; the first being the destination IPv6 network or address (network byte order) as a byte array, the second the destination network or address IPv6 prefix, the third being the next-hop IPv6 address (network byte order) if any, and the fourth being the route metric. For the 'auto' method, given IP routes are appended to those returned by automatic configuration.  Routes cannot be used with the 'shared' or 'link-local' methods because there is no upstream network.</td>
+</tr>
+<tr>
+<td><pre class="screen">ignore-auto-routes</pre></td>
+<td><pre class="screen">boolean</pre></td>
+<td><pre class="screen">FALSE</pre></td>
+<td>When the method is set to 'auto' or 'dhcp' and this property is set to TRUE, automatically configured routes are ignored and only routes specified in the 'routes' property, if any, are used.</td>
+</tr>
+<tr>
+<td><pre class="screen">ignore-auto-dns</pre></td>
+<td><pre class="screen">boolean</pre></td>
+<td><pre class="screen">FALSE</pre></td>
+<td>When the method is set to 'auto' or 'dhcp' and this property is set to TRUE, automatically configured nameservers and search domains are ignored and only nameservers and search domains specified in the 'dns' and 'dns-search' properties, if any, are used.</td>
+</tr>
+<tr>
+<td><pre class="screen">never-default</pre></td>
+<td><pre class="screen">boolean</pre></td>
+<td><pre class="screen">FALSE</pre></td>
+<td>If TRUE, this connection will never be the default IPv6 connection, meaning it will never be assigned the default IPv6 route by NetworkManager.</td>
+</tr>
+<tr>
+<td><pre class="screen">may-fail</pre></td>
+<td><pre class="screen">boolean</pre></td>
+<td><pre class="screen">FALSE</pre></td>
+<td>If TRUE, allow overall network configuration to proceed even if IPv6 configuration times out. Note that at least one IP configuration must succeed or overall network configuration will still fail.  For example, in IPv4-only networks, setting this property to TRUE allows the overall network configuration to succeed if IPv6 configuration fails but IPv4 configuration completes successfully.</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<p><br class="table-break">
+</p>
+<div class="table">
+<a name="id571680"></a><p class="title"><b>Table 8. 802-11-olpc-mesh setting</b></p>
+<div class="table-contents"><table summary="802-11-olpc-mesh setting" border="1">
+<colgroup>
+<col>
+<col>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>Key Name</th>
+<th>Value Type</th>
+<th>Default Value</th>
+<th>Value Description</th>
+</tr></thead>
+<tbody>
+<tr>
+<td><pre class="screen">name</pre></td>
+<td><pre class="screen">string</pre></td>
+<td><pre class="screen">802-11-olpc-mesh</pre></td>
+<td>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.</td>
+</tr>
+<tr>
+<td><pre class="screen">ssid</pre></td>
+<td><pre class="screen">byte array</pre></td>
+<td><pre class="screen">[]</pre></td>
+<td>SSID of the mesh network to join.</td>
+</tr>
+<tr>
+<td><pre class="screen">channel</pre></td>
+<td><pre class="screen">uint32</pre></td>
+<td><pre class="screen">0</pre></td>
+<td>Channel on which the mesh network to join is located.</td>
+</tr>
+<tr>
+<td><pre class="screen">dhcp-anycast-address</pre></td>
+<td><pre class="screen">byte array</pre></td>
+<td><pre class="screen">[]</pre></td>
+<td>Anycast DHCP MAC address used when requesting an IP address via DHCP.  The specific anycast address used determines which DHCP server class answers the the request.</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<p><br class="table-break">
+</p>
+<div class="table">
+<a name="id571818"></a><p class="title"><b>Table 9. ppp setting</b></p>
+<div class="table-contents"><table summary="ppp setting" border="1">
+<colgroup>
+<col>
+<col>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>Key Name</th>
+<th>Value Type</th>
+<th>Default Value</th>
+<th>Value Description</th>
+</tr></thead>
+<tbody>
+<tr>
+<td><pre class="screen">name</pre></td>
+<td><pre class="screen">string</pre></td>
+<td><pre class="screen">ppp</pre></td>
+<td>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.</td>
+</tr>
+<tr>
+<td><pre class="screen">noauth</pre></td>
+<td><pre class="screen">boolean</pre></td>
+<td><pre class="screen">TRUE</pre></td>
+<td>If TRUE, do not require the other side (usually the PPP server) to authenticate itself to the client.  If FALSE, require authentication from the remote side.  In almost all cases, this should be TRUE.</td>
+</tr>
+<tr>
+<td><pre class="screen">refuse-eap</pre></td>
+<td><pre class="screen">boolean</pre></td>
+<td><pre class="screen">FALSE</pre></td>
+<td>If TRUE, the EAP authentication method will not be used.</td>
+</tr>
+<tr>
+<td><pre class="screen">refuse-pap</pre></td>
+<td><pre class="screen">boolean</pre></td>
+<td><pre class="screen">FALSE</pre></td>
+<td>If TRUE, the PAP authentication method will not be used.</td>
+</tr>
+<tr>
+<td><pre class="screen">refuse-chap</pre></td>
+<td><pre class="screen">boolean</pre></td>
+<td><pre class="screen">FALSE</pre></td>
+<td>If TRUE, the CHAP authentication method will not be used.</td>
+</tr>
+<tr>
+<td><pre class="screen">refuse-mschap</pre></td>
+<td><pre class="screen">boolean</pre></td>
+<td><pre class="screen">FALSE</pre></td>
+<td>If TRUE, the MSCHAP authentication method will not be used.</td>
+</tr>
+<tr>
+<td><pre class="screen">refuse-mschapv2</pre></td>
+<td><pre class="screen">boolean</pre></td>
+<td><pre class="screen">FALSE</pre></td>
+<td>If TRUE, the MSCHAPv2 authentication method will not be used.</td>
+</tr>
+<tr>
+<td><pre class="screen">nobsdcomp</pre></td>
+<td><pre class="screen">boolean</pre></td>
+<td><pre class="screen">FALSE</pre></td>
+<td>If TRUE, BSD compression will not be requested.</td>
+</tr>
+<tr>
+<td><pre class="screen">nodeflate</pre></td>
+<td><pre class="screen">boolean</pre></td>
+<td><pre class="screen">FALSE</pre></td>
+<td>If TRUE, 'deflate' compression will not be requested.</td>
+</tr>
+<tr>
+<td><pre class="screen">no-vj-comp</pre></td>
+<td><pre class="screen">boolean</pre></td>
+<td><pre class="screen">FALSE</pre></td>
+<td>If TRUE, Van Jacobsen TCP header compression will not be requested.</td>
+</tr>
+<tr>
+<td><pre class="screen">require-mppe</pre></td>
+<td><pre class="screen">boolean</pre></td>
+<td><pre class="screen">FALSE</pre></td>
+<td>If TRUE, MPPE (Microsoft Point-to-Point Encrpytion) will be required for the PPP session.  If either 64-bit or 128-bit MPPE is not available the session will fail.  Note that MPPE is not used on mobile broadband connections.</td>
+</tr>
+<tr>
+<td><pre class="screen">require-mppe-128</pre></td>
+<td><pre class="screen">boolean</pre></td>
+<td><pre class="screen">FALSE</pre></td>
+<td>If TRUE, 128-bit MPPE (Microsoft Point-to-Point Encrpytion) will be required for the PPP session, and the 'require-mppe' property must also be set to TRUE.  If 128-bit MPPE is not available the session will fail.</td>
+</tr>
+<tr>
+<td><pre class="screen">mppe-stateful</pre></td>
+<td><pre class="screen">boolean</pre></td>
+<td><pre class="screen">FALSE</pre></td>
+<td>If TRUE, stateful MPPE is used.  See pppd documentation for more information on stateful MPPE.</td>
+</tr>
+<tr>
+<td><pre class="screen">crtscts</pre></td>
+<td><pre class="screen">boolean</pre></td>
+<td><pre class="screen">FALSE</pre></td>
+<td>If TRUE, specify that pppd should set the serial port to use hardware flow control with RTS and CTS signals.  This value should normally be set to FALSE.</td>
+</tr>
+<tr>
+<td><pre class="screen">baud</pre></td>
+<td><pre class="screen">uint32</pre></td>
+<td><pre class="screen">0</pre></td>
+<td>If non-zero, instruct pppd to set the serial port to the specified baudrate.  This value should normally be left as 0 to automatically choose the speed.</td>
+</tr>
+<tr>
+<td><pre class="screen">mru</pre></td>
+<td><pre class="screen">uint32</pre></td>
+<td><pre class="screen">0</pre></td>
+<td>If non-zero, instruct pppd to request that the peer send packets no larger than the specified size.  If non-zero, the MRU should be between 128 and 16384.</td>
+</tr>
+<tr>
+<td><pre class="screen">mtu</pre></td>
+<td><pre class="screen">uint32</pre></td>
+<td><pre class="screen">0</pre></td>
+<td>If non-zero, instruct pppd to send packets no larger than the specified size.</td>
+</tr>
+<tr>
+<td><pre class="screen">lcp-echo-failure</pre></td>
+<td><pre class="screen">uint32</pre></td>
+<td><pre class="screen">0</pre></td>
+<td>If non-zero, instruct pppd to presume the connection to the peer has failed if the specified number of LCP echo-requests go unanswered by the peer.  The 'lcp-echo-interval' property must also be set to a non-zero value if this property is used.</td>
+</tr>
+<tr>
+<td><pre class="screen">lcp-echo-interval</pre></td>
+<td><pre class="screen">uint32</pre></td>
+<td><pre class="screen">0</pre></td>
+<td>If non-zero, instruct pppd to send an LCP echo-request frame to the peer every n seconds (where n is the specified value).  Note that some PPP peers will respond to echo requests and some will not, and it is not possible to autodetect this.</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<p><br class="table-break">
+</p>
+<div class="table">
+<a name="id572348"></a><p class="title"><b>Table 10. pppoe setting</b></p>
+<div class="table-contents"><table summary="pppoe setting" border="1">
+<colgroup>
+<col>
+<col>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>Key Name</th>
+<th>Value Type</th>
+<th>Default Value</th>
+<th>Value Description</th>
+</tr></thead>
+<tbody>
+<tr>
+<td><pre class="screen">name</pre></td>
+<td><pre class="screen">string</pre></td>
+<td><pre class="screen">pppoe</pre></td>
+<td>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.</td>
+</tr>
+<tr>
+<td><pre class="screen">service</pre></td>
+<td><pre class="screen">string</pre></td>
+<td><pre class="screen"></pre></td>
+<td>If specified, instruct PPPoE to only initiate sessions with access concentrators that provide the specified serivce.  For most providers, this should be left blank.  It is only required if there are multiple access concentrators or a specific service is known to be required.</td>
+</tr>
+<tr>
+<td><pre class="screen">username</pre></td>
+<td><pre class="screen">string</pre></td>
+<td><pre class="screen"></pre></td>
+<td>Username used to authenticate with the PPPoE service.</td>
+</tr>
+<tr>
+<td><pre class="screen">password</pre></td>
+<td><pre class="screen">string</pre></td>
+<td><pre class="screen"></pre></td>
+<td>Password used to authenticate with the PPPoE service.</td>
+</tr>
+<tr>
+<td><pre class="screen">password-flags</pre></td>
+<td><pre class="screen">uint32</pre></td>
+<td><pre class="screen">0</pre></td>
+<td>Flags indicating how to handle the PPPoE password. (see <a class="xref" href="secrets-flags.html" title="Secret flag types">the section called “Secret flag types”</a> for flag values)</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<p><br class="table-break">
+</p>
+<div class="table">
+<a name="id572513"></a><p class="title"><b>Table 11. serial setting</b></p>
+<div class="table-contents"><table summary="serial setting" border="1">
+<colgroup>
+<col>
+<col>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>Key Name</th>
+<th>Value Type</th>
+<th>Default Value</th>
+<th>Value Description</th>
+</tr></thead>
+<tbody>
+<tr>
+<td><pre class="screen">name</pre></td>
+<td><pre class="screen">string</pre></td>
+<td><pre class="screen">serial</pre></td>
+<td>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.</td>
+</tr>
+<tr>
+<td><pre class="screen">baud</pre></td>
+<td><pre class="screen">uint32</pre></td>
+<td><pre class="screen">57600</pre></td>
+<td>Speed to use for communication over the serial port.  Note that this value usually has no effect for mobile broadband modems as they generally ignore speed settings and use the highest available speed.</td>
+</tr>
+<tr>
+<td><pre class="screen">bits</pre></td>
+<td><pre class="screen">uint32</pre></td>
+<td><pre class="screen">8</pre></td>
+<td>Byte-width of the serial communication.  The 8 in '8n1' for example.</td>
+</tr>
+<tr>
+<td><pre class="screen">parity</pre></td>
+<td><pre class="screen">gchar</pre></td>
+<td><pre class="screen">110</pre></td>
+<td>Parity setting of the serial port.  Either 'E' for even parity, 'o' for odd parity, or 'n' for no parity.</td>
+</tr>
+<tr>
+<td><pre class="screen">stopbits</pre></td>
+<td><pre class="screen">uint32</pre></td>
+<td><pre class="screen">1</pre></td>
+<td>Number of stop bits for communication on the serial port.  Either 1 or 2.  The 1 in '8n1' for example.</td>
+</tr>
+<tr>
+<td><pre class="screen">send-delay</pre></td>
+<td><pre class="screen">uint64</pre></td>
+<td><pre class="screen">0</pre></td>
+<td>Time to delay between each byte sent to the modem, in microseconds.</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<p><br class="table-break">
+</p>
+<div class="table">
+<a name="id572704"></a><p class="title"><b>Table 12. vpn setting</b></p>
+<div class="table-contents"><table summary="vpn setting" border="1">
+<colgroup>
+<col>
+<col>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>Key Name</th>
+<th>Value Type</th>
+<th>Default Value</th>
+<th>Value Description</th>
+</tr></thead>
+<tbody>
+<tr>
+<td><pre class="screen">name</pre></td>
+<td><pre class="screen">string</pre></td>
+<td><pre class="screen">vpn</pre></td>
+<td>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.</td>
+</tr>
+<tr>
+<td><pre class="screen">service-type</pre></td>
+<td><pre class="screen">string</pre></td>
+<td><pre class="screen"></pre></td>
+<td>D-Bus service name of the VPN plugin that this setting uses to connect to its network.  i.e. org.freedesktop.NetworkManager.vpnc for the vpnc plugin.</td>
+</tr>
+<tr>
+<td><pre class="screen">user-name</pre></td>
+<td><pre class="screen">string</pre></td>
+<td><pre class="screen"></pre></td>
+<td>User name of the currently logged in user for connections provided by the user settings service.  This name is provided to the VPN plugin to use in lieu of a custom username provided by that VPN plugins specific configuration.  The VPN plugin itself decides which user name to use.</td>
+</tr>
+<tr>
+<td><pre class="screen">data</pre></td>
+<td><pre class="screen">dict of (string::string)</pre></td>
+<td><pre class="screen">[ ]</pre></td>
+<td>Dictionary of key/value pairs of VPN plugin specific data.  Both keys and values must be strings.</td>
+</tr>
+<tr>
+<td><pre class="screen">secrets</pre></td>
+<td><pre class="screen">dict of (string::string)</pre></td>
+<td><pre class="screen">[ ]</pre></td>
+<td>Dictionary of key/value pairs of VPN plugin specific secrets like passwords or private keys.  Both keys and values must be strings.</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<p><br class="table-break">
+</p>
+<div class="table">
+<a name="id572870"></a><p class="title"><b>Table 13. wimax setting</b></p>
+<div class="table-contents"><table summary="wimax setting" border="1">
+<colgroup>
+<col>
+<col>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>Key Name</th>
+<th>Value Type</th>
+<th>Default Value</th>
+<th>Value Description</th>
+</tr></thead>
+<tbody>
+<tr>
+<td><pre class="screen">name</pre></td>
+<td><pre class="screen">string</pre></td>
+<td><pre class="screen">wimax</pre></td>
+<td>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.</td>
+</tr>
+<tr>
+<td><pre class="screen">network-name</pre></td>
+<td><pre class="screen">string</pre></td>
+<td><pre class="screen"></pre></td>
+<td>Network Service Provider (NSP) name of the WiMAX network this connection should use.</td>
+</tr>
+<tr>
+<td><pre class="screen">mac-address</pre></td>
+<td><pre class="screen">byte array</pre></td>
+<td><pre class="screen">[]</pre></td>
+<td>If specified, this connection will only apply to the WiMAX device whose MAC address matches.  This property does not change the MAC address of the device (known as MAC spoofing).</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<p><br class="table-break">
+</p>
+<div class="table">
+<a name="id572994"></a><p class="title"><b>Table 14. 802-3-ethernet setting</b></p>
+<div class="table-contents"><table summary="802-3-ethernet setting" border="1">
+<colgroup>
+<col>
+<col>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>Key Name</th>
+<th>Value Type</th>
+<th>Default Value</th>
+<th>Value Description</th>
+</tr></thead>
+<tbody>
+<tr>
+<td><pre class="screen">name</pre></td>
+<td><pre class="screen">string</pre></td>
+<td><pre class="screen">802-3-ethernet</pre></td>
+<td>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.</td>
+</tr>
+<tr>
+<td><pre class="screen">port</pre></td>
+<td><pre class="screen">string</pre></td>
+<td><pre class="screen"></pre></td>
+<td>Specific port type to use if multiple the device supports multiple attachment methods.  One of 'tp' (Twisted Pair), 'aui' (Attachment Unit Interface), 'bnc' (Thin Ethernet) or 'mii' (Media Independent Interface.  If the device supports only one port type, this setting is ignored.</td>
+</tr>
+<tr>
+<td><pre class="screen">speed</pre></td>
+<td><pre class="screen">uint32</pre></td>
+<td><pre class="screen">0</pre></td>
+<td>If non-zero, request that the device use only the specified speed.  In Mbit/s, ie 100 == 100Mbit/s.</td>
+</tr>
+<tr>
+<td><pre class="screen">duplex</pre></td>
+<td><pre class="screen">string</pre></td>
+<td><pre class="screen"></pre></td>
+<td>If specified, request that the device only use the specified duplex mode.  Either 'half' or 'full'.</td>
+</tr>
+<tr>
+<td><pre class="screen">auto-negotiate</pre></td>
+<td><pre class="screen">boolean</pre></td>
+<td><pre class="screen">TRUE</pre></td>
+<td>If TRUE, allow auto-negotiation of port speed and duplex mode.  If FALSE, do not allow auto-negotiation,in which case the 'speed' and 'duplex' properties should be set.</td>
+</tr>
+<tr>
+<td><pre class="screen">mac-address</pre></td>
+<td><pre class="screen">byte array</pre></td>
+<td><pre class="screen">[]</pre></td>
+<td>If specified, this connection will only apply to the ethernet device whose permanent MAC address matches.  This property does not change the MAC address of the device (i.e. MAC spoofing).</td>
+</tr>
+<tr>
+<td><pre class="screen">cloned-mac-address</pre></td>
+<td><pre class="screen">byte array</pre></td>
+<td><pre class="screen">[]</pre></td>
+<td>If specified, request that the device use this MAC address instead of its permanent MAC address.  This is known as MAC cloning or spoofing.</td>
+</tr>
+<tr>
+<td><pre class="screen">mtu</pre></td>
+<td><pre class="screen">uint32</pre></td>
+<td><pre class="screen">0</pre></td>
+<td>If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple Ethernet frames.</td>
+</tr>
+<tr>
+<td><pre class="screen">s390-subchannels</pre></td>
+<td><pre class="screen">GPtrArray_gchararray_</pre></td>
+<td><pre class="screen">[]</pre></td>
+<td>Identifies specific subchannels that this network device uses for communcation with z/VM or s390 host.  Like the 'mac-address' property for non-z/VM devices, this property can be used to ensure this connection only applies to the network device that uses these subchannels. The list should contain exactly 3 strings, and each string may only be composed of hexadecimal characters and the period (.) character.</td>
+</tr>
+<tr>
+<td><pre class="screen">s390-nettype</pre></td>
+<td><pre class="screen">string</pre></td>
+<td><pre class="screen"></pre></td>
+<td>s390 network device type; one of 'qeth', 'lcs', or 'ctc', representing the different types of virtual network devices available on s390 systems.</td>
+</tr>
+<tr>
+<td><pre class="screen">s390-options</pre></td>
+<td><pre class="screen">dict of (string::string)</pre></td>
+<td><pre class="screen">[ ]</pre></td>
+<td>Dictionary of key/value pairs of s390-specific device options.  Both keys and values must be strings.  Allowed keys include 'portno', 'layer2', 'portname', 'protocol', among others.</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<p><br class="table-break">
+</p>
+<div class="table">
+<a name="id573400"></a><p class="title"><b>Table 15. 802-11-wireless setting</b></p>
+<div class="table-contents"><table summary="802-11-wireless setting" border="1">
+<colgroup>
+<col>
+<col>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>Key Name</th>
+<th>Value Type</th>
+<th>Default Value</th>
+<th>Value Description</th>
+</tr></thead>
+<tbody>
+<tr>
+<td><pre class="screen">name</pre></td>
+<td><pre class="screen">string</pre></td>
+<td><pre class="screen">802-11-wireless</pre></td>
+<td>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.</td>
+</tr>
+<tr>
+<td><pre class="screen">ssid</pre></td>
+<td><pre class="screen">byte array</pre></td>
+<td><pre class="screen">[]</pre></td>
+<td>SSID of the WiFi network.  Must be specified.</td>
+</tr>
+<tr>
+<td><pre class="screen">mode</pre></td>
+<td><pre class="screen">string</pre></td>
+<td><pre class="screen"></pre></td>
+<td>WiFi network mode; one of 'infrastructure' or 'adhoc'.  If blank, infrastructure is assumed.</td>
+</tr>
+<tr>
+<td><pre class="screen">band</pre></td>
+<td><pre class="screen">string</pre></td>
+<td><pre class="screen"></pre></td>
+<td>802.11 frequency band of the network.  One of 'a' for 5GHz 802.11a or 'bg' for 2.4GHz 802.11.  This will lock associations to the WiFi network to the specific band, i.e. if 'a' is specified, the device will not associate with the same network in the 2.4GHz band even if the network's settings are compatible.  This setting depends on specific driver capability and may not work with all drivers.</td>
+</tr>
+<tr>
+<td><pre class="screen">channel</pre></td>
+<td><pre class="screen">uint32</pre></td>
+<td><pre class="screen">0</pre></td>
+<td>Wireless channel to use for the WiFi connection.  The device will only join (or create for Ad-Hoc networks) a WiFi network on the specified channel.  Because channel numbers overlap between bands, this property also requires the 'band' property to be set.</td>
+</tr>
+<tr>
+<td><pre class="screen">bssid</pre></td>
+<td><pre class="screen">byte array</pre></td>
+<td><pre class="screen">[]</pre></td>
+<td>If specified, directs the device to only associate with the given access point.  This capability is highly driver dependent and not supported by all devices.  Note: this property does not control the BSSID used when creating an Ad-Hoc network and is unlikely to in the future.</td>
+</tr>
+<tr>
+<td><pre class="screen">rate</pre></td>
+<td><pre class="screen">uint32</pre></td>
+<td><pre class="screen">0</pre></td>
+<td>If non-zero, directs the device to only use the specified bitrate for communication with the access point.  Units are in Kb/s, ie 5500 = 5.5 Mbit/s.  This property is highly driver dependent and not all devices support setting a static bitrate.</td>
+</tr>
+<tr>
+<td><pre class="screen">tx-power</pre></td>
+<td><pre class="screen">uint32</pre></td>
+<td><pre class="screen">0</pre></td>
+<td>If non-zero, directs the device to use the specified transmit power.  Units are dBm.  This property is highly driver dependent and not all devices support setting a static transmit power.</td>
+</tr>
+<tr>
+<td><pre class="screen">mac-address</pre></td>
+<td><pre class="screen">byte array</pre></td>
+<td><pre class="screen">[]</pre></td>
+<td>If specified, this connection will only apply to the WiFi device whose permanent MAC address matches.  This property does not change the MAC address of the device (i.e. MAC spoofing).</td>
+</tr>
+<tr>
+<td><pre class="screen">cloned-mac-address</pre></td>
+<td><pre class="screen">byte array</pre></td>
+<td><pre class="screen">[]</pre></td>
+<td>If specified, request that the WiFi device use this MAC address instead of its permanent MAC address.  This is known as MAC cloning or spoofing.</td>
+</tr>
+<tr>
+<td><pre class="screen">mtu</pre></td>
+<td><pre class="screen">uint32</pre></td>
+<td><pre class="screen">0</pre></td>
+<td>If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple Ethernet frames.</td>
+</tr>
+<tr>
+<td><pre class="screen">seen-bssids</pre></td>
+<td><pre class="screen">array of string</pre></td>
+<td><pre class="screen">[]</pre></td>
+<td>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.  The settings service will usually populate this property by periodically asking NetworkManager what the device's current AP is while connected to the network (or monitoring the device's 'active-ap' property) and adding the current AP's BSSID to this list.  This list helps NetworkManager find hidden APs by matching up scan results with the BSSIDs in this list.</td>
+</tr>
+<tr>
+<td><pre class="screen">security</pre></td>
+<td><pre class="screen">string</pre></td>
+<td><pre class="screen"></pre></td>
+<td>If the wireless connection has any security restrictions, like 802.1x, WEP, or WPA, set this property to '802-11-wireless-security' and ensure the connection contains a valid 802-11-wireless-security setting.</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<p><br class="table-break">
+</p>
+<div class="table">
+<a name="id573878"></a><p class="title"><b>Table 16. 802-11-wireless-security setting</b></p>
+<div class="table-contents"><table summary="802-11-wireless-security setting" border="1">
+<colgroup>
+<col>
+<col>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>Key Name</th>
+<th>Value Type</th>
+<th>Default Value</th>
+<th>Value Description</th>
+</tr></thead>
+<tbody>
+<tr>
+<td><pre class="screen">name</pre></td>
+<td><pre class="screen">string</pre></td>
+<td><pre class="screen">802-11-wireless-security</pre></td>
+<td>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.</td>
+</tr>
+<tr>
+<td><pre class="screen">key-mgmt</pre></td>
+<td><pre class="screen">string</pre></td>
+<td><pre class="screen"></pre></td>
+<td>Key management used for the connection.  One of 'none' (WEP), 'ieee8021x' (Dynamic WEP), 'wpa-none' (WPA-PSK Ad-Hoc), 'wpa-psk' (infrastructure WPA-PSK), or 'wpa-eap' (WPA-Enterprise).  This property must be set for any WiFi connection that uses security.</td>
+</tr>
+<tr>
+<td><pre class="screen">wep-tx-keyidx</pre></td>
+<td><pre class="screen">uint32</pre></td>
+<td><pre class="screen">0</pre></td>
+<td>When static WEP is used (ie, key-mgmt = 'none') and a non-default WEP key index is used by the AP, put that WEP key index here.  Valid values are 0 (default key) through 3.  Note that some consumer access points (like the Linksys WRT54G) number the keys 1 - 4.</td>
+</tr>
+<tr>
+<td><pre class="screen">auth-alg</pre></td>
+<td><pre class="screen">string</pre></td>
+<td><pre class="screen"></pre></td>
+<td>When WEP is used (ie, key-mgmt = 'none' or 'ieee8021x') indicate the 802.11 authentication algorithm required by the AP here.  One of 'open' for Open System, 'shared' for Shared Key, or 'leap' for Cisco LEAP.  When using Cisco LEAP (ie, key-mgmt = 'ieee8021x' and auth-alg = 'leap') the 'leap-username' and 'leap-password' properties must be specified.</td>
+</tr>
+<tr>
+<td><pre class="screen">proto</pre></td>
+<td><pre class="screen">array of string</pre></td>
+<td><pre class="screen">[]</pre></td>
+<td>List of strings specifying the allowed WPA protocol versions to use.  Each element may be one 'wpa' (allow WPA) or 'rsn' (allow WPA2/RSN).  If not specified, both WPA and RSN connections are allowed.</td>
+</tr>
+<tr>
+<td><pre class="screen">pairwise</pre></td>
+<td><pre class="screen">array of string</pre></td>
+<td><pre class="screen">[]</pre></td>
+<td>If specified, will only connect to WPA networks that provide the specified pairwise encryption capabilities.  Each element may be one of 'wep40', 'wep104', 'tkip', or 'ccmp'.</td>
+</tr>
+<tr>
+<td><pre class="screen">group</pre></td>
+<td><pre class="screen">array of string</pre></td>
+<td><pre class="screen">[]</pre></td>
+<td>If specified, will only connect to WPA networks that provide the specified group/multicast encryption capabilities.  Each element may be one of 'wep40', 'wep104', 'tkip', or 'ccmp'.</td>
+</tr>
+<tr>
+<td><pre class="screen">leap-username</pre></td>
+<td><pre class="screen">string</pre></td>
+<td><pre class="screen"></pre></td>
+<td>The login username for legacy LEAP connections (ie, key-mgmt = 'ieee8021x' and auth-alg = 'leap').</td>
+</tr>
+<tr>
+<td><pre class="screen">wep-key0</pre></td>
+<td><pre class="screen">string</pre></td>
+<td><pre class="screen"></pre></td>
+<td>Index 0 WEP key.  This is the WEP key used in most networks.  See the 'wep-key-type' property for a description of how this key is interpreted.</td>
+</tr>
+<tr>
+<td><pre class="screen">wep-key1</pre></td>
+<td><pre class="screen">string</pre></td>
+<td><pre class="screen"></pre></td>
+<td>Index 1 WEP key.  This WEP index is not used by most networks.  See the 'wep-key-type' property for a description of how this key is interpreted.</td>
+</tr>
+<tr>
+<td><pre class="screen">wep-key2</pre></td>
+<td><pre class="screen">string</pre></td>
+<td><pre class="screen"></pre></td>
+<td>Index 2 WEP key.  This WEP index is not used by most networks.  See the 'wep-key-type' property for a description of how this key is interpreted.</td>
+</tr>
+<tr>
+<td><pre class="screen">wep-key3</pre></td>
+<td><pre class="screen">string</pre></td>
+<td><pre class="screen"></pre></td>
+<td>Index 3 WEP key.  This WEP index is not used by most networks.  See the 'wep-key-type' property for a description of how this key is interpreted.</td>
+</tr>
+<tr>
+<td><pre class="screen">wep-key-flags</pre></td>
+<td><pre class="screen">uint32</pre></td>
+<td><pre class="screen">0</pre></td>
+<td>Flags indicating how to handle the WEP keys. (see <a class="xref" href="secrets-flags.html" title="Secret flag types">the section called “Secret flag types”</a> for flag values)</td>
+</tr>
+<tr>
+<td><pre class="screen">wep-key-type</pre></td>
+<td><pre class="screen">uint32</pre></td>
+<td><pre class="screen">0</pre></td>
+<td>Controls the interpretation of WEP keys.  Allowed values are 1 (interpret WEP keys as hexadecimal or ASCII keys) or 2 (interpret WEP keys as WEP Passphrases).  If set to 1 and the keys are hexadecimal, they must be either 10 or 26 characters in length.  If set to 1 and the keys are ASCII keys, they must be either 5 or 13 characters in length.  If set to 2, the passphrase is hashed using  the de-facto MD5 method to derive the actual WEP key.</td>
+</tr>
+<tr>
+<td><pre class="screen">psk</pre></td>
+<td><pre class="screen">string</pre></td>
+<td><pre class="screen"></pre></td>
+<td>Pre-Shared-Key for WPA networks.  If the key is 64-characters long, it must contain only hexadecimal characters and is interpreted as a hexadecimal WPA key.  Otherwise, the key must be between 8 and 63 ASCII characters (as specified in the 802.11i standard) and is interpreted as a WPA passphrase, and is hashed to derive the actual WPA-PSK used when connecting to the WiFi network.</td>
+</tr>
+<tr>
+<td><pre class="screen">psk-flags</pre></td>
+<td><pre class="screen">uint32</pre></td>
+<td><pre class="screen">0</pre></td>
+<td>Flags indicating how to handle the WPA PSK key. (see <a class="xref" href="secrets-flags.html" title="Secret flag types">the section called “Secret flag types”</a> for flag values)</td>
+</tr>
+<tr>
+<td><pre class="screen">leap-password</pre></td>
+<td><pre class="screen">string</pre></td>
+<td><pre class="screen"></pre></td>
+<td>The login password for legacy LEAP connections (ie, key-mgmt = 'ieee8021x' and auth-alg = 'leap').</td>
+</tr>
+<tr>
+<td><pre class="screen">leap-password-flags</pre></td>
+<td><pre class="screen">uint32</pre></td>
+<td><pre class="screen">0</pre></td>
+<td>Flags indicating how to handle the LEAP password. (see <a class="xref" href="secrets-flags.html" title="Secret flag types">the section called “Secret flag types”</a> for flag values)</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<p><br class="table-break">
+  </p>
+</div>
+</div>
+<div class="footer">
+<hr>
+          Generated by GTK-Doc V1.17</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/api/html/right.png b/docs/api/html/right.png
new file mode 100644
index 000000000..92832e3a4
--- /dev/null
+++ b/docs/api/html/right.png
diff --git a/docs/api/html/secrets-flags.html b/docs/api/html/secrets-flags.html
new file mode 100644
index 000000000..ee0a78fe8
--- /dev/null
+++ b/docs/api/html/secrets-flags.html
@@ -0,0 +1,64 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Secret flag types</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<link rel="home" href="index.html" title="NetworkManager D-Bus Reference Manual">
+<link rel="up" href="ref-settings.html" title="Network Configuration Setting Specification">
+<link rel="prev" href="ref-settings.html" title="Network Configuration Setting Specification">
+<link rel="next" href="ref-migrating.html" title="Migrating from NetworkManager 0.8 to NetworkManager 0.9">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle">
+<td><a accesskey="p" href="ref-settings.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
+<td><a accesskey="u" href="ref-settings.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
+<th width="100%" align="center">NetworkManager D-Bus Reference Manual</th>
+<td><a accesskey="n" href="ref-migrating.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="section">
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">
+<a name="secrets-flags"></a>Secret flag types</h2></div></div></div>
+<p>
+        Each secret property in a setting has an associated "flags" property
+        that describes how to handle that secret.  The "flags" property is a
+        bitfield that contains zero or more of the following values logically
+        OR-ed together.
+      </p>
+<p>
+        </p>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem">
+<code class="literal">0x0 (none)</code> - the system is responsible for providing
+            and storing this secret.
+          </li>
+<li class="listitem">
+<code class="literal">0x1 (agent-owned)</code> - a user-session secret agent
+            is responsible for providing and storing this secret; when it is
+            required, agents will be asked to provide it.
+          </li>
+<li class="listitem">
+<code class="literal">0x2 (not-saved)</code> - this secret should not be saved
+            but should be requested from the user each time it is required. This
+            flag should be used for One-Time-Pad secrets, PIN codes from
+            hardware tokens, or if the user simply does not want to save the
+            secret.
+          </li>
+<li class="listitem">
+<code class="literal">0x4 (not-required)</code> - in some situations it cannot
+            be automatically determined that a secret is required or not.  This
+            flag hints that the secret is not required and should not be
+            requested from the user.
+          </li>
+</ul></div>
+<p>
+      </p>
+</div>
+<div class="footer">
+<hr>
+          Generated by GTK-Doc V1.17</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/spec.html b/docs/api/html/spec.html
index 3873a98c9..5a1c58d42 100644
--- a/docs/spec.html
+++ b/docs/api/html/spec.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ascii" /><title>NetworkManager D-Bus Interface Specification version 0.8</title><style type="text/css">
+<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ascii" /><title>NetworkManager D-Bus Interface Specification version 0.9</title><style type="text/css">
 
           body {
             font-family: sans-serif;
@@ -98,7 +98,7 @@
             margin-right: 4em;
           }
 
-        </style></head><body><h1 class="topbox">NetworkManager D-Bus Interface Specification</h1><h2>Version 0.8</h2><div>Copyright (C) 2008 - 2009 Red Hat, Inc.</div><div>Copyright (C) 2008 - 2009 Novell, Inc.</div><div class="license">
+        </style></head><body><h1 class="topbox">NetworkManager D-Bus Interface Specification</h1><h2>Version 0.9</h2><div>Copyright (C) 2008 - 2011 Red Hat, Inc.</div><div>Copyright (C) 2008 - 2009 Novell, Inc.</div><div class="license">
 <p>This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2 of the License, or
@@ -112,7 +112,7 @@ General Public License for more details.</p>
 <p>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.</p>
-</div><h2>Interfaces</h2><ul><li><code><a href="#org.freedesktop.NetworkManager">org.freedesktop.NetworkManager</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.AccessPoint">org.freedesktop.NetworkManager.AccessPoint</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.Device">org.freedesktop.NetworkManager.Device</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.Device.Wired">org.freedesktop.NetworkManager.Device.Wired</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.Device.Wireless">org.freedesktop.NetworkManager.Device.Wireless</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.Device.Cdma">org.freedesktop.NetworkManager.Device.Cdma</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.Device.Gsm">org.freedesktop.NetworkManager.Device.Gsm</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.Device.Serial">org.freedesktop.NetworkManager.Device.Serial</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.Device.Bluetooth">org.freedesktop.NetworkManager.Device.Bluetooth</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.Device.OlpcMesh">org.freedesktop.NetworkManager.Device.OlpcMesh</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.IP4Config">org.freedesktop.NetworkManager.IP4Config</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.IP6Config">org.freedesktop.NetworkManager.IP6Config</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.DHCP4Config">org.freedesktop.NetworkManager.DHCP4Config</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.DHCP6Config">org.freedesktop.NetworkManager.DHCP6Config</a></code></li><li><code><a href="#org.freedesktop.NetworkManagerSettings">org.freedesktop.NetworkManagerSettings</a></code></li><li><code><a href="#org.freedesktop.NetworkManagerSettings.System">org.freedesktop.NetworkManagerSettings.System</a></code></li><li><code><a href="#org.freedesktop.NetworkManagerSettings.Connection">org.freedesktop.NetworkManagerSettings.Connection</a></code></li><li><code><a href="#org.freedesktop.NetworkManagerSettings.Connection.Secrets">org.freedesktop.NetworkManagerSettings.Connection.Secrets</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.Connection.Active">org.freedesktop.NetworkManager.Connection.Active</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.VPN.Connection">org.freedesktop.NetworkManager.VPN.Connection</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.VPN.Plugin">org.freedesktop.NetworkManager.VPN.Plugin</a></code></li></ul>
+</div><h2>Interfaces</h2><ul><li><code><a href="#org.freedesktop.NetworkManager">org.freedesktop.NetworkManager</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.AccessPoint">org.freedesktop.NetworkManager.AccessPoint</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.Device">org.freedesktop.NetworkManager.Device</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.Device.Wired">org.freedesktop.NetworkManager.Device.Wired</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.Device.Wireless">org.freedesktop.NetworkManager.Device.Wireless</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.Device.Modem">org.freedesktop.NetworkManager.Device.Modem</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.Device.Bluetooth">org.freedesktop.NetworkManager.Device.Bluetooth</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.Device.OlpcMesh">org.freedesktop.NetworkManager.Device.OlpcMesh</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.Device.WiMax">org.freedesktop.NetworkManager.Device.WiMax</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.WiMax.Nsp">org.freedesktop.NetworkManager.WiMax.Nsp</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.IP4Config">org.freedesktop.NetworkManager.IP4Config</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.IP6Config">org.freedesktop.NetworkManager.IP6Config</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.DHCP4Config">org.freedesktop.NetworkManager.DHCP4Config</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.DHCP6Config">org.freedesktop.NetworkManager.DHCP6Config</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.Settings">org.freedesktop.NetworkManager.Settings</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.Settings.Connection">org.freedesktop.NetworkManager.Settings.Connection</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.Connection.Active">org.freedesktop.NetworkManager.Connection.Active</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.AgentManager">org.freedesktop.NetworkManager.AgentManager</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.VPN.Connection">org.freedesktop.NetworkManager.VPN.Connection</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.VPN.Plugin">org.freedesktop.NetworkManager.VPN.Plugin</a></code></li></ul>
   <h1><a name="org.freedesktop.NetworkManager" id="org.freedesktop.NetworkManager"></a>org.freedesktop.NetworkManager</h1><h2>Methods:</h2><div class="method"><h3><a name="org.freedesktop.NetworkManager.GetDevices" id="org.freedesktop.NetworkManager.GetDevices">GetDevices</a> (
         
         ) &#8594;
@@ -122,14 +122,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       <code>ao</code></dt><dd>
           List of object paths of network devices known to the system.
         </dd></dl></div></div><div class="method"><h3><a name="org.freedesktop.NetworkManager.ActivateConnection" id="org.freedesktop.NetworkManager.ActivateConnection">ActivateConnection</a> (
-        s: service_name, o: connection, o: device, o: specific_object
+        o: connection, o: device, o: specific_object
         ) &#8594;
         o</h3><div class="docstring">
         Activate a connection using the supplied device.
-      </div><div><h4>Parameters</h4><dl><dt><code>service_name</code> -
-      <code>s</code></dt><dd>
-          The D-Bus service name of the settings service that provides this connection.
-        </dd><dt><code>connection</code> -
+      </div><div><h4>Parameters</h4><dl><dt><code>connection</code> -
       <code>o</code></dt><dd>
           The connection to activate the devices with.
         </dd><dt><code>device</code> -
@@ -149,12 +146,43 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       <code>o</code></dt><dd>
           The path of the active connection object representing this active connection.
         </dd></dl></div><div><h4>Possible errors</h4><dl><dt><code>org.freedesktop.NetworkManager.Error.UnknownConnection</code></dt><dd>
-        Connection was not provided by any known settings service.
+        Connection was not provided by the settings service.
     <em>(generic description)</em></dd><dt><code>org.freedesktop.NetworkManager.Error.UnknownDevice</code></dt><dd>
         Unknown device.
-    <em>(generic description)</em></dd><dt><code>org.freedesktop.NetworkManager.Error.InvalidService</code></dt><dd>
-        Invalid settings service (not a recognized system or user settings service name).
-    <em>(generic description)</em></dd><dt><code>org.freedesktop.NetworkManager.Error.ConnectionActivating</code></dt><dd>Another connection is already activating or the same connection is already active.  FIXME: check if the error name is correct.  FIXME: split into 2 errors?</dd><dt><code>org.freedesktop.NetworkManager.Error.ConnectionInvalid</code></dt><dd>The connection is invalid for this device.</dd></dl></div></div><div class="method"><h3><a name="org.freedesktop.NetworkManager.DeactivateConnection" id="org.freedesktop.NetworkManager.DeactivateConnection">DeactivateConnection</a> (
+    <em>(generic description)</em></dd><dt><code>org.freedesktop.NetworkManager.Error.ConnectionActivating</code></dt><dd>Another connection is already activating or the same connection is already active.  FIXME: check if the error name is correct.  FIXME: split into 2 errors?</dd><dt><code>org.freedesktop.NetworkManager.Error.ConnectionInvalid</code></dt><dd>The connection is invalid for this device.</dd></dl></div></div><div class="method"><h3><a name="org.freedesktop.NetworkManager.AddAndActivateConnection" id="org.freedesktop.NetworkManager.AddAndActivateConnection">AddAndActivateConnection</a> (
+        a{sa{sv}}: connection, o: device, o: specific_object
+        ) &#8594;
+        o, o</h3><div class="docstring">
+        Adds a new connection using the given details (if any) as a template
+        (automatically filling in missing settings with the capabilities of the
+        given device and specific object), then activate the new connection.
+        Cannot be used for VPN connections at this time.
+      </div><div><h4>Parameters</h4><dl><dt><code>connection</code> -
+      <code>a{sa{sv}}</code></dt><dd>
+          Connection settings and properties; if incomplete missing settings will
+          be automatically completed using the given device and specific object.
+        </dd><dt><code>device</code> -
+      <code>o</code></dt><dd>
+          The object path of device to be activated using the given connection.
+        </dd><dt><code>specific_object</code> -
+      <code>o</code></dt><dd>
+          The path of a connection-type-specific object this activation should use. 
+          This parameter is currently ignored for wired and mobile broadband connections,
+          and the value of "/" should be used (ie, no specific object).  For WiFi
+          connections, pass the object path of a specific AP from the card's scan
+          list, which will be used to complete the details of the newly added
+          connection.
+        </dd></dl></div><div><h4>Returns</h4><dl><dt><code>path</code> -
+      <code>o</code></dt><dd>
+          Object path of the new connection that was just added.
+        </dd><dt><code>active_connection</code> -
+      <code>o</code></dt><dd>
+          The path of the active connection object representing this active connection.
+        </dd></dl></div><div><h4>Possible errors</h4><dl><dt><code>org.freedesktop.NetworkManager.Error.UnknownConnection</code></dt><dd>
+        Connection was not provided by the settings service.
+    <em>(generic description)</em></dd><dt><code>org.freedesktop.NetworkManager.Error.UnknownDevice</code></dt><dd>
+        Unknown device.
+    <em>(generic description)</em></dd><dt><code>org.freedesktop.NetworkManager.Error.ConnectionInvalid</code></dt><dd>The connection is invalid for this device.</dd></dl></div></div><div class="method"><h3><a name="org.freedesktop.NetworkManager.DeactivateConnection" id="org.freedesktop.NetworkManager.DeactivateConnection">DeactivateConnection</a> (
         o: active_connection
         ) &#8594;
         nothing</h3><div class="docstring">
@@ -218,21 +246,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
           ETHER, WIFI, BT, MB, DHCP4, DHCP6, PPP, WIFI_SCAN, IP4, IP6, AUTOIP4,
           DNS, VPN, SHARING, SUPPLICANT, USER_SET, SYS_SET, SUSPEND, CORE,
           DEVICE, OLPC]
-        </dd></dl></div></div><div class="method"><h3><a name="org.freedesktop.NetworkManager.sleep" id="org.freedesktop.NetworkManager.sleep">sleep</a> (
-        
-        ) &#8594;
-        nothing</h3><div class="docstring">
-        DEPRECATED.  Control the NetworkManager daemon's sleep state.  When asleep, all interfaces that it manages are deactivated.
-      </div></div><div class="method"><h3><a name="org.freedesktop.NetworkManager.wake" id="org.freedesktop.NetworkManager.wake">wake</a> (
-        
-        ) &#8594;
-        nothing</h3><div class="docstring">
-        DEPRECATED.  Control the NetworkManager daemon's sleep state.  When awake, all known interfaces are available to be activated.
-      </div></div><div class="method"><h3><a name="org.freedesktop.NetworkManager.state" id="org.freedesktop.NetworkManager.state">state</a> (
+        </dd></dl></div></div><div class="method"><h3><a name="org.freedesktop.NetworkManager.state" id="org.freedesktop.NetworkManager.state">state</a> (
         
         ) &#8594;
         u</h3><div class="docstring">
-        DEPRECATED.  The overall state of the NetworkManager daemon.
+        The overall networking state as determined by the NetworkManager daemon,
+        based on the state of network devices under it's management.
       </div><div><h4>Returns</h4><dl><dt><code>state</code> -
       <code>u</code>
       (<a xmlns="" href="#type-NM_STATE">NM_STATE</a>)
@@ -273,15 +292,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       </div><div><h4>Parameters</h4><dl><dt><code>device_path</code> -
       <code>o</code></dt><dd>
           The object path of the device that was just removed.
-        </dd></dl></div></div><div class="signal"><h3><a name="org.freedesktop.NetworkManager.StateChange" id="org.freedesktop.NetworkManager.StateChange">StateChange</a> (
-        u: state
-        )</h3><div class="docstring">
-        DEPRECATED.  NetworkManager's state changed.  Use the 'StateChanged' signal instead.
-      </div><div><h4>Parameters</h4><dl><dt><code>state</code> -
-      <code>u</code>
-      (<a xmlns="" href="#type-NM_STATE">NM_STATE</a>)
-    </dt><dd>
-          The new state of NetworkManager.
         </dd></dl></div></div><h2>Properties:</h2><dl><dt><code>NetworkingEnabled</code> -
       <code>b</code> -
       <code>(read)</code></dt><dd>
@@ -303,6 +313,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       <code>b</code> -
       <code>(read)</code></dt><dd>
         Indicates if the mobile broadband hardware is currently enabled, i.e. the state of the RF kill switch.
+      </dd><dt><code>WimaxEnabled</code> -
+      <code>b</code> -
+      <code>(readwrite)</code></dt><dd>
+        Indicates if WiMAX devices are currently enabled or not.
+      </dd><dt><code>WimaxHardwareEnabled</code> -
+      <code>b</code> -
+      <code>(read)</code></dt><dd>
+        Indicates if the WiMAX hardware is currently enabled, i.e. the state of the RF kill switch.
       </dd><dt><code>ActiveConnections</code> -
       <code>ao</code> -
       <code>(read)</code></dt><dd>
@@ -320,15 +338,22 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       </dd></dl><h2>Enumerated types:</h2><h3><a name="type-NM_STATE" id="type-NM_STATE">NM_STATE</a></h3>
         Describes the overall state of the daemon.
       <dl><dt><code>NM_STATE_UNKNOWN = 0</code></dt><dd>
-          The NetworkManager daemon is in an unknown state.
-        </dd><dt><code>NM_STATE_ASLEEP = 1</code></dt><dd>
-          The NetworkManager daemon is asleep and all interfaces managed by it are inactive.
-        </dd><dt><code>NM_STATE_CONNECTING = 2</code></dt><dd>
-          The NetworkManager daemon is connecting a device.  FIXME: What does this mean when one device is active and another is connecting?
-        </dd><dt><code>NM_STATE_CONNECTED = 3</code></dt><dd>
-          The NetworkManager daemon is connected.
-        </dd><dt><code>NM_STATE_DISCONNECTED = 4</code></dt><dd>
-          The NetworkManager daemon is disconnected.
+          Networking state is unknown.
+        </dd><dt><code>NM_STATE_ASLEEP = 10</code></dt><dd>
+          Networking is inactive and all devices are disabled.
+        </dd><dt><code>NM_STATE_DISCONNECTED = 20</code></dt><dd>
+          There is no active network connection.
+        </dd><dt><code>NM_STATE_DISCONNECTING = 30</code></dt><dd>
+          Network connections are being cleaned up.
+        </dd><dt><code>NM_STATE_CONNECTING = 40</code></dt><dd>
+          A network device is connecting to a network and there is no other
+          available network connection.
+        </dd><dt><code>NM_STATE_CONNECTED_LOCAL = 50</code></dt><dd>
+          A network device is connected, but there is only link-local connectivity.
+        </dd><dt><code>NM_STATE_CONNECTED_SITE = 60</code></dt><dd>
+          A network device is connected, but there is only site-local connectivity.
+        </dd><dt><code>NM_STATE_CONNECTED_GLOBAL = 70</code></dt><dd>
+          A network device is connected, with global network connectivity.
         </dd></dl>
 
   <h1><a name="org.freedesktop.NetworkManager.AccessPoint" id="org.freedesktop.NetworkManager.AccessPoint"></a>org.freedesktop.NetworkManager.AccessPoint</h1><p>Interface has no methods.</p><h2>Signals:</h2><div class="signal"><h3><a name="org.freedesktop.NetworkManager.AccessPoint.PropertiesChanged" id="org.freedesktop.NetworkManager.AccessPoint.PropertiesChanged">PropertiesChanged</a> (
@@ -395,7 +420,18 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
         </dd></dl></div></div><h2>Properties:</h2><dl><dt><code>Udi</code> -
       <code>s</code> -
       <code>(read)</code></dt><dd>
-        Unique Device Identifier.
+        Operating-system specific transient device hardware identifier.  This
+        is an opaque string representing the underlying hardware for the device,
+        and shouldn't be used to keep track of individual devices.  For some
+        device types (Bluetooth, Modems) it is an identifier used by the
+        hardware service (ie bluez or ModemManager) to refer to that device,
+        and client programs use it get additional information from those
+        services which NM does not provide.  The Udi is not guaranteed to be
+        consistent across reboots or hotplugs of the hardware. If you're looking
+        for a way to uniquely track each device in your application, use the
+        object path.  If you're looking for a way to track a specific piece of
+        hardware across reboot or hotplug, use a MAC address or USB serial
+        number.
       </dd><dt><code>Interface</code> -
       <code>s</code> -
       <code>(read)</code></dt><dd>
@@ -462,23 +498,29 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
         The general type of the network device; ie Ethernet, WiFi, etc.
       </dd></dl><h2>Enumerated types:</h2><h3><a name="type-NM_DEVICE_STATE" id="type-NM_DEVICE_STATE">NM_DEVICE_STATE</a></h3><dl><dt><code>NM_DEVICE_STATE_UNKNOWN = 0</code></dt><dd>
           The device is in an unknown state.
-        </dd><dt><code>NM_DEVICE_STATE_UNMANAGED = 1</code></dt><dd>
-          The device is not managed by NetworkManager.
-        </dd><dt><code>NM_DEVICE_STATE_UNAVAILABLE = 2</code></dt><dd>
+        </dd><dt><code>NM_DEVICE_STATE_UNMANAGED = 10</code></dt><dd>
+          The device is recognized but not managed by NetworkManager.
+        </dd><dt><code>NM_DEVICE_STATE_UNAVAILABLE = 20</code></dt><dd>
           The device cannot be used (carrier off, rfkill, etc).
-        </dd><dt><code>NM_DEVICE_STATE_DISCONNECTED = 3</code></dt><dd>
+        </dd><dt><code>NM_DEVICE_STATE_DISCONNECTED = 30</code></dt><dd>
           The device is not connected.
-        </dd><dt><code>NM_DEVICE_STATE_PREPARE = 4</code></dt><dd>
+        </dd><dt><code>NM_DEVICE_STATE_PREPARE = 40</code></dt><dd>
           The device is preparing to connect.
-        </dd><dt><code>NM_DEVICE_STATE_CONFIG = 5</code></dt><dd>
+        </dd><dt><code>NM_DEVICE_STATE_CONFIG = 50</code></dt><dd>
           The device is being configured.
-        </dd><dt><code>NM_DEVICE_STATE_NEED_AUTH = 6</code></dt><dd>
+        </dd><dt><code>NM_DEVICE_STATE_NEED_AUTH = 60</code></dt><dd>
           The device is awaiting secrets necessary to continue connection.
-        </dd><dt><code>NM_DEVICE_STATE_IP_CONFIG = 7</code></dt><dd>
+        </dd><dt><code>NM_DEVICE_STATE_IP_CONFIG = 70</code></dt><dd>
           The IP settings of the device are being requested and configured.
-        </dd><dt><code>NM_DEVICE_STATE_ACTIVATED = 8</code></dt><dd>
+        </dd><dt><code>NM_DEVICE_STATE_IP_CHECK = 80</code></dt><dd>
+          The device's IP connectivity ability is being determined.
+        </dd><dt><code>NM_DEVICE_STATE_SECONDARIES = 90</code></dt><dd>
+          The device is waiting for secondary connections to be activated.
+        </dd><dt><code>NM_DEVICE_STATE_ACTIVATED = 100</code></dt><dd>
           The device is active.
-        </dd><dt><code>NM_DEVICE_STATE_FAILED = 9</code></dt><dd>
+        </dd><dt><code>NM_DEVICE_STATE_DEACTIVATING = 110</code></dt><dd>
+          The device's network connection is being torn down.
+        </dd><dt><code>NM_DEVICE_STATE_FAILED = 120</code></dt><dd>
           The device is in a failure state following an attempt to activate it.
         </dd></dl><h3><a name="type-NM_DEVICE_TYPE" id="type-NM_DEVICE_TYPE">NM_DEVICE_TYPE</a></h3><dl><dt><code>NM_DEVICE_TYPE_UNKNOWN = 0</code></dt><dd>
           The device type is unknown.
@@ -486,10 +528,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
           The device is wired Ethernet device.
         </dd><dt><code>NM_DEVICE_TYPE_WIFI = 2</code></dt><dd>
           The device is an 802.11 WiFi device.
-        </dd><dt><code>NM_DEVICE_TYPE_GSM = 3</code></dt><dd>
-          The device is a GSM-based cellular WAN device.
-        </dd><dt><code>NM_DEVICE_TYPE_CDMA = 4</code></dt><dd>
-          The device is a CDMA/IS-95-based cellular WAN device.
+        </dd><dt><code>NM_DEVICE_TYPE_UNUSED1 = 3</code></dt><dd>Unused</dd><dt><code>NM_DEVICE_TYPE_UNUSED2 = 4</code></dt><dd>Unused</dd><dt><code>NM_DEVICE_TYPE_BT = 5</code></dt><dd>
+          The device is Bluetooth device that provides PAN or DUN capabilities.
+        </dd><dt><code>NM_DEVICE_TYPE_OLPC_MESH = 6</code></dt><dd>
+          The device is an OLPC mesh networking device.
+        </dd><dt><code>NM_DEVICE_TYPE_WIMAX = 7</code></dt><dd>
+          The device is an 802.16e Mobile WiMAX device.
+        </dd><dt><code>NM_DEVICE_TYPE_MODEM = 8</code></dt><dd>
+          The device is a modem supporting one or more of analog telephone,
+          CDMA/EVDO, GSM/UMTS/HSPA, or LTE standards to access a cellular or
+          wireline data network.
         </dd></dl><h3><a name="type-NM_DEVICE_STATE_REASON" id="type-NM_DEVICE_STATE_REASON">NM_DEVICE_STATE_REASON</a></h3><dl><dt><code>NM_DEVICE_STATE_REASON_UNKNOWN = 0</code></dt><dd>
           The reason for the device state change is unknown.
         </dd><dt><code>NM_DEVICE_STATE_REASON_NONE = 1</code></dt><dd>
@@ -670,33 +718,44 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
         Flags describing the capabilities of a wireless device.
       <dl><dt><code>NM_802_11_DEVICE_CAP_NONE = 0x0</code></dt><dd>Null capability - syntactic sugar for no capabilities supported.  Do not AND this with other capabilities!</dd><dt><code>NM_802_11_DEVICE_CAP_CIPHER_WEP40 = 0x1</code></dt><dd>The device supports the 40-bit WEP cipher.</dd><dt><code>NM_802_11_DEVICE_CAP_CIPHER_WEP104 = 0x2</code></dt><dd>The device supports the 104-bit WEP cipher.</dd><dt><code>NM_802_11_DEVICE_CAP_CIPHER_TKIP = 0x4</code></dt><dd>The device supports the TKIP cipher.</dd><dt><code>NM_802_11_DEVICE_CAP_CIPHER_CCMP = 0x8</code></dt><dd>The device supports the CCMP cipher.</dd><dt><code>NM_802_11_DEVICE_CAP_WPA = 0x10</code></dt><dd>The device supports the WPA encryption/authentication protocol.</dd><dt><code>NM_802_11_DEVICE_CAP_RSN = 0x20</code></dt><dd>The device supports the RSN encryption/authentication protocol.</dd></dl>
 
-  <h1><a name="org.freedesktop.NetworkManager.Device.Cdma" id="org.freedesktop.NetworkManager.Device.Cdma"></a>org.freedesktop.NetworkManager.Device.Cdma</h1><p>Interface has no methods.</p><h2>Signals:</h2><div class="signal"><h3><a name="org.freedesktop.NetworkManager.Device.Cdma.PropertiesChanged" id="org.freedesktop.NetworkManager.Device.Cdma.PropertiesChanged">PropertiesChanged</a> (
+  <h1><a name="org.freedesktop.NetworkManager.Device.Modem" id="org.freedesktop.NetworkManager.Device.Modem"></a>org.freedesktop.NetworkManager.Device.Modem</h1><p>Interface has no methods.</p><h2>Signals:</h2><div class="signal"><h3><a name="org.freedesktop.NetworkManager.Device.Modem.PropertiesChanged" id="org.freedesktop.NetworkManager.Device.Modem.PropertiesChanged">PropertiesChanged</a> (
         a{sv}: properties
         )</h3><div class="docstring"></div><div><h4>Parameters</h4><dl><dt><code>properties</code> -
       <code>a{sv}</code>
       (<a xmlns="" href="#type-String_Variant_Map">String_Variant_Map</a>)
     </dt><dd>
                 A dictionary mapping property names to variant boxed values
-            </dd></dl></div></div><p>Interface has no properties.</p>
-
-  <h1><a name="org.freedesktop.NetworkManager.Device.Gsm" id="org.freedesktop.NetworkManager.Device.Gsm"></a>org.freedesktop.NetworkManager.Device.Gsm</h1><p>Interface has no methods.</p><h2>Signals:</h2><div class="signal"><h3><a name="org.freedesktop.NetworkManager.Device.Gsm.PropertiesChanged" id="org.freedesktop.NetworkManager.Device.Gsm.PropertiesChanged">PropertiesChanged</a> (
-        a{sv}: properties
-        )</h3><div class="docstring"></div><div><h4>Parameters</h4><dl><dt><code>properties</code> -
-      <code>a{sv}</code>
-      (<a xmlns="" href="#type-String_Variant_Map">String_Variant_Map</a>)
+            </dd></dl></div></div><h2>Properties:</h2><dl><dt><code>ModemCapabilities</code> -
+      <code>u</code> -
+      <code>(read)</code>
+      (<a xmlns="" href="#type-NM_DEVICE_MODEM_CAPABILITIES">NM_DEVICE_MODEM_CAPABILITIES</a>)
     </dt><dd>
-                A dictionary mapping property names to variant boxed values
-            </dd></dl></div></div><p>Interface has no properties.</p>
-
-  <h1><a name="org.freedesktop.NetworkManager.Device.Serial" id="org.freedesktop.NetworkManager.Device.Serial"></a>org.freedesktop.NetworkManager.Device.Serial</h1><p>Interface has no methods.</p><h2>Signals:</h2><div class="signal"><h3><a name="org.freedesktop.NetworkManager.Device.Serial.PppStats" id="org.freedesktop.NetworkManager.Device.Serial.PppStats">PppStats</a> (
-        u: in_bytes, u: out_bytes
-        )</h3><div class="docstring"></div><div><h4>Parameters</h4><dl><dt><code>in_bytes</code> -
-      <code>u</code></dt><dd>
-	Bytes received
-      </dd><dt><code>out_bytes</code> -
-      <code>u</code></dt><dd>
-	Bytes sent
-      </dd></dl></div></div><p>Interface has no properties.</p>
+        The generic family of access technologies the modem supports.  Not all
+        capabilities are available at the same time however; some modems require
+        a firmware reload or other reinitialization to switch between eg CDMA/EVDO
+        and GSM/UMTS.
+      </dd><dt><code>CurrentCapabilities</code> -
+      <code>u</code> -
+      <code>(read)</code>
+      (<a xmlns="" href="#type-NM_DEVICE_MODEM_CAPABILITIES">NM_DEVICE_MODEM_CAPABILITIES</a>)
+    </dt><dd>
+        The generic family of access technologies the modem currently supports
+        without a firmware reload or reinitialization.
+      </dd></dl><h2>Sets of flags:</h2><h3 xmlns=""><a name="type-NM_DEVICE_MODEM_CAPABILITIES" id="type-NM_DEVICE_MODEM_CAPABILITIES">NM_DEVICE_MODEM_CAPABILITIES</a></h3>
+        Flags describing one or more of the general access technology families
+        that a modem device supports.
+      <dl><dt><code>NM_DEVICE_MODEM_CAPABILITY_NONE = 0x0</code></dt><dd>Modem has no capabilties.</dd><dt><code>NM_DEVICE_MODEM_CAPABILITY_POTS = 0x1</code></dt><dd>
+          Modem supports the analog wired telephone network (ie 56k dialup) and
+          does not have wireless/cellular capabilities.
+        </dd><dt><code>NM_DEVICE_MODEM_CAPABILITY_CDMA_EVDO = 0x2</code></dt><dd>
+          Modem supports at least one of CDMA 1xRTT, EVDO revision 0, EVDO
+          revision A, or EVDO revision B.
+        </dd><dt><code>NM_DEVICE_MODEM_CAPABILITY_GSM_UMTS = 0x4</code></dt><dd>
+          Modem supports at least one of GSM, GPRS, EDGE, UMTS, HSDPA, HSUPA, or
+          HSPA+ packet switched data capability.
+        </dd><dt><code>NM_DEVICE_MODEM_CAPABILITY_LTE = 0x8</code></dt><dd>
+          Modem has at LTE data capability.
+        </dd></dl>
 
   <h1><a name="org.freedesktop.NetworkManager.Device.Bluetooth" id="org.freedesktop.NetworkManager.Device.Bluetooth"></a>org.freedesktop.NetworkManager.Device.Bluetooth</h1><p>Interface has no methods.</p><h2>Signals:</h2><div class="signal"><h3><a name="org.freedesktop.NetworkManager.Device.Bluetooth.PropertiesChanged" id="org.freedesktop.NetworkManager.Device.Bluetooth.PropertiesChanged">PropertiesChanged</a> (
         a{sv}: properties
@@ -746,6 +805,96 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
         The currently active channel.
       </dd></dl>
 
+  <h1><a name="org.freedesktop.NetworkManager.Device.WiMax" id="org.freedesktop.NetworkManager.Device.WiMax"></a>org.freedesktop.NetworkManager.Device.WiMax</h1><h2>Methods:</h2><div class="method"><h3><a name="org.freedesktop.NetworkManager.Device.WiMax.GetNspList" id="org.freedesktop.NetworkManager.Device.WiMax.GetNspList">GetNspList</a> (
+        
+        ) &#8594;
+        ao</h3><div class="docstring">
+        Get the list of NSPs visible to this device.
+      </div><div><h4>Returns</h4><dl><dt><code>nsps</code> -
+      <code>ao</code></dt><dd>
+          List of NSP object paths
+        </dd></dl></div></div><h2>Signals:</h2><div class="signal"><h3><a name="org.freedesktop.NetworkManager.Device.WiMax.PropertiesChanged" id="org.freedesktop.NetworkManager.Device.WiMax.PropertiesChanged">PropertiesChanged</a> (
+        a{sv}: properties
+        )</h3><div class="docstring">
+            Emitted when the WiMax device's properties changed.
+        </div><div><h4>Parameters</h4><dl><dt><code>properties</code> -
+      <code>a{sv}</code>
+      (<a xmlns="" href="#type-String_Variant_Map">String_Variant_Map</a>)
+    </dt><dd>
+                A dictionary mapping property names to variant boxed values.
+            </dd></dl></div></div><div class="signal"><h3><a name="org.freedesktop.NetworkManager.Device.WiMax.NspAdded" id="org.freedesktop.NetworkManager.Device.WiMax.NspAdded">NspAdded</a> (
+        o: nsp
+        )</h3><div class="docstring">
+            Emitted when a new NSP is found by the device.
+        </div><div><h4>Parameters</h4><dl><dt><code>nsp</code> -
+      <code>o</code></dt><dd>
+                The object path of the newly found NSP.
+            </dd></dl></div></div><div class="signal"><h3><a name="org.freedesktop.NetworkManager.Device.WiMax.NspRemoved" id="org.freedesktop.NetworkManager.Device.WiMax.NspRemoved">NspRemoved</a> (
+        o: nsp
+        )</h3><div class="docstring">
+            Emitted when an NSP disappears from view of the device.
+        </div><div><h4>Parameters</h4><dl><dt><code>nsp</code> -
+      <code>o</code></dt><dd>
+                The object path of the NSP that has disappeared.
+            </dd></dl></div></div><h2>Properties:</h2><dl><dt><code>HwAddress</code> -
+      <code>s</code> -
+      <code>(read)</code></dt><dd>
+        Hardware address of the device.
+      </dd><dt><code>CenterFrequency</code> -
+      <code>u</code> -
+      <code>(read)</code></dt><dd>
+        Center frequency (in KHz) of the radio channel the device is using to
+        communicate with the network when connected.  Has no meaning when the
+        device is not connected.
+      </dd><dt><code>Rssi</code> -
+      <code>i</code> -
+      <code>(read)</code></dt><dd>
+        RSSI of the current radio link in dBm.  This value indicates how strong
+        the raw received RF signal from the base station is, but does not
+        indicate the overall quality of the radio link.  Has no meaning when the
+        device is not connected.
+      </dd><dt><code>Cinr</code> -
+      <code>i</code> -
+      <code>(read)</code></dt><dd>
+        CINR (Carrier to Interference + Noise Ratio) of the current radio link
+        in dB.  CINR is a more accurate measure of radio link quality.  Has no
+        meaning when the device is not connected.
+      </dd><dt><code>TxPower</code> -
+      <code>i</code> -
+      <code>(read)</code></dt><dd>
+        Average power of the last burst transmitted by the device, in units of
+        0.5 dBm.  i.e. a TxPower of -11 represents an actual device TX power of
+        -5.5 dBm.  Has no meaning when the device is not connected.
+      </dd><dt><code>Bsid</code> -
+      <code>s</code> -
+      <code>(read)</code></dt><dd>
+        The ID of the serving base station as received from the network.  Has
+        no meaning when the device is not connected.
+      </dd><dt><code>ActiveNsp</code> -
+      <code>o</code> -
+      <code>(read)</code></dt><dd>
+        Object path of the NSP currently used by the WiMax device.
+      </dd></dl>
+
+  <h1><a name="org.freedesktop.NetworkManager.WiMax.Nsp" id="org.freedesktop.NetworkManager.WiMax.Nsp"></a>org.freedesktop.NetworkManager.WiMax.Nsp</h1><p>Interface has no methods.</p><h2>Signals:</h2><div class="signal"><h3><a name="org.freedesktop.NetworkManager.WiMax.Nsp.PropertiesChanged" id="org.freedesktop.NetworkManager.WiMax.Nsp.PropertiesChanged">PropertiesChanged</a> (
+        a{sv}: properties
+        )</h3><div class="docstring"></div><div><h4>Parameters</h4><dl><dt><code>properties</code> -
+      <code>a{sv}</code>
+      (<a xmlns="" href="#type-String_Variant_Map">String_Variant_Map</a>)
+    </dt><dd>
+                A dictionary mapping property names to variant boxed values.
+            </dd></dl></div></div><h2>Properties:</h2><dl><dt><code>Name</code> -
+      <code>s</code> -
+      <code>(read)</code></dt><dd>The name of the NSP.</dd><dt><code>SignalQuality</code> -
+      <code>u</code> -
+      <code>(read)</code></dt><dd>The current signal quality of the NSP, in percent.</dd><dt><code>NetworkType</code> -
+      <code>u</code> -
+      <code>(read)</code>
+      (<a xmlns="" href="#type-NM_WIMAX_NSP_NETWORK_TYPE">NM_WIMAX_NSP_NETWORK_TYPE</a>)
+    </dt><dd>The network type of the NSP.</dd></dl><h2>Sets of flags:</h2><h3 xmlns=""><a name="type-NM_WIMAX_NSP_NETWORK_TYPE" id="type-NM_WIMAX_NSP_NETWORK_TYPE">NM_WIMAX_NSP_NETWORK_TYPE</a></h3>
+        Network type of the NSP.
+      <dl><dt><code>NM_WIMAX_NSP_NETWORK_TYPE_UNKNOWN = 0x0</code></dt><dd>Unknown network.</dd><dt><code>NM_WIMAX_NSP_NETWORK_TYPE_HOME = 0x1</code></dt><dd>Home network.</dd><dt><code>NM_WIMAX_NSP_NETWORK_TYPE_PARTNER = 0x2</code></dt><dd>Partner network.</dd><dt><code>NM_WIMAX_NSP_NETWORK_TYPE_ROAMING_PARTNER = 0x3</code></dt><dd>Roaming partner network.</dd></dl>
+
   <h1><a name="org.freedesktop.NetworkManager.IP4Config" id="org.freedesktop.NetworkManager.IP4Config"></a>org.freedesktop.NetworkManager.IP4Config</h1><p>Interface has no methods.</p><p>Interface has no signals.</p><h2>Properties:</h2><dl><dt><code>Addresses</code> -
       <code>aau</code> -
       <code>(read)</code></dt><dd>Array of tuples of IPv4 address/prefix/gateway.  All 3
@@ -801,9 +950,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       <code>a{sv}</code> -
       <code>(read)</code></dt><dd>Configuration options returned by a DHCP server, if any.</dd></dl>
 
-  <h1><a name="org.freedesktop.NetworkManagerSettings" id="org.freedesktop.NetworkManagerSettings"></a>org.freedesktop.NetworkManagerSettings</h1>
-      The NetworkManagerSettings interface is provided by the service which provides connections to NetworkManager.
-    <h2>Methods:</h2><div class="method"><h3><a name="org.freedesktop.NetworkManagerSettings.ListConnections" id="org.freedesktop.NetworkManagerSettings.ListConnections">ListConnections</a> (
+  <h1><a name="org.freedesktop.NetworkManager.Settings" id="org.freedesktop.NetworkManager.Settings"></a>org.freedesktop.NetworkManager.Settings</h1>
+      The Settings interface allows clients to view and administrate the connections stored and used by NetworkManager.
+    <h2>Methods:</h2><div class="method"><h3><a name="org.freedesktop.NetworkManager.Settings.ListConnections" id="org.freedesktop.NetworkManager.Settings.ListConnections">ListConnections</a> (
         
         ) &#8594;
         ao</h3><div class="docstring">
@@ -811,26 +960,18 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       </div><div><h4>Returns</h4><dl><dt><code>connections</code> -
       <code>ao</code></dt><dd>
           List of connections.
-        </dd></dl></div></div><div class="method"><h3><a name="org.freedesktop.NetworkManagerSettings.AddConnection" id="org.freedesktop.NetworkManagerSettings.AddConnection">AddConnection</a> (
+        </dd></dl></div></div><div class="method"><h3><a name="org.freedesktop.NetworkManager.Settings.AddConnection" id="org.freedesktop.NetworkManager.Settings.AddConnection">AddConnection</a> (
         a{sa{sv}}: connection
         ) &#8594;
-        nothing</h3><div class="docstring">
+        o</h3><div class="docstring">
         Add new connection.
       </div><div><h4>Parameters</h4><dl><dt><code>connection</code> -
       <code>a{sa{sv}}</code></dt><dd>
           Connection settings and properties.
-        </dd></dl></div></div><h2>Signals:</h2><div class="signal"><h3><a name="org.freedesktop.NetworkManagerSettings.NewConnection" id="org.freedesktop.NetworkManagerSettings.NewConnection">NewConnection</a> (
-        o: connection
-        )</h3><div class="docstring">
-        Emitted when a new connection has been added.
-      </div><div><h4>Parameters</h4><dl><dt><code>connection</code> -
+        </dd></dl></div><div><h4>Returns</h4><dl><dt><code>path</code> -
       <code>o</code></dt><dd>
-          Object path of the new connection.
-        </dd></dl></div></div><p>Interface has no properties.</p>
-
-  <h1><a name="org.freedesktop.NetworkManagerSettings.System" id="org.freedesktop.NetworkManagerSettings.System"></a>org.freedesktop.NetworkManagerSettings.System</h1>
-      Implemented by the system settings service to provide additional settings to NetworkManager.
-    <h2>Methods:</h2><div class="method"><h3><a name="org.freedesktop.NetworkManagerSettings.System.SaveHostname" id="org.freedesktop.NetworkManagerSettings.System.SaveHostname">SaveHostname</a> (
+          Object path of the new connection that was just added.
+        </dd></dl></div></div><div class="method"><h3><a name="org.freedesktop.NetworkManager.Settings.SaveHostname" id="org.freedesktop.NetworkManager.Settings.SaveHostname">SaveHostname</a> (
         s: hostname
         ) &#8594;
         nothing</h3><div class="docstring">
@@ -838,28 +979,21 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       </div><div><h4>Parameters</h4><dl><dt><code>hostname</code> -
       <code>s</code></dt><dd>
           The hostname to save to persistent configuration.  If blank, the persistent hostname is cleared.
-        </dd></dl></div></div><div class="method"><h3><a name="org.freedesktop.NetworkManagerSettings.System.GetPermissions" id="org.freedesktop.NetworkManagerSettings.System.GetPermissions">GetPermissions</a> (
-        
-        ) &#8594;
-        u</h3><div class="docstring">
-        Returns a bitfield indicating certain operations the caller is permitted to perform.  Some of these operations may require authorization by the user.
-      </div><div><h4>Returns</h4><dl><dt><code>permissions</code> -
-      <code>u</code>
-      (<a xmlns="" href="#type-NM_SETTINGS_SYSTEM_PERMISSIONS">NM_SETTINGS_SYSTEM_PERMISSIONS</a>)
-    </dt><dd>
-          A bitfield of permitted operations.  Some of these operations may require the user to authorize via password entry or other means.
-        </dd></dl></div></div><h2>Signals:</h2><div class="signal"><h3><a name="org.freedesktop.NetworkManagerSettings.System.PropertiesChanged" id="org.freedesktop.NetworkManagerSettings.System.PropertiesChanged">PropertiesChanged</a> (
+        </dd></dl></div></div><h2>Signals:</h2><div class="signal"><h3><a name="org.freedesktop.NetworkManager.Settings.PropertiesChanged" id="org.freedesktop.NetworkManager.Settings.PropertiesChanged">PropertiesChanged</a> (
         a{sv}: properties
         )</h3><div class="docstring"></div><div><h4>Parameters</h4><dl><dt><code>properties</code> -
       <code>a{sv}</code>
       (<a xmlns="" href="#type-String_Variant_Map">String_Variant_Map</a>)
     </dt><dd>
                 A dictionary mapping property names to variant boxed values
-            </dd></dl></div></div><div class="signal"><h3><a name="org.freedesktop.NetworkManagerSettings.System.CheckPermissions" id="org.freedesktop.NetworkManagerSettings.System.CheckPermissions">CheckPermissions</a> (
-        
+            </dd></dl></div></div><div class="signal"><h3><a name="org.freedesktop.NetworkManager.Settings.NewConnection" id="org.freedesktop.NetworkManager.Settings.NewConnection">NewConnection</a> (
+        o: connection
         )</h3><div class="docstring">
-        Emitted when system authorization details change, indicating that clients may wish to recheck permissions with GetPermissions.
-      </div></div><h2>Properties:</h2><dl><dt><code>Hostname</code> -
+        Emitted when a new connection has been added.
+      </div><div><h4>Parameters</h4><dl><dt><code>connection</code> -
+      <code>o</code></dt><dd>
+          Object path of the new connection.
+        </dd></dl></div></div><h2>Properties:</h2><dl><dt><code>Hostname</code> -
       <code>s</code> -
       <code>(read)</code></dt><dd>
         The machine hostname stored in persistent configuration.
@@ -867,72 +1001,72 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       <code>b</code> -
       <code>(read)</code></dt><dd>
         If true, adding and modifying connections is supported.
-      </dd></dl><h2>Sets of flags:</h2><h3 xmlns=""><a name="type-NM_SETTINGS_SYSTEM_PERMISSIONS" id="type-NM_SETTINGS_SYSTEM_PERMISSIONS">NM_SETTINGS_SYSTEM_PERMISSIONS</a></h3><dl><dt><code>NM_SETTINGS_SYSTEM_PERMISSION_NONE = 0x0</code></dt><dd>No permissions.</dd><dt><code>NM_SETTINGS_SYSTEM_PERMISSION_CONNECTION_MODIFY = 0x1</code></dt><dd>Can modify/add/delete connections.</dd><dt><code>NM_SETTINGS_SYSTEM_PERMISSION_WIFI_SHARING_PROTECTED = 0x2</code></dt><dd>Can share connections via a encrypted user-created WiFi network.</dd><dt><code>NM_SETTINGS_SYSTEM_PERMISSION_WIFI_SHARING_OPEN = 0x4</code></dt><dd>Can share connections via a open/unencrypted user-created WiFi network.</dd><dt><code>NM_SETTINGS_SYSTEM_PERMISSION_HOSTNAME_MODIFY = 0x8</code></dt><dd>Can modify the persistent system hostname.</dd></dl>
+      </dd></dl>
 
 
-    <h1><a name="org.freedesktop.NetworkManagerSettings.Connection" id="org.freedesktop.NetworkManagerSettings.Connection"></a>org.freedesktop.NetworkManagerSettings.Connection</h1>
+    <h1><a name="org.freedesktop.NetworkManager.Settings.Connection" id="org.freedesktop.NetworkManager.Settings.Connection"></a>org.freedesktop.NetworkManager.Settings.Connection</h1>
             Represents a single network connection configuration.
-        <h2>Methods:</h2><div class="method"><h3><a name="org.freedesktop.NetworkManagerSettings.Connection.Update" id="org.freedesktop.NetworkManagerSettings.Connection.Update">Update</a> (
+        <h2>Methods:</h2><div class="method"><h3><a name="org.freedesktop.NetworkManager.Settings.Connection.Update" id="org.freedesktop.NetworkManager.Settings.Connection.Update">Update</a> (
         a{sa{sv}}: properties
         ) &#8594;
         nothing</h3><div class="docstring">
-            Update the connection with new settings and properties, replacing all previous settings and properties.
+            Update the connection with new settings and properties, replacing
+            all previous settings and properties.  Secrets may be part of the
+            update request, and will be either stored in persistent storage or
+            given to a Secret Agent for storage, depending on the request.
           </div><div><h4>Parameters</h4><dl><dt><code>properties</code> -
       <code>a{sa{sv}}</code></dt><dd>
-              New connection properties.
-            </dd></dl></div></div><div class="method"><h3><a name="org.freedesktop.NetworkManagerSettings.Connection.Delete" id="org.freedesktop.NetworkManagerSettings.Connection.Delete">Delete</a> (
+              New connection settings, properties, and (optionally) secrets.
+            </dd></dl></div></div><div class="method"><h3><a name="org.freedesktop.NetworkManager.Settings.Connection.Delete" id="org.freedesktop.NetworkManager.Settings.Connection.Delete">Delete</a> (
         
         ) &#8594;
         nothing</h3><div class="docstring">
             Delete the connection.
-          </div></div><div class="method"><h3><a name="org.freedesktop.NetworkManagerSettings.Connection.GetSettings" id="org.freedesktop.NetworkManagerSettings.Connection.GetSettings">GetSettings</a> (
+          </div></div><div class="method"><h3><a name="org.freedesktop.NetworkManager.Settings.Connection.GetSettings" id="org.freedesktop.NetworkManager.Settings.Connection.GetSettings">GetSettings</a> (
         
         ) &#8594;
         a{sa{sv}}</h3><div class="docstring">
-                Get the settings maps describing this object.
+                Get the settings maps describing this network configuration.
+                This will never include any secrets required for connection
+                to the network, as those are often protected.  Secrets must
+                be requested separately using the GetSecrets() call.
             </div><div><h4>Returns</h4><dl><dt><code>settings</code> -
       <code>a{sa{sv}}</code>
       (<a xmlns="" href="#type-String_String_Variant_Map_Map">String_String_Variant_Map_Map</a>)
     </dt><dd>
                     The nested settings maps describing this object.
-                </dd></dl></div></div><h2>Signals:</h2><div class="signal"><h3><a name="org.freedesktop.NetworkManagerSettings.Connection.Updated" id="org.freedesktop.NetworkManagerSettings.Connection.Updated">Updated</a> (
-        a{sa{sv}}: settings
-        )</h3><div class="docstring">
-                Emitted when some settings changed.
-            </div><div><h4>Parameters</h4><dl><dt><code>settings</code> -
-      <code>a{sa{sv}}</code>
-      (<a xmlns="" href="#type-String_String_Variant_Map_Map">String_String_Variant_Map_Map</a>)
-    </dt><dd>
-                    Contains complete connection setting parameters, including changes.
-                </dd></dl></div></div><div class="signal"><h3><a name="org.freedesktop.NetworkManagerSettings.Connection.Removed" id="org.freedesktop.NetworkManagerSettings.Connection.Removed">Removed</a> (
-        
-        )</h3><div class="docstring">
-                Emitted when this connection has been deleted/removed.  After receipt of this signal, the object no longer exists.
-            </div></div><p>Interface has no properties.</p>
-
-    <h1><a name="org.freedesktop.NetworkManagerSettings.Connection.Secrets" id="org.freedesktop.NetworkManagerSettings.Connection.Secrets"></a>org.freedesktop.NetworkManagerSettings.Connection.Secrets</h1>
-            Secrets have a separate interface so that they can be locked down.
-        <h2>Methods:</h2><div class="method"><h3><a name="org.freedesktop.NetworkManagerSettings.Connection.Secrets.GetSecrets" id="org.freedesktop.NetworkManagerSettings.Connection.Secrets.GetSecrets">GetSecrets</a> (
-        s: setting_name, as: hints, b: request_new
+                </dd></dl></div></div><div class="method"><h3><a name="org.freedesktop.NetworkManager.Settings.Connection.GetSecrets" id="org.freedesktop.NetworkManager.Settings.Connection.GetSecrets">GetSecrets</a> (
+        s: setting_name
         ) &#8594;
         a{sa{sv}}</h3><div class="docstring">
-                Get the secrets encapsulated in this object.
+                Get the secrets belonging to this network configuration.  Only
+                secrets from persistent storage or a Secret Agent running in
+                the requestor's session will be returned.  The user will never
+                be prompted for secrets as a result of this request.
             </div><div><h4>Parameters</h4><dl><dt><code>setting_name</code> -
       <code>s</code></dt><dd>
-                    Name of the setting to return.
-                </dd><dt><code>hints</code> -
-      <code>as</code></dt><dd>
-                    Array of strings of key names in the Setting for which NM thinks
-                    a secrets may be required.
-                </dd><dt><code>request_new</code> -
-      <code>b</code></dt><dd>
-                    Indicates whether new secrets should be requested or if the request can be fulfilled from storage.
+                    Name of the setting to return secrets for.  If empty, all
+                    all secrets will be returned.
                 </dd></dl></div><div><h4>Returns</h4><dl><dt><code>secrets</code> -
       <code>a{sa{sv}}</code>
       (<a xmlns="" href="#type-String_String_Variant_Map_Map">String_String_Variant_Map_Map</a>)
     </dt><dd>
-                    Nested settings maps containing secrets.  Each setting MUST contain at least the 'name' field, containing the name of the setting, and one or more secrets.
-                </dd></dl></div></div><p>Interface has no signals.</p><p>Interface has no properties.</p>
+                    Nested settings maps containing secrets.
+                </dd></dl></div></div><h2>Signals:</h2><div class="signal"><h3><a name="org.freedesktop.NetworkManager.Settings.Connection.Updated" id="org.freedesktop.NetworkManager.Settings.Connection.Updated">Updated</a> (
+        
+        )</h3><div class="docstring">
+                Emitted when any settings or permissions change.  When handling
+                this signal, clients should re-read the connection using the
+                GetSettings method to get the changes and to ensure the client
+                still has permission to access the connection.
+            </div></div><div class="signal"><h3><a name="org.freedesktop.NetworkManager.Settings.Connection.Removed" id="org.freedesktop.NetworkManager.Settings.Connection.Removed">Removed</a> (
+        
+        )</h3><div class="docstring">
+                Emitted when this connection is no longer available.  This
+                happens when the connection is deleted or if it is no longer
+                accessable by any of the system's logged-in users.  After
+                receipt of this signal, the object no longer exists.
+            </div></div><p>Interface has no properties.</p>
 
 
   <h1><a name="org.freedesktop.NetworkManager.Connection.Active" id="org.freedesktop.NetworkManager.Connection.Active"></a>org.freedesktop.NetworkManager.Connection.Active</h1><p>Interface has no methods.</p><h2>Signals:</h2><div class="signal"><h3><a name="org.freedesktop.NetworkManager.Connection.Active.PropertiesChanged" id="org.freedesktop.NetworkManager.Connection.Active.PropertiesChanged">PropertiesChanged</a> (
@@ -942,9 +1076,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       (<a xmlns="" href="#type-String_Variant_Map">String_Variant_Map</a>)
     </dt><dd>
                 A dictionary mapping property names to variant boxed values
-            </dd></dl></div></div><h2>Properties:</h2><dl><dt><code>ServiceName</code> -
-      <code>s</code> -
-      <code>(read)</code></dt><dd>The D-Bus service name providing this connection.</dd><dt><code>Connection</code> -
+            </dd></dl></div></div><h2>Properties:</h2><dl><dt><code>Connection</code> -
       <code>o</code> -
       <code>(read)</code></dt><dd>The path of the connection.</dd><dt><code>SpecificObject</code> -
       <code>o</code> -
@@ -966,8 +1098,34 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
           The connection is activating.
         </dd><dt><code>NM_ACTIVE_CONNECTION_STATE_ACTIVATED = 2</code></dt><dd>
           The connection is activated.
+        </dd><dt><code>NM_ACTIVE_CONNECTION_STATE_DEACTIVATING = 3</code></dt><dd>
+          The connection is being torn down and cleaned up.
         </dd></dl>
 
+  <h1><a name="org.freedesktop.NetworkManager.AgentManager" id="org.freedesktop.NetworkManager.AgentManager"></a>org.freedesktop.NetworkManager.AgentManager</h1><h2>Methods:</h2><div class="method"><h3><a name="org.freedesktop.NetworkManager.AgentManager.Register" id="org.freedesktop.NetworkManager.AgentManager.Register">Register</a> (
+        s: identifier
+        ) &#8594;
+        nothing</h3><div class="docstring">
+        Called by secret Agents to register their ability to provide and save
+        network secrets.
+      </div><div><h4>Parameters</h4><dl><dt><code>identifier</code> -
+      <code>s</code></dt><dd>
+          Identifies this agent; only one agent in each user session may use the
+          same identifier.  Identifier formatting follows the same rules as
+          D-Bus bus names with the exception that the ':' character is not
+          allowed.  The valid set of characters is "[A-Z][a-z][0-9]_-." and the
+          identifier is limited in length to 255 characters with a minimum
+          of 3 characters.  An example valid identifier is 'org.gnome.nm-applet'
+          (without quotes).
+        </dd></dl></div></div><div class="method"><h3><a name="org.freedesktop.NetworkManager.AgentManager.Unregister" id="org.freedesktop.NetworkManager.AgentManager.Unregister">Unregister</a> (
+        
+        ) &#8594;
+        nothing</h3><div class="docstring">
+        Called by secret Agents to notify NetworkManager that they will no
+        longer handle requests for network secrets.  Agents are automatically
+        unregistered when they disconnect from D-Bus.
+      </div></div><p>Interface has no signals.</p><p>Interface has no properties.</p>
+
   <h1><a name="org.freedesktop.NetworkManager.VPN.Connection" id="org.freedesktop.NetworkManager.VPN.Connection"></a>org.freedesktop.NetworkManager.VPN.Connection</h1>
       Represents an active connection to a Virtual Private Network.
     <p>Interface has no methods.</p><h2>Signals:</h2><div class="signal"><h3><a name="org.freedesktop.NetworkManager.VPN.Connection.PropertiesChanged" id="org.freedesktop.NetworkManager.VPN.Connection.PropertiesChanged">PropertiesChanged</a> (
@@ -1157,21 +1315,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
   
 
   <h2><a name="org.freedesktop.NetworkManager.Error.UnknownConnection" id="org.freedesktop.NetworkManager.Error.UnknownConnection"></a>org.freedesktop.NetworkManager.Error.UnknownConnection</h2>
-        Connection was not provided by any known settings service.
+        Connection was not provided by the settings service.
     
 
   <h2><a name="org.freedesktop.NetworkManager.Error.UnknownDevice" id="org.freedesktop.NetworkManager.Error.UnknownDevice"></a>org.freedesktop.NetworkManager.Error.UnknownDevice</h2>
         Unknown device.
     
 
-  <h2><a name="org.freedesktop.NetworkManager.Error.InvalidService" id="org.freedesktop.NetworkManager.Error.InvalidService"></a>org.freedesktop.NetworkManager.Error.InvalidService</h2>
-        Invalid settings service (not a recognized system or user settings service name).
-    
-
-  <h2><a name="org.freedesktop.NetworkManager.Error.SystemConnection" id="org.freedesktop.NetworkManager.Error.SystemConnection"></a>org.freedesktop.NetworkManager.Error.SystemConnection</h2>
-        Connection was superseded by a system connection.
-    
-
   <h2><a name="org.freedesktop.NetworkManager.Error.PermissionDenied" id="org.freedesktop.NetworkManager.Error.PermissionDenied"></a>org.freedesktop.NetworkManager.Error.PermissionDenied</h2>
     User does not have the permission to activate this connection.
     
@@ -1186,21 +1336,22 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
   <h2><a name="org.freedesktop.NetworkManager.VPN.Error.BadArguments" id="org.freedesktop.NetworkManager.VPN.Error.BadArguments"></a>org.freedesktop.NetworkManager.VPN.Error.BadArguments</h2>Invalid arguments were passed with the request.  FIXME: too general.
   <h2><a name="org.freedesktop.NetworkManager.VPN.Error.LaunchFailed" id="org.freedesktop.NetworkManager.VPN.Error.LaunchFailed"></a>org.freedesktop.NetworkManager.VPN.Error.LaunchFailed</h2>A binary providing the service failed to launch.
   <h2><a name="org.freedesktop.NetworkManager.VPN.Error.ConnectionInvalid" id="org.freedesktop.NetworkManager.VPN.Error.ConnectionInvalid"></a>org.freedesktop.NetworkManager.VPN.Error.ConnectionInvalid</h2>The request could not be processed because the VPN connection settings were invalid.
-<h1>Index</h1><h2>Index of interfaces</h2><ul><li><code><a href="#org.freedesktop.NetworkManager">org.freedesktop.NetworkManager</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.AccessPoint">org.freedesktop.NetworkManager.AccessPoint</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.Device">org.freedesktop.NetworkManager.Device</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.Device.Wired">org.freedesktop.NetworkManager.Device.Wired</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.Device.Wireless">org.freedesktop.NetworkManager.Device.Wireless</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.Device.Cdma">org.freedesktop.NetworkManager.Device.Cdma</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.Device.Gsm">org.freedesktop.NetworkManager.Device.Gsm</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.Device.Serial">org.freedesktop.NetworkManager.Device.Serial</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.Device.Bluetooth">org.freedesktop.NetworkManager.Device.Bluetooth</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.Device.OlpcMesh">org.freedesktop.NetworkManager.Device.OlpcMesh</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.IP4Config">org.freedesktop.NetworkManager.IP4Config</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.IP6Config">org.freedesktop.NetworkManager.IP6Config</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.DHCP4Config">org.freedesktop.NetworkManager.DHCP4Config</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.DHCP6Config">org.freedesktop.NetworkManager.DHCP6Config</a></code></li><li><code><a href="#org.freedesktop.NetworkManagerSettings">org.freedesktop.NetworkManagerSettings</a></code></li><li><code><a href="#org.freedesktop.NetworkManagerSettings.System">org.freedesktop.NetworkManagerSettings.System</a></code></li><li><code><a href="#org.freedesktop.NetworkManagerSettings.Connection">org.freedesktop.NetworkManagerSettings.Connection</a></code></li><li><code><a href="#org.freedesktop.NetworkManagerSettings.Connection.Secrets">org.freedesktop.NetworkManagerSettings.Connection.Secrets</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.Connection.Active">org.freedesktop.NetworkManager.Connection.Active</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.VPN.Connection">org.freedesktop.NetworkManager.VPN.Connection</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.VPN.Plugin">org.freedesktop.NetworkManager.VPN.Plugin</a></code></li></ul><h2>Index of types</h2><ul><li><code><a href="#type-NM_802_11_AP_FLAGS">NM_802_11_AP_FLAGS</a></code>
+<h1>Index</h1><h2>Index of interfaces</h2><ul><li><code><a href="#org.freedesktop.NetworkManager">org.freedesktop.NetworkManager</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.AccessPoint">org.freedesktop.NetworkManager.AccessPoint</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.Device">org.freedesktop.NetworkManager.Device</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.Device.Wired">org.freedesktop.NetworkManager.Device.Wired</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.Device.Wireless">org.freedesktop.NetworkManager.Device.Wireless</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.Device.Modem">org.freedesktop.NetworkManager.Device.Modem</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.Device.Bluetooth">org.freedesktop.NetworkManager.Device.Bluetooth</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.Device.OlpcMesh">org.freedesktop.NetworkManager.Device.OlpcMesh</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.Device.WiMax">org.freedesktop.NetworkManager.Device.WiMax</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.WiMax.Nsp">org.freedesktop.NetworkManager.WiMax.Nsp</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.IP4Config">org.freedesktop.NetworkManager.IP4Config</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.IP6Config">org.freedesktop.NetworkManager.IP6Config</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.DHCP4Config">org.freedesktop.NetworkManager.DHCP4Config</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.DHCP6Config">org.freedesktop.NetworkManager.DHCP6Config</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.Settings">org.freedesktop.NetworkManager.Settings</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.Settings.Connection">org.freedesktop.NetworkManager.Settings.Connection</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.Connection.Active">org.freedesktop.NetworkManager.Connection.Active</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.AgentManager">org.freedesktop.NetworkManager.AgentManager</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.VPN.Connection">org.freedesktop.NetworkManager.VPN.Connection</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.VPN.Plugin">org.freedesktop.NetworkManager.VPN.Plugin</a></code></li></ul><h2>Index of types</h2><ul><li><code><a href="#type-NM_802_11_AP_FLAGS">NM_802_11_AP_FLAGS</a></code>
     - u</li><li><code><a href="#type-NM_802_11_AP_SEC">NM_802_11_AP_SEC</a></code>
     - u</li><li><code><a href="#type-NM_802_11_DEVICE_CAP">NM_802_11_DEVICE_CAP</a></code>
     - u</li><li><code><a href="#type-NM_802_11_MODE">NM_802_11_MODE</a></code>
     - u</li><li><code><a href="#type-NM_ACTIVE_CONNECTION_STATE">NM_ACTIVE_CONNECTION_STATE</a></code>
     - u</li><li><code><a href="#type-NM_BT_CAPABILITIES">NM_BT_CAPABILITIES</a></code>
     - u</li><li><code><a href="#type-NM_DEVICE_CAP">NM_DEVICE_CAP</a></code>
+    - u</li><li><code><a href="#type-NM_DEVICE_MODEM_CAPABILITIES">NM_DEVICE_MODEM_CAPABILITIES</a></code>
     - u</li><li><code><a href="#type-NM_DEVICE_STATE">NM_DEVICE_STATE</a></code>
     - u</li><li><code><a href="#type-NM_DEVICE_STATE_REASON">NM_DEVICE_STATE_REASON</a></code>
     - u</li><li><code><a href="#type-NM_DEVICE_TYPE">NM_DEVICE_TYPE</a></code>
-    - u</li><li><code><a href="#type-NM_SETTINGS_SYSTEM_PERMISSIONS">NM_SETTINGS_SYSTEM_PERMISSIONS</a></code>
     - u</li><li><code><a href="#type-NM_STATE">NM_STATE</a></code>
     - u</li><li><code><a href="#type-NM_VPN_CONNECTION_STATE">NM_VPN_CONNECTION_STATE</a></code>
     - u</li><li><code><a href="#type-NM_VPN_CONNECTION_STATE_REASON">NM_VPN_CONNECTION_STATE_REASON</a></code>
     - u</li><li><code><a href="#type-NM_VPN_PLUGIN_FAILURE">NM_VPN_PLUGIN_FAILURE</a></code>
+    - u</li><li><code><a href="#type-NM_WIMAX_NSP_NETWORK_TYPE">NM_WIMAX_NSP_NETWORK_TYPE</a></code>
     - u</li><li><code><a href="#type-String_String_Map">String_String_Map</a></code>
     - a{ s &#8594; s }
   </li><li><code><a href="#type-String_String_Variant_Map_Map">String_String_Variant_Map_Map</a></code>
diff --git a/docs/api/html/style.css b/docs/api/html/style.css
new file mode 100644
index 000000000..d6f6c26ec
--- /dev/null
+++ b/docs/api/html/style.css
@@ -0,0 +1,266 @@
+.synopsis, .classsynopsis
+{
+  /* tango:aluminium 1/2 */
+  background: #eeeeec;
+  border: solid 1px #d3d7cf;
+  padding: 0.5em;
+}
+.programlisting
+{
+  /* tango:sky blue 0/1 */
+  background: #e6f3ff;
+  border: solid 1px #729fcf;
+  padding: 0.5em;
+}
+.variablelist
+{
+  padding: 4px;
+  margin-left: 3em;
+}
+.variablelist td:first-child
+{
+  vertical-align: top;
+}
+
+@media screen {
+  sup a.footnote
+  {
+    position: relative;
+    top: 0em ! important;
+    
+  }
+  /* this is needed so that the local anchors are displayed below the naviagtion */
+  div.footnote a[name], div.refnamediv a[name], div.refsect1 a[name], div.refsect2 a[name], div.index a[name], div.glossary a[name], div.sect1 a[name]
+  {
+    display: inline-block;
+    position: relative;
+    top:-5em;
+  }
+  /* this seems to be a bug in the xsl style sheets when generating indexes */
+  div.index div.index
+  {
+    top: 0em;
+  }
+  /* make space for the fixed navigation bar and add space at the bottom so that
+   * link targets appear somewhat close to top
+   */
+  body
+  {
+    padding-top: 3.2em;
+    padding-bottom: 20em;
+  }
+  /* style and size the navigation bar */
+  table.navigation#top
+  {
+    position: fixed;
+    /* tango:scarlet red 0/1 */
+    background: #ffe6e6;
+    border: solid 1px #ef2929;
+    margin-top: 0;
+    margin-bottom: 0;
+    top: 0;
+    left: 0;
+    height: 3em;
+    z-index: 10;
+  }
+  .navigation a, .navigation a:visited
+  {
+    /* tango:scarlet red 3 */
+    color: #a40000;
+  }
+  .navigation a:hover
+  {
+    /* tango:scarlet red 1 */
+    color: #ef2929;
+  }
+  td.shortcuts
+  {
+    /* tango:scarlet red 1 */
+    color: #ef2929;
+    font-size: 80%;
+    white-space: nowrap;
+  }
+}
+@media print {
+  table.navigation {
+    visibility: collapse;
+    display: none;
+  }
+  div.titlepage table.navigation {
+    visibility: visible;
+    display: table;
+    /* tango:scarlet red 0/1 */
+    background: #ffe6e6;
+    border: solid 1px #ef2929;
+    margin-top: 0;
+    margin-bottom: 0;
+    top: 0;
+    left: 0;
+    height: 3em;
+  }
+}
+
+.navigation .title
+{
+  font-size: 200%;
+}
+
+div.gallery-float
+{
+  float: left;
+  padding: 10px;
+}
+div.gallery-float img
+{
+  border-style: none;
+}
+div.gallery-spacer
+{
+  clear: both;
+}
+
+a, a:visited
+{
+  text-decoration: none;
+  /* tango:sky blue 2 */
+  color: #3465a4;
+}
+a:hover
+{
+  text-decoration: underline;
+  /* tango:sky blue 1 */
+  color: #729fcf;
+}
+
+div.table table
+{
+  border-collapse: collapse;
+  border-spacing: 0px;
+  /* tango:aluminium 3 */
+  border: solid 1px #babdb6;
+}
+
+div.table table td, div.table table th
+{
+  /* tango:aluminium 3 */
+  border: solid 1px #babdb6;
+  padding: 3px;
+  vertical-align: top;
+}
+
+div.table table th
+{
+  /* tango:aluminium 2 */
+  background-color: #d3d7cf;
+}
+
+hr
+{
+  /* tango:aluminium 3 */
+  color: #babdb6;
+  background: #babdb6;
+  border: none 0px;
+  height: 1px;
+  clear: both;
+}
+
+.footer
+{
+  padding-top: 3.5em;
+  /* tango:aluminium 3 */
+  color: #babdb6;
+  text-align: center;
+  font-size: 80%;
+}
+
+.warning
+{
+  /* tango:orange 0/1 */
+  background: #ffeed9;
+  border-color: #ffb04f;
+}
+.note
+{
+  /* tango:chameleon 0/0.5 */
+  background: #d8ffb2;
+  border-color: #abf562;
+}
+.note, .warning
+{
+  padding: 0.5em;
+  border-width: 1px;
+  border-style: solid;
+}
+.note h3, .warning h3
+{
+  margin-top: 0.0em
+}
+.note p, .warning p
+{
+  margin-bottom: 0.0em
+}
+
+/* blob links */
+h2 .extralinks, h3 .extralinks
+{
+  float: right;
+  /* tango:aluminium 3 */
+  color: #babdb6;
+  font-size: 80%;
+  font-weight: normal;
+}
+
+.annotation
+{
+  /* tango:aluminium 5 */
+  color: #555753;
+  font-size: 80%;
+  font-weight: normal;
+}
+
+/* code listings */
+
+.listing_code .programlisting .cbracket   { color: #a40000; } /* tango: scarlet red 3 */
+.listing_code .programlisting .comment    { color: #a1a39d; } /* tango: aluminium 4 */
+.listing_code .programlisting .function   { color: #000000; font-weight: bold; }
+.listing_code .programlisting .function a { color: #11326b; font-weight: bold; } /* tango: sky blue 4 */
+.listing_code .programlisting .keyword    { color: #4e9a06; } /* tango: chameleon 3  */
+.listing_code .programlisting .linenum    { color: #babdb6; } /* tango: aluminium 3 */
+.listing_code .programlisting .normal     { color: #000000; }
+.listing_code .programlisting .number     { color: #75507b; } /* tango: plum 2 */
+.listing_code .programlisting .preproc    { color: #204a87; } /* tango: sky blue 3  */
+.listing_code .programlisting .string     { color: #c17d11; } /* tango: chocolate 2 */
+.listing_code .programlisting .type       { color: #000000; }
+.listing_code .programlisting .type a     { color: #11326b; } /* tango: sky blue 4 */
+.listing_code .programlisting .symbol     { color: #ce5c00; } /* tango: orange 3 */
+
+.listing_frame {
+  /* tango:sky blue 1 */
+  border: solid 1px #729fcf;
+  padding: 0px;
+}
+
+.listing_lines, .listing_code {
+  margin-top: 0px;
+  margin-bottom: 0px;
+  padding: 0.5em;
+}
+.listing_lines {
+  /* tango:sky blue 0.5 */
+  background: #a6c5e3;
+  /* tango:aluminium 6 */
+  color: #2e3436;
+}
+.listing_code {
+  /* tango:sky blue 0 */
+  background: #e6f3ff;
+}
+.listing_code .programlisting {
+  /* override from previous */
+  border: none 0px;
+  padding: 0px;
+}
+.listing_lines pre, .listing_code pre {
+  margin: 0px;
+}
+
diff --git a/docs/api/html/up.png b/docs/api/html/up.png
new file mode 100644
index 000000000..85b3e2a27
--- /dev/null
+++ b/docs/api/html/up.png
diff --git a/docs/api/migrating-to-09.xml b/docs/api/migrating-to-09.xml
new file mode 100644
index 000000000..910c1369f
--- /dev/null
+++ b/docs/api/migrating-to-09.xml
@@ -0,0 +1,476 @@
+<?xml version="1.0"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'">
+]>
+<chapter id="ref-migrating">
+  <title>Migrating from NetworkManager 0.8 to NetworkManager 0.9</title>
+
+  <para>
+    NetworkManager 0.9 is a new major version of NetworkManager that breaks
+    both API and ABI compared to previous versions.  These changes are
+    intended to make communication with NetworkManager much simpler, especially
+    for network control and configuration programs.  Thankfully, most changes
+    are not difficult to implement, and the advantages of the simpler
+    architecture of NetworkManager 0.9 greatly outweight the effort of
+    updating client programs.
+  </para>
+
+  <section>
+    <title>Architecture and D-Bus API Changes in 0.9</title>
+
+    <para>
+      This section details the architectural and D-Bus API changes in
+      NetworkManager 0.9.
+    </para>
+
+    <section>
+    <title>Elimination of the User Settings Service</title>
+    <para>
+      Previously there were two "settings services", or D-Bus services that
+      provided and saved network configuration information.  NetworkManager
+      owned the "system" settings service, and one user-level applet owned the
+      "user" settings service.  Now, the "user" settings service has been
+      eliminated, so clients only have to track one D-Bus service to read and
+      update network configuration.  The functionality of the old user settings
+      service has been replaced with a "permissions" key on each connection
+      object to preserve the ability to restrict which users can use the
+      connection, and with a "secret agent" D-Bus API for user-session-level
+      secure storage of network secrets and passwords.
+    </para>
+    <para>
+      Elimination of the user settings service provides the following advantages
+      for clients of NetworkManager:
+      <itemizedlist>
+        <listitem>Simpler discovery of network configuration and change tracking</listitem>
+        <listitem>Simpler storage of user-level network secrets by control applets</listitem>
+        <listitem>Correct operation of fast-user switching and multi-seat configurations</listitem>
+        <listitem>More granular network connection permissions for system administrators</listitem>
+        <listitem>Connections are now system-wide by default (unless restricted by the user or system administrator)</listitem>
+        <listitem>Easier deployment of user-specific connections (ie, VPNs)</listitem>
+      </itemizedlist>
+    </para>
+    <para>
+      With this change, D-Bus methods that previously took a "service name"
+      argument (like
+      <literal>org.freedesktop.NetworkManager.ActivateConnection</literal>) and
+      objects with service name properties (like ActiveConnection objects) no
+      longer have those arguments or properties.
+    </para>
+    <para>
+      <emphasis role="strong">Action:</emphasis> if you develop a network control
+      applet that talks to NetworkManager and used to provide a user settings
+      service, you can eliminate that code and rely on NetworkManager for all
+      storage of network configuration.  Your applet should now implement the
+      Secret Agent D-Bus API (see below) to store user-specific secrets, and
+      add legacy user-specific configuration to NetworkManager when run.  More
+      information about both these changes follows.
+    </para>
+    </section>
+
+    <section>
+    <title>User Secret Agents</title>
+    <para>
+      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
+      system-wide storage (and thus available to all users).  To allow this
+      functionality the concept of agents has been introduced.  Using the new
+      <ulink url="spec.html#org.freedesktop.NetworkManager.AgentManager">
+      <literal>org.freedesktop.NetworkManager.AgentManager</literal></ulink>
+      D-Bus interface provided by NetworkManager, user applications can register
+      themselves as "secret agents", ie programs capable of saving and providing
+      secrets to NetworkManager.  The agent should export the
+      <ulink url="spec.html#org.freedesktop.NetworkManager.SecretAgent">
+      <literal>org.freedesktop.NetworkManager.SecretAgent</literal></ulink>
+      D-Bus interface, but should NOT claim a bus name on the system or session
+      bus.  Instead, NetworkManager talks to the agent directly over the D-Bus
+      connection which the agent used to register itself.
+    </para>
+    <para>
+      Each agent must send a unique identifier to NetworkManager when it
+      registers.  This identifier must follow certain rules (see the NM D-Bus
+      API documentation for more details) but looks essentially the same as
+      a D-Bus service name.  Only one agent using a given identifier may be
+      registered at the same time.  The agent is automatically unregistered
+      if it disconnects from D-Bus or exits.
+    </para>
+    <para>
+      When NetworkManager requires secrets during the attempt to connect to a
+      network, and no secrets are available from the internal settings service,
+      NetworkManager queries each registered agent for secrets.  Agents that
+      are in "active" user sessions (as determined by ConsoleKit) are preferred
+      over inactive ones.  Only agents belonging to users who have permission
+      to view and modify the connection are queried.  For more information on
+      connection permissions, see below.
+    </para>
+      When secrets are requested, the agent is also sent a set of flags that
+      modify the behavior of the request.  By default, the agent should never
+      attempt to query the user for secrets, but should simply return any
+      available saved secrets.  Other flags allow the agent to explicitly
+      request new secrets from the user.
+    <para>
+      <emphasis role="strong">Action:</emphasis> the parts of a previous user
+      settings service that handled secrets may be easily repurposed as the bulk
+      of the implementation of a secret agent.  The agent is sent all available
+      connection settings, and from those should be able to retrieve or save
+      any saved user secrets, or to request new secrets from the user.
+    </para>
+    </section>
+
+    <section>
+    <title>Settings Service Interface Changes</title>
+    <para>
+      With the elimination of the user settings service, the old
+      <literal>org.freedesktop.NetworkManagerUserSettings</literal> and
+      <literal>org.freedesktop.NetworkManagerSystemSettings</literal> D-Bus
+      service names are no longer used.  Instead NetworkManager provides the
+      settings service using its own D-Bus service name,
+      <literal>org.freedesktop.NetworkManager</literal>.  The object path of
+      the settings service remains unchanged.
+    </para>
+    <para>
+      Additionally, the D-Bus interface of the settings service has changed
+      to <ulink url="spec.html#org.freedesktop.NetworkManager.Settings">
+      <literal>org.freedesktop.NetworkManager.Settings</literal></ulink> from
+      the old interface name of
+      <literal>org.freedesktop.NetworkManagerSettings</literal>, and the old
+      <literal>org.freedesktop.NetworkManagerSettings.System</literal>
+      interface has been merged into the new
+      <ulink url="spec.html#org.freedesktop.NetworkManager.Settings">
+      <literal>org.freedesktop.NetworkManager.Settings</literal></ulink> interface
+      as the split no longer made sense. This includes the
+      <literal>SaveHostname</literal> method and the <literal>Hostname</literal>
+      and <literal>CanModify</literal> properties.
+    </para>
+    <para>
+      <emphasis role="strong">Action:</emphasis> change the service name that
+      your application uses to request system network settings to
+      <literal>org.freedesktop.NetworkManager</literal>, and update the D-Bus
+      interface that codes uses to talk to the settings service to
+      <ulink url="spec.html#org.freedesktop.NetworkManager.Settings">
+      <literal>org.freedesktop.NetworkManager.Settings</literal></ulink>.
+      Listen for hostname changes using the new interface name as well.
+    </para>
+    </section>
+
+    <section>
+    <title>Connection Object Interface Changes</title>
+    <para>
+      Consistent with the interface changes to the Settings object, the
+      Connection object's D-Bus interface has changed to
+      <ulink url="spec.html#org.freedesktop.NetworkManager.Settings.Connection">
+      <literal>org.freedesktop.NetworkManager.Settings.Connection</literal></ulink>
+      from the previous 
+      <literal>org.freedesktop.NetworkManagerSettings.Connection</literal>.
+    </para>
+    <para>
+      Additionally, the
+      <literal>org.freedesktop.NetworkManager.Settings.Connection.Updated</literal>
+      signal of the Connection object no longer includes the updated settings
+      data argument, as that might allow users who are not authorized to
+      view the connection details to do so.  Instead, when a client receives the
+      Updated signal, it should requery the Connection's settings with the
+      <literal>org.freedesktop.NetworkManager.Settings.Connection.GetSettings</literal>
+      method.  If the client receives an error as a result of this method call,
+      it should assume the connection has been deleted.
+    </para>
+    <para>
+      <emphasis role="strong">Action:</emphasis> where code manipulates
+      Connection objects, update the D-Bus interface that code uses to be
+      <literal>org.freedesktop.NetworkManager.Settings.Connection</literal>.
+      Additionally, code that listens for the
+      <literal>org.freedesktop.NetworkManager.Settings.Connection.Updated</literal>
+      signal should no longer expect the new settings data as an argument, but
+      instead should request the new settings data using the
+      <literal>org.freedesktop.NetworkManager.Settings.Connection.GetSettings</literal>
+      method.
+    </para>
+    </section>
+
+    <section>
+    <title>Permissions Methods Consolidation</title>
+    <para>
+      Previously there were two D-Bus method calls to retrieve the list of
+      operations that a user client could perform, and two signals notifying
+      callers that they should recheck permissions.  Those two calls were:
+      <itemizedlist>
+        <listitem>
+          <literal>org.freedesktop.NetworkManagerSettings.System.GetPermissions</literal>
+          which returned a bitfield of operations the caller was allowed to
+          perform related to modify system network settings and the machine
+          hostname
+        </listitem>
+        <listitem>
+          <literal>org.freedesktop.NetworkManager.GetPermissions</literal> which
+          returned a dictionary mapping permission names to result strings like
+          "yes", "auth", or "no", relating to network control permissions like
+          the ability to enable or disable WiFi.
+        </listitem>
+      </itemizedlist>
+      These two calls have been consolidated into an enhanced
+      <literal>org.freedesktop.NetworkManager.GetPermissions</literal> call that
+      uses the same arguments, but includes all permissions, including those which
+      the settings service used to handle.
+    </para>
+    <para>
+      With this change, the bitfield items from
+      <literal>org.freedesktop.NetworkManagerSettings.System.GetPermissions</literal>
+      are now string-based permissions.  The mapping is as follows:
+      <table>
+        <tgroup cols="2">
+          <thead>
+            <row><entry>Old bitfield value</entry><entry>New permission name</entry></row>
+          </thead>
+          <tbody>
+            <row>
+              <entry><screen>0x1 (connection-modify)</screen></entry>
+              <entry>
+                <literal>org.freedesktop.NetworkManager.settings.modify.system</literal>
+                or <literal>org.freedesktop.NetworkManager.settings.modify.system</literal>
+                depending on the permissions of the connection.
+              </entry>
+            </row>
+            <row>
+              <entry><screen>0x2 (wifi-share-protected)</screen></entry>
+              <entry>
+                <literal>org.freedesktop.NetworkManager.wifi.share.protected</literal>
+              </entry>
+            </row>
+            <row>
+              <entry><screen>0x4 (wifi-share-open)</screen></entry>
+              <entry>
+                <literal>org.freedesktop.NetworkManager.wifi.share.open</literal>
+              </entry>
+            </row>
+            <row>
+              <entry><screen>0x8 (hostname-modify)</screen></entry>
+              <entry>
+                <literal>org.freedesktop.NetworkManager.settings.modify.hostname</literal>
+              </entry>
+            </row>
+          </tbody>
+        </tgroup>
+      </table>
+    </para>
+    <para>
+      <emphasis role="strong">Action:</emphasis> modify handling of existing
+      code that checks permissions to recognize the new permissions names for
+      old system settings permissions, and remove code that used to call
+      <literal>org.freedesktop.NetworkManagerSettings.System.GetPermissions</literal>.
+    </para>
+    </section>
+
+    <section>
+    <title>AddConnection Returns Object Path of New Connection</title>
+    <para>
+      The <ulink url="spec.html#org.freedesktop.NetworkManager.Settings">
+      <literal>org.freedesktop.NetworkManager.Settings.AddConnection</literal>
+      </ulink> method call now returns the object path of the newly added
+      connection. Previously, if code wanted to manipulate a connection
+      post-addition, it had to wait for the new connection to be announced via
+      the NewConnection signal by matching connection UUIDs.  Now the object
+      path is returned and this workaround is no longer required.
+    </para>
+    <para>
+      <emphasis role="strong">Action:</emphasis> update code that adds new
+      connections to handle the object path returned from AddConnection, and
+      remove workarounds for finding the new connection via signals.
+    </para>
+    </section>
+
+    <section>
+    <title>Support for WiMAX Devices</title>
+    <para>
+      NetworkManager now supports Intel WiMAX mobile broadband devices.  A
+      corresponding device type (<literal>NM_DEVICE_TYPE_WIMAX</literal>) and
+      a new <ulink url="spec.html#org.freedesktop.NetworkManager.Device.WiMax">
+      <literal>org.freedesktop.NetworkManager.Device.WiMax</literal></ulink>
+      D-Bus interface have been added.  Furthermore, to support connection to
+      different WiMAX Network Service Providers (NSPs) the
+      <ulink url="spec.html#org.freedesktop.NetworkManager.Device.WiMax.Nsp">
+      <literal>org.freedesktop.NetworkManager.Device.WiMax.Nsp</literal></ulink>
+      interface has been added to access information about each available
+      WiMAX network.
+    </para>
+    <para>
+      <emphasis role="strong">Action:</emphasis> update code that handles
+      devices and/or displays status to users to recognize the new device type,
+      and to display available WiMAX NSPs similar to how WiFi Access Points
+      are displayed. Also update code that creates new connections to allow
+      creation of new WiMAX connections.
+    </para>
+    </section>
+
+    <section>
+    <title>New Device States</title>
+    <para>
+      A few <ulink url="spec.html#type-NM_DEVICE_STATE">new device states</ulink>
+      have been added, and all device states have been renumbered for flexibility.
+      The new devices states IP_CHECK, SECONDARIES, and DEACTIVATING.
+    </para>
+    <para>
+      <emphasis role="strong">Action:</emphasis> where code checks device state
+      or shows UI indication of the device's state, make sure the new device
+      states are processed correctly, and that code in switch()-type statements
+      is updated to handle the new states.
+    </para>
+    </section>
+
+    <section>
+    <title>New Active Connection State</title>
+    <para>
+      Along with the new device states, an
+      <ulink url="spec.html#type-NM_ACTIVE_CONNECTION_STATE">additional
+      ActiveConnection state</ulink> has been added: DEACTIVATING.  This state
+      is entered when the connection is being torn down and deactivated.
+    </para>
+    <para>
+      <emphasis role="strong">Action:</emphasis> where code checks active
+      connection states or shows UI indication of active connection states, make
+      sure the DEACTIVATING state is processed correctly, and that code in
+      switch()-type statements is updated to handle it.
+    </para>
+    </section>
+
+    <section>
+    <title>Consolidated Modem Devices</title>
+    <para>
+      Many new mobile broadband devices support multiple access families, like
+      Qualcomm Gobi cards (CDMA/EVDO and GSM/UMTS), or multi-mode EVDO/LTE
+      or UMTS/LTE modems like the Pantech UML290.  The previous hard split
+      between CDMA/EVDO and GSM/UMTS device classes was not flexible enough to
+      deal with these new multi-mode devices.  Thus the previously separate
+      CDMA and GSM device classes have been combined into a single Modem
+      device class, which exposes both hardware "ModemCapabilities" and
+      runtime "CurrentCapabilities" which represent generic access technology
+      families like CDMA/EVDO, GSM/UMTS, and LTE which the device supports.
+      ModemCapabilities indicate all the access technology families which the
+      modem is capable of supporting, while CurrentCapabilities indicate the
+      immediate access technology families the device supports without reloading
+      the firmware and thus restarting the device.
+    </para>
+    <para>
+      Along with this change, the
+      <literal>org.freedesktop.NetworkManager.Device.Serial</literal>
+      interface has been removed as it's functionality will be incorporated
+      into the 
+      <ulink url="spec.html#org.freedesktop.NetworkManager.Device.Modem">
+      <literal>org.freedesktop.NetworkManager.Device.Modem</literal></ulink>
+      interface in the future.
+    </para>
+    <para>
+      <emphasis role="strong">Action:</emphasis> combine code that checks for
+      the old CDMA and GSM device types, and instead handle the new Modem device
+      type.  Where behavior must change based on the capabilities of the device,
+      check the CurrentCapabilities device property to determine whether to
+      treat the device as CDMA, GSM, or LTE for purposes of configuration and
+      status.
+    </para>
+    </section>
+
+    <section>
+    <title>Secret Property Flags</title>
+    <para>
+      In the Connection object's configuration properties, each setting's secret
+      properties (like WiFi passphrases, or public key passwords, etc) now has
+      an associated "flags" property that changes how NetworkManager treats the
+      secret.  The "flags" property is a bitfield of one or more of the
+      following values:
+      <table>
+        <tgroup cols="2">
+          <thead>
+            <row><entry>Flag Value</entry><entry>Meaning</entry></row>
+          </thead>
+          <tbody>
+            <row>
+              <entry><screen>0x00 (none)</screen></entry>
+              <entry>
+                NetworkManager is responsible for providing and storing this
+                secret (default)
+              </entry>
+            </row>
+            <row>
+              <entry><screen>0x01 (agent-owned)</screen></entry>
+              <entry>
+                A user secret agent is responsible for providing and storing
+                this secret; when it is required agents will be asked to
+                retrieve it
+              </entry>
+            </row>
+            <row>
+              <entry><screen>0x02 (not saved)</screen></entry>
+              <entry>
+                The secret is not saved, and should be requested each time it
+                is required.  Used for OTP/token configurations where the
+                secret changes periodically, or if the user simply wants to
+                manually enter the secret each time.
+              </entry>
+            </row>
+            <row>
+              <entry><screen>0x04 (not required)</screen></entry>
+              <entry>
+                In situations where it cannot be automatically determined that
+                the secret is required (some VPNs and PPP providers dont require
+                all possible secrets) this flag indicates that the specific
+                secret is not required.
+              </entry>
+            </row>
+          </tbody>
+        </tgroup>
+      </table>
+    </para>
+    <para>
+      <emphasis role="strong">Action:</emphasis> user interface code which
+      handles entry of connection secrets should be updated to read and set
+      secret flags.  For example, code that creates new VPN connections may want
+      to set the "agent-owned" flag to ensure that the user's VPN password is
+      not available to all users.  EAP-TLS and VPN interface code might add a
+      checkbox that toggles the "not saved" bit to indicate that the
+      password/PIN code should be requested from a hardware token each time it
+      is required.
+    </para>
+    </section>
+
+    <section>
+    <title>Deprecated Methods Removed</title>
+    <para>
+      A few methods and signals of the <literal>org.freedesktop.NetworkManager</literal>
+      interface deprecated in version 0.7 have been removed.  All the
+      replacement methods and signals have existed since version 0.7 and so are
+      not new to this version of NetworkManager, but some older programs may
+      be using removed items.  The following table lists the removed items and
+      their replacements:
+      <table>
+        <tgroup cols="2">
+          <thead>
+            <row><entry>Removed Item</entry><entry>Replacement</entry></row>
+          </thead>
+          <tbody>
+            <row>
+              <entry><screen>StateChange signal</screen></entry>
+              <entry>
+                Use the <literal>StateChanged</literal> signal, which has the
+                same arguments.
+              </entry>
+            </row>
+            <row>
+              <entry><screen>sleep() and wake() methods</screen></entry>
+              <entry>
+                Use the <literal>Sleep()</literal> method instead, which takes
+                a boolean argument indicating whether NetworkManager should
+                go to sleep or wake up.
+              </entry>
+            </row>
+          </tbody>
+        </tgroup>
+      </table>
+    </para>
+    <para>
+      <emphasis role="strong">Action:</emphasis> update code to use these
+      replacement methods and properties where it used old deprecated ones
+    </para>
+    </section>
+
+  </section>
+
+</chapter>
diff --git a/docs/api/network-manager-docs.xml b/docs/api/network-manager-docs.xml
new file mode 100644
index 000000000..885ff7f1b
--- /dev/null
+++ b/docs/api/network-manager-docs.xml
@@ -0,0 +1,129 @@
+<?xml version="1.0"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
+               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
+<!ENTITY version SYSTEM "version.xml">
+]>
+<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
+  <bookinfo>
+    <title>NetworkManager D-Bus Reference Manual</title>
+    <releaseinfo>Version &version;</releaseinfo>
+    <authorgroup>
+      <author>
+	<firstname>Dan</firstname>
+	<surname>Williams</surname>
+	<affiliation>
+	  <address>
+	    <email>dcbw@redhat.com</email>
+	  </address>
+	</affiliation>
+      </author>
+    </authorgroup>
+
+    <copyright>
+      <year>2011</year>
+      <holder>The NetworkManager Authors</holder>
+    </copyright>
+
+    <legalnotice>
+      <para>
+	Permission is granted to copy, distribute and/or modify this
+	document under the terms of the <citetitle>GNU Free
+	Documentation License</citetitle>, Version 1.1 or any later
+	version published by the Free Software Foundation with no
+	Invariant Sections, no Front-Cover Texts, and no Back-Cover
+	Texts. You may obtain a copy of the <citetitle>GNU Free
+	Documentation License</citetitle> from the Free Software
+	Foundation by visiting <ulink type="http"
+	url="http://www.fsf.org">their Web site</ulink> or by writing
+	to:
+
+	<address>
+	  The Free Software Foundation, Inc.,
+	  <street>59 Temple Place</street> - Suite 330,
+	  <city>Boston</city>, <state>MA</state> <postcode>02111-1307</postcode>,
+	  <country>USA</country>
+	</address>
+      </para>
+
+      <para>
+	Many of the names used by companies to distinguish their
+	products and services are claimed as trademarks. Where those
+	names appear in any GNOME documentation, and those trademarks
+	are made aware to the members of the GNOME Documentation
+	Project, the names have been printed in caps or initial caps.
+      </para>
+    </legalnotice>
+  </bookinfo>
+
+  <chapter id="ref-dbus">
+    <title>D-Bus API Reference</title>
+    <para>
+      This part documents the D-Bus interface used to access the
+      NetworkManager daemon.
+    </para>
+    <ulink url="spec.html"/>
+  </chapter>
+
+  <chapter id="ref-settings">
+    <title>Network Configuration Setting Specification</title>
+    <para>
+      This part documents the properties and value types of each "Setting"
+      object that composes the basic unit of NetworkManager configuration,
+      the "Connection".  Each Connection object is simply a dictionary mapping
+      setting names (like "wimax" or "bluetooth") to a dictionary of
+      key/value pairs that represents each itself.
+    </para>
+    <xi:include href="settings-spec.xml" />
+    <section id="secrets-flags">
+      <title>Secret flag types</title>
+      <para>
+        Each secret property in a setting has an associated "flags" property
+        that describes how to handle that secret.  The "flags" property is a
+        bitfield that contains zero or more of the following values logically
+        OR-ed together.
+      </para>
+      <para>
+        <itemizedlist>
+          <listitem>
+            <literal>0x0 (none)</literal> - the system is responsible for providing
+            and storing this secret.
+          </listitem>
+          <listitem>
+            <literal>0x1 (agent-owned)</literal> - a user-session secret agent
+            is responsible for providing and storing this secret; when it is
+            required, agents will be asked to provide it.
+          </listitem>
+          <listitem>
+            <literal>0x2 (not-saved)</literal> - this secret should not be saved
+            but should be requested from the user each time it is required. This
+            flag should be used for One-Time-Pad secrets, PIN codes from
+            hardware tokens, or if the user simply does not want to save the
+            secret.
+          </listitem>
+          <listitem>
+            <literal>0x4 (not-required)</literal> - in some situations it cannot
+            be automatically determined that a secret is required or not.  This
+            flag hints that the secret is not required and should not be
+            requested from the user.
+          </listitem>
+        </itemizedlist>
+      </para>
+    </section>
+  </chapter>
+
+  <xi:include href="migrating-to-09.xml" />
+
+  <index>
+    <title>Index</title>
+  </index>
+
+  <!-- License -->
+
+  <appendix id="license">
+    <title>License</title>
+    <para>
+<programlisting><xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../../COPYING" parse="text"><xi:fallback>FIXME: MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
+    </para>
+  </appendix>
+</book>
+
diff --git a/docs/api/settings-spec.xml b/docs/api/settings-spec.xml
new file mode 100644
index 000000000..6be79b151
--- /dev/null
+++ b/docs/api/settings-spec.xml
@@ -0,0 +1,1202 @@
+<?xml version="1.0"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'">]><section>
+  <title>Configuration Settings</title>
+  <para>
+<table>
+  <title>802-1x setting</title>
+  <tgroup cols="4">
+    <thead>
+      <row>
+        <entry>Key Name</entry>
+        <entry>Value Type</entry>
+        <entry>Default Value</entry>
+        <entry>Value Description</entry>
+      </row>
+    </thead>
+    <tbody>
+      <row>
+        <entry><screen>name</screen></entry>
+        <entry><screen>string</screen></entry>
+        <entry><screen>802-1x</screen></entry>
+        <entry>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.</entry>
+      </row>
+      <row>
+        <entry><screen>eap</screen></entry>
+        <entry><screen>array of string</screen></entry>
+        <entry><screen>[]</screen></entry>
+        <entry>The allowed EAP method to be used when authenticating to the network with 802.1x. Valid methods are: 'leap', 'md5', 'tls', 'peap', 'ttls', and 'fast'. Each method requires different configuration using the properties of this setting; refer to wpa_supplicant documentation for the allowed combinations.</entry>
+      </row>
+      <row>
+        <entry><screen>identity</screen></entry>
+        <entry><screen>string</screen></entry>
+        <entry><screen></screen></entry>
+        <entry>Identity string for EAP authentication methods.  Often the user's user or login name.</entry>
+      </row>
+      <row>
+        <entry><screen>anonymous-identity</screen></entry>
+        <entry><screen>string</screen></entry>
+        <entry><screen></screen></entry>
+        <entry>Anonymous identity string for EAP authentication methods.  Used as the unencrypted identity with EAP types that support different tunneled identity like EAP-TTLS.</entry>
+      </row>
+      <row>
+        <entry><screen>ca-cert</screen></entry>
+        <entry><screen>byte array</screen></entry>
+        <entry><screen>[]</screen></entry>
+        <entry>Contains the CA certificate if used by the EAP method specified in the 'eap' property.  Certificate data is specified using a 'scheme'; two are currently supported: blob and path.  When using the blob scheme (which is backwards compatible with NM 0.7.x) this property should be set to the certificate's DER encoded data.  When using the path scheme, this property should be set to the full UTF-8 encoded path of the certificate, prefixed with the string 'file://' and ending with a terminating NULL byte.  This property can be unset even if the EAP method supports CA certificates, but this allows man-in-the-middle attacks and is NOT recommended.</entry>
+      </row>
+      <row>
+        <entry><screen>ca-path</screen></entry>
+        <entry><screen>string</screen></entry>
+        <entry><screen></screen></entry>
+        <entry>UTF-8 encoded path to a directory containing PEM or DER formatted certificates to be added to the verification chain in addition to the certificate specified in the 'ca-cert' property.</entry>
+      </row>
+      <row>
+        <entry><screen>client-cert</screen></entry>
+        <entry><screen>byte array</screen></entry>
+        <entry><screen>[]</screen></entry>
+        <entry>Contains the client certificate if used by the EAP method specified in the 'eap' property.  Certificate data is specified using a 'scheme'; two are currently supported: blob and path.  When using the blob scheme (which is backwards compatible with NM 0.7.x) this property should be set to the certificate's DER encoded data.  When using the path scheme, this property should be set to the full UTF-8 encoded path of the certificate, prefixed with the string 'file://' and ending with a terminating NULL byte.</entry>
+      </row>
+      <row>
+        <entry><screen>phase1-peapver</screen></entry>
+        <entry><screen>string</screen></entry>
+        <entry><screen></screen></entry>
+        <entry>Forces which PEAP version is used when PEAP is set as the EAP method in 'eap' property.  When unset, the version reported by the server will be used.  Sometimes when using older RADIUS servers, it is necessary to force the client to use a particular PEAP version.  To do so, this property may be set to '0' or '1' to force that specific PEAP version.</entry>
+      </row>
+      <row>
+        <entry><screen>phase1-peaplabel</screen></entry>
+        <entry><screen>string</screen></entry>
+        <entry><screen></screen></entry>
+        <entry>Forces use of the new PEAP label during key derivation.  Some RADIUS servers may require forcing the new PEAP label to interoperate with PEAPv1.  Set to '1' to force use of the new PEAP label.  See the wpa_supplicant documentation for more details.</entry>
+      </row>
+      <row>
+        <entry><screen>phase1-fast-provisioning</screen></entry>
+        <entry><screen>string</screen></entry>
+        <entry><screen></screen></entry>
+        <entry>Enables or disables in-line provisioning of EAP-FAST credentials when FAST is specified as the EAP method in the #NMSetting8021x:eap property. Allowed values are '0' (disabled), '1' (allow unauthenticated provisioning), '2' (allow authenticated provisioning), and '3' (allow both authenticated and unauthenticated provisioning).  See the wpa_supplicant documentation for more details.</entry>
+      </row>
+      <row>
+        <entry><screen>phase2-auth</screen></entry>
+        <entry><screen>string</screen></entry>
+        <entry><screen></screen></entry>
+        <entry>Specifies the allowed 'phase 2' inner non-EAP authentication methods when an EAP method that uses an inner TLS tunnel is specified in the 'eap' property. Recognized non-EAP phase2 methods are 'pap', 'chap', 'mschap', 'mschapv2', 'gtc', 'otp', 'md5', and 'tls'.  Each 'phase 2' inner method requires specific parameters for successful authentication; see the wpa_supplicant documentation for more details.</entry>
+      </row>
+      <row>
+        <entry><screen>phase2-autheap</screen></entry>
+        <entry><screen>string</screen></entry>
+        <entry><screen></screen></entry>
+        <entry>Specifies the allowed 'phase 2' inner EAP-based authentication methods when an EAP method that uses an inner TLS tunnel is specified in the 'eap' property. Recognized EAP-based 'phase 2' methods are 'md5', 'mschapv2', 'otp', 'gtc', and 'tls'. Each 'phase 2' inner method requires specific parameters for successful authentication; see the wpa_supplicant documentation for more details.</entry>
+      </row>
+      <row>
+        <entry><screen>phase2-ca-cert</screen></entry>
+        <entry><screen>byte array</screen></entry>
+        <entry><screen>[]</screen></entry>
+        <entry>Contains the 'phase 2' CA certificate if used by the EAP method specified in the 'phase2-auth' or 'phase2-autheap' properties.  Certificate data is specified using a 'scheme'; two are currentlysupported: blob and path. When using the blob scheme (which is backwards compatible with NM 0.7.x) this property should be set to the certificate's DER encoded data. When using the path scheme, this property should be set to the full UTF-8 encoded path of the certificate, prefixed with the string 'file://' and ending with a terminating NULL byte.  This property can be unset even if the EAP method supports CA certificates, but this allows man-in-the-middle attacks and is NOT recommended.</entry>
+      </row>
+      <row>
+        <entry><screen>phase2-ca-path</screen></entry>
+        <entry><screen>string</screen></entry>
+        <entry><screen></screen></entry>
+        <entry>UTF-8 encoded path to a directory containing PEM or DER formatted certificates to be added to the verification chain in addition to the certificate specified in the 'phase2-ca-cert' property.</entry>
+      </row>
+      <row>
+        <entry><screen>phase2-client-cert</screen></entry>
+        <entry><screen>byte array</screen></entry>
+        <entry><screen>[]</screen></entry>
+        <entry>Contains the 'phase 2' client certificate if used by the EAP method specified in the 'phase2-eap' or 'phase2-autheap' properties. Certificate data is specified using a 'scheme'; two are currently supported: blob and path.  When using the blob scheme (which is backwards compatible with NM 0.7.x) this property should be set to the certificate's DER encoded data.  When using the path scheme, this property should be set to the full UTF-8 encoded path of the certificate, prefixed with the string 'file://' and ending with a terminating NULL byte.</entry>
+      </row>
+      <row>
+        <entry><screen>password</screen></entry>
+        <entry><screen>string</screen></entry>
+        <entry><screen></screen></entry>
+        <entry>Password used for EAP authentication methods.</entry>
+      </row>
+      <row>
+        <entry><screen>password-flags</screen></entry>
+        <entry><screen>uint32</screen></entry>
+        <entry><screen>0</screen></entry>
+        <entry>Flags indicating how to handle the 802.1x password. (see <xref linkend="secrets-flags"/> for flag values)</entry>
+      </row>
+      <row>
+        <entry><screen>private-key</screen></entry>
+        <entry><screen>byte array</screen></entry>
+        <entry><screen>[]</screen></entry>
+        <entry>Contains the private key when the 'eap' property is set to 'tls'.  Key data is specified using a 'scheme'; two are currently supported: blob and path. When using the blob scheme and private keys, this property should be set to the key's encrypted PEM encoded data. When using private keys with the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string 'file://' and ending with a terminating NULL byte.  When using PKCS#12 format private keys and the blob scheme, this property should be set to the PKCS#12 data and the 'private-key-password' property must be set to password used to decrypt the PKCS#12 certificate and key.  When using PKCS#12 files and the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string 'file://' and and ending with a terminating NULL byte, and as with the blob scheme the 'private-key-password' property must be set to the password used to decode the PKCS#12 private key and certificate.</entry>
+      </row>
+      <row>
+        <entry><screen>private-key-password</screen></entry>
+        <entry><screen>string</screen></entry>
+        <entry><screen></screen></entry>
+        <entry>The password used to decrypt the private key specified in the 'private-key' property when the private key either uses the path scheme, or if the private key is a PKCS#12 format key.</entry>
+      </row>
+      <row>
+        <entry><screen>private-key-password-flags</screen></entry>
+        <entry><screen>uint32</screen></entry>
+        <entry><screen>0</screen></entry>
+        <entry>Flags indicating how to handle the 802.1x private key password. (see <xref linkend="secrets-flags"/> for flag values)</entry>
+      </row>
+      <row>
+        <entry><screen>phase2-private-key</screen></entry>
+        <entry><screen>byte array</screen></entry>
+        <entry><screen>[]</screen></entry>
+        <entry>Contains the 'phase 2' inner private key when the 'phase2-eap' or 'phase2-autheap' property is set to 'tls'.  Key data is specified using a 'scheme'; two are currently supported: blob and path. When using the blob scheme and private keys, this property should be set to the key's encrypted PEM encoded data. When using private keys with the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string 'file://' and ending with a terminating NULL byte.  When using PKCS#12 format private keys and the blob scheme, this property should be set to the PKCS#12 data and the 'phase2-private-key-password' property must be set to password used to decrypt the PKCS#12 certificate and key.  When using PKCS#12 files and the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string 'file://' and and ending with a terminating NULL byte, and as with the blob scheme the 'phase2-private-key-password' property must be set to the password used to decode the PKCS#12 private key and certificate.</entry>
+      </row>
+      <row>
+        <entry><screen>phase2-private-key-password</screen></entry>
+        <entry><screen>string</screen></entry>
+        <entry><screen></screen></entry>
+        <entry>The password used to decrypt the 'phase 2' private key specified in the 'private-key' property when the phase2 private key either uses the path scheme, or if the phase2 private key is a PKCS#12 format key.</entry>
+      </row>
+      <row>
+        <entry><screen>phase2-private-key-password-flags</screen></entry>
+        <entry><screen>uint32</screen></entry>
+        <entry><screen>0</screen></entry>
+        <entry>Flags indicating how to handle the 802.1x phase2 private key password. (see <xref linkend="secrets-flags"/> for flag values)</entry>
+      </row>
+      <row>
+        <entry><screen>system-ca-certs</screen></entry>
+        <entry><screen>boolean</screen></entry>
+        <entry><screen>FALSE</screen></entry>
+        <entry>When TRUE, overrides 'ca-path' and 'phase2-ca-path' properties using the system CA directory specified at configure time with the --system-ca-path switch.  The certificates in this directory are added to the verification chain in addition to any certificates specified by the 'ca-cert' and 'phase2-ca-cert' properties.</entry>
+      </row>
+    </tbody>
+  </tgroup>
+</table>
+<table>
+  <title>bluetooth setting</title>
+  <tgroup cols="4">
+    <thead>
+      <row>
+        <entry>Key Name</entry>
+        <entry>Value Type</entry>
+        <entry>Default Value</entry>
+        <entry>Value Description</entry>
+      </row>
+    </thead>
+    <tbody>
+      <row>
+        <entry><screen>name</screen></entry>
+        <entry><screen>string</screen></entry>
+        <entry><screen>bluetooth</screen></entry>
+        <entry>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.</entry>
+      </row>
+      <row>
+        <entry><screen>bdaddr</screen></entry>
+        <entry><screen>byte array</screen></entry>
+        <entry><screen>[]</screen></entry>
+        <entry>The Bluetooth address of the device</entry>
+      </row>
+      <row>
+        <entry><screen>type</screen></entry>
+        <entry><screen>string</screen></entry>
+        <entry><screen></screen></entry>
+        <entry>Either 'dun' for Dial-Up Networking connections or 'panu' for Personal Area Networking connections.</entry>
+      </row>
+    </tbody>
+  </tgroup>
+</table>
+<table>
+  <title>cdma setting</title>
+  <tgroup cols="4">
+    <thead>
+      <row>
+        <entry>Key Name</entry>
+        <entry>Value Type</entry>
+        <entry>Default Value</entry>
+        <entry>Value Description</entry>
+      </row>
+    </thead>
+    <tbody>
+      <row>
+        <entry><screen>name</screen></entry>
+        <entry><screen>string</screen></entry>
+        <entry><screen>cdma</screen></entry>
+        <entry>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.</entry>
+      </row>
+      <row>
+        <entry><screen>number</screen></entry>
+        <entry><screen>string</screen></entry>
+        <entry><screen></screen></entry>
+        <entry>Number to dial when establishing a PPP data session with the CDMA-based mobile broadband network.  If not specified, the default number (#777) is used when required.</entry>
+      </row>
+      <row>
+        <entry><screen>username</screen></entry>
+        <entry><screen>string</screen></entry>
+        <entry><screen></screen></entry>
+        <entry>Username used to authenticate with the network, if required.  Note that many providers do not require a username or accept any username.</entry>
+      </row>
+      <row>
+        <entry><screen>password</screen></entry>
+        <entry><screen>string</screen></entry>
+        <entry><screen></screen></entry>
+        <entry>Password used to authenticate with the network, if required.  Note that many providers do not require a password or accept any password.</entry>
+      </row>
+      <row>
+        <entry><screen>password-flags</screen></entry>
+        <entry><screen>uint32</screen></entry>
+        <entry><screen>0</screen></entry>
+        <entry>Flags indicating how to handle the CDMA password. (see <xref linkend="secrets-flags"/> for flag values)</entry>
+      </row>
+    </tbody>
+  </tgroup>
+</table>
+<table>
+  <title>connection setting</title>
+  <tgroup cols="4">
+    <thead>
+      <row>
+        <entry>Key Name</entry>
+        <entry>Value Type</entry>
+        <entry>Default Value</entry>
+        <entry>Value Description</entry>
+      </row>
+    </thead>
+    <tbody>
+      <row>
+        <entry><screen>name</screen></entry>
+        <entry><screen>string</screen></entry>
+        <entry><screen>connection</screen></entry>
+        <entry>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.</entry>
+      </row>
+      <row>
+        <entry><screen>id</screen></entry>
+        <entry><screen>string</screen></entry>
+        <entry><screen></screen></entry>
+        <entry>User-readable connection identifier/name.  Must be one or more characters and may change over the lifetime of the connection if the user decides to rename it.</entry>
+      </row>
+      <row>
+        <entry><screen>uuid</screen></entry>
+        <entry><screen>string</screen></entry>
+        <entry><screen></screen></entry>
+        <entry>Universally unique connection identifier.  Must be in the format '2815492f-7e56-435e-b2e9-246bd7cdc664' (ie, contains only hexadecimal characters and '-'). The UUID should be assigned when the connection is created and never changed as long as the connection still applies to the same network.  For example, it should not be changed when the user changes the connection's 'id', but should be recreated when the WiFi SSID, mobile broadband network provider, or the connection type changes.</entry>
+      </row>
+      <row>
+        <entry><screen>type</screen></entry>
+        <entry><screen>string</screen></entry>
+        <entry><screen></screen></entry>
+        <entry>Base type of the connection.  For hardware-dependent connections, should contain the setting name of the hardware-type specific setting (ie, '802-3-ethernet' or '802-11-wireless' or 'bluetooth', etc), and for non-hardware dependent connections like VPN or otherwise, should contain the setting name of that setting type (ie, 'vpn' or 'bridge', etc).</entry>
+      </row>
+      <row>
+        <entry><screen>permissions</screen></entry>
+        <entry><screen>array of string</screen></entry>
+        <entry><screen>[]</screen></entry>
+        <entry>An array of strings defining what access a given user has to this connection.  If this is NULL or empty, all users are allowed to access this connection.  Otherwise a user is allowed to access this connection if and only if they are in this array. Each entry is of the form "[type]:[id]:[reserved]", for example: "user:dcbw:blah"  At this time only the 'user' [type] is allowed.  Any other values are ignored and reserved for future use.  [id] is the username that this permission refers to, which may not contain the ':' character.  Any [reserved] information (if present) must be ignored and is reserved for future use.  All of [type], [id], and [reserved] must be valid UTF-8.</entry>
+      </row>
+      <row>
+        <entry><screen>autoconnect</screen></entry>
+        <entry><screen>boolean</screen></entry>
+        <entry><screen>TRUE</screen></entry>
+        <entry>If TRUE, NetworkManager will activate this connection when its network resources are available.  If FALSE, the connection must be manually activated by the user or some other mechanism.</entry>
+      </row>
+      <row>
+        <entry><screen>timestamp</screen></entry>
+        <entry><screen>uint64</screen></entry>
+        <entry><screen>0</screen></entry>
+        <entry>Timestamp (in seconds since the Unix Epoch) that the connection was last successfully activated.  Settings services should update the connection timestamp periodically when the connection is active to ensure that an active connection has the latest timestamp.</entry>
+      </row>
+      <row>
+        <entry><screen>read-only</screen></entry>
+        <entry><screen>boolean</screen></entry>
+        <entry><screen>FALSE</screen></entry>
+        <entry>If TRUE, the connection is read-only and cannot be changed by the user or any other mechanism.  This is normally set for system connections whose plugin cannot yet write updated connections back out.</entry>
+      </row>
+    </tbody>
+  </tgroup>
+</table>
+<table>
+  <title>gsm setting</title>
+  <tgroup cols="4">
+    <thead>
+      <row>
+        <entry>Key Name</entry>
+        <entry>Value Type</entry>
+        <entry>Default Value</entry>
+        <entry>Value Description</entry>
+      </row>
+    </thead>
+    <tbody>
+      <row>
+        <entry><screen>name</screen></entry>
+        <entry><screen>string</screen></entry>
+        <entry><screen>gsm</screen></entry>
+        <entry>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.</entry>
+      </row>
+      <row>
+        <entry><screen>number</screen></entry>
+        <entry><screen>string</screen></entry>
+        <entry><screen></screen></entry>
+        <entry>Number to dial when establishing a PPP data session with the GSM-based mobile broadband network.  In most cases, leave the number blank and a number selecting the APN specified in the 'apn' property will be used automatically when required.</entry>
+      </row>
+      <row>
+        <entry><screen>username</screen></entry>
+        <entry><screen>string</screen></entry>
+        <entry><screen></screen></entry>
+        <entry>Username used to authenticate with the network, if required.  Note that many providers do not require a username or accept any username.</entry>
+      </row>
+      <row>
+        <entry><screen>password</screen></entry>
+        <entry><screen>string</screen></entry>
+        <entry><screen></screen></entry>
+        <entry>Password used to authenticate with the network, if required.  Note that many providers do not require a password or accept any password.</entry>
+      </row>
+      <row>
+        <entry><screen>password-flags</screen></entry>
+        <entry><screen>uint32</screen></entry>
+        <entry><screen>0</screen></entry>
+        <entry>Flags indicating how to handle the GSM password. (see <xref linkend="secrets-flags"/> for flag values)</entry>
+      </row>
+      <row>
+        <entry><screen>apn</screen></entry>
+        <entry><screen>string</screen></entry>
+        <entry><screen></screen></entry>
+        <entry>The GPRS Access Point Name specifying the APN used when establishing a data session with the GSM-based network.  The APN often determines how the user will be billed for their network usage and whether the user has access to the Internet or just a provider-specific walled-garden, so it is important to use the correct APN for the user's mobile broadband plan.  The APN may only be composed of the characters a-z, 0-9, ., and - per GSM 03.60 Section 14.9.</entry>
+      </row>
+      <row>
+        <entry><screen>network-id</screen></entry>
+        <entry><screen>string</screen></entry>
+        <entry><screen></screen></entry>
+        <entry>The Network ID (GSM LAI format, ie MCC-MNC) to force specific network registration.  If the Network ID is specified, NetworkManager will attempt to force the device to register only on the specified network.  This can be used to ensure that the device does not roam when direct roaming control of the device is not otherwise possible.</entry>
+      </row>
+      <row>
+        <entry><screen>network-type</screen></entry>
+        <entry><screen>int32</screen></entry>
+        <entry><screen>-1</screen></entry>
+        <entry>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.</entry>
+      </row>
+      <row>
+        <entry><screen>pin</screen></entry>
+        <entry><screen>string</screen></entry>
+        <entry><screen></screen></entry>
+        <entry>If the SIM is locked with a PIN it must be unlocked before any other operations are requested.  Specify the PIN here to allow operation of the device.</entry>
+      </row>
+      <row>
+        <entry><screen>pin-flags</screen></entry>
+        <entry><screen>uint32</screen></entry>
+        <entry><screen>0</screen></entry>
+        <entry>Flags indicating how to handle the GSM SIM PIN. (see <xref linkend="secrets-flags"/> for flag values)</entry>
+      </row>
+      <row>
+        <entry><screen>allowed-bands</screen></entry>
+        <entry><screen>uint32</screen></entry>
+        <entry><screen>1</screen></entry>
+        <entry>Bitfield of allowed frequency bands.  Note that not all devices allow frequency band control.</entry>
+      </row>
+      <row>
+        <entry><screen>home-only</screen></entry>
+        <entry><screen>boolean</screen></entry>
+        <entry><screen>FALSE</screen></entry>
+        <entry>When TRUE, only connections to the home network will be allowed.  Connections to roaming networks will not be made.</entry>
+      </row>
+    </tbody>
+  </tgroup>
+</table>
+<table>
+  <title>ipv4 setting</title>
+  <tgroup cols="4">
+    <thead>
+      <row>
+        <entry>Key Name</entry>
+        <entry>Value Type</entry>
+        <entry>Default Value</entry>
+        <entry>Value Description</entry>
+      </row>
+    </thead>
+    <tbody>
+      <row>
+        <entry><screen>name</screen></entry>
+        <entry><screen>string</screen></entry>
+        <entry><screen>ipv4</screen></entry>
+        <entry>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.</entry>
+      </row>
+      <row>
+        <entry><screen>method</screen></entry>
+        <entry><screen>string</screen></entry>
+        <entry><screen></screen></entry>
+        <entry>IPv4 configuration method.  If 'auto' is specified then the appropriate automatic method (DHCP, PPP, etc) is used for the interface and most other properties can be left unset.  If 'link-local' is specified, then a link-local address in the 169.254/16 range will be assigned to the interface.  If 'manual' is specified, static IP addressing is used and at least one IP address must be given in the 'addresses' property.  If 'shared' is specified (indicating that this connection will provide network access to other computers) then the interface is assigned an address in the 10.42.x.1/24 range and a DHCP and forwarding DNS server are started, and the interface is NAT-ed to the current default network connection.  'disabled' means IPv4 will not be used on this connection.  This property must be set.</entry>
+      </row>
+      <row>
+        <entry><screen>dns</screen></entry>
+        <entry><screen>array of uint32</screen></entry>
+        <entry><screen>[]</screen></entry>
+        <entry>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.</entry>
+      </row>
+      <row>
+        <entry><screen>dns-search</screen></entry>
+        <entry><screen>array of string</screen></entry>
+        <entry><screen>[]</screen></entry>
+        <entry>List of DNS search domains.  For the 'auto' method, these search domains are appended to those returned by automatic configuration. Search domains cannot be used with the 'shared', 'link-local', or 'disabled' methods as there is no upstream network.  In all other methods, these search domains are used as the only search domains for this connection.</entry>
+      </row>
+      <row>
+        <entry><screen>addresses</screen></entry>
+        <entry><screen>array of array of uint32</screen></entry>
+        <entry><screen>[]</screen></entry>
+        <entry>Array of IPv4 address structures.  Each IPv4 address structure is composed of 3 32-bit values; the first being the IPv4 address (network byte order), the second the prefix (1 - 32), and last the IPv4 gateway (network byte order). The gateway may be left as 0 if no gateway exists for that subnet.  For the 'auto' method, given IP addresses are appended to those returned by automatic configuration.  Addresses cannot be used with the 'shared', 'link-local', or 'disabled' methods as addressing is either automatic or disabled with these methods.</entry>
+      </row>
+      <row>
+        <entry><screen>routes</screen></entry>
+        <entry><screen>array of array of uint32</screen></entry>
+        <entry><screen>[]</screen></entry>
+        <entry>Array of IPv4 route structures.  Each IPv4 route structure is composed of 4 32-bit values; the first being the destination IPv4 network or address (network byte order), the second the destination network or address prefix (1 - 32), the third being the next-hop (network byte order) if any, and the fourth being the route metric. For the 'auto' method, given IP routes are appended to those returned by automatic configuration.  Routes cannot be used with the 'shared', 'link-local', or 'disabled', methods as there is no upstream network.</entry>
+      </row>
+      <row>
+        <entry><screen>ignore-auto-routes</screen></entry>
+        <entry><screen>boolean</screen></entry>
+        <entry><screen>FALSE</screen></entry>
+        <entry>When the method is set to 'auto' and this property to TRUE, automatically configured routes are ignored and only routes specified in the 'routes' property, if any, are used.</entry>
+      </row>
+      <row>
+        <entry><screen>ignore-auto-dns</screen></entry>
+        <entry><screen>boolean</screen></entry>
+        <entry><screen>FALSE</screen></entry>
+        <entry>When the method is set to 'auto' and this property to TRUE, automatically configured nameservers and search domains are ignored and only nameservers and search domains specified in the 'dns' and 'dns-search' properties, if any, are used.</entry>
+      </row>
+      <row>
+        <entry><screen>dhcp-client-id</screen></entry>
+        <entry><screen>string</screen></entry>
+        <entry><screen></screen></entry>
+        <entry>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.</entry>
+      </row>
+      <row>
+        <entry><screen>dhcp-send-hostname</screen></entry>
+        <entry><screen>boolean</screen></entry>
+        <entry><screen>TRUE</screen></entry>
+        <entry>If TRUE, a hostname is sent to the DHCP server when acquiring a lease.  Some DHCP servers use this hostname to update DNS databases, essentially providing a static hostname for the computer.  If the 'dhcp-hostname' property is empty and this property is TRUE, the current persistent hostname of the computer is sent.</entry>
+      </row>
+      <row>
+        <entry><screen>dhcp-hostname</screen></entry>
+        <entry><screen>string</screen></entry>
+        <entry><screen></screen></entry>
+        <entry>If the 'dhcp-send-hostname' property is TRUE, then the specified name will be sent to the DHCP server when acquiring a lease.</entry>
+      </row>
+      <row>
+        <entry><screen>never-default</screen></entry>
+        <entry><screen>boolean</screen></entry>
+        <entry><screen>FALSE</screen></entry>
+        <entry>If TRUE, this connection will never be the default IPv4 connection, meaning it will never be assigned the default route by NetworkManager.</entry>
+      </row>
+      <row>
+        <entry><screen>may-fail</screen></entry>
+        <entry><screen>boolean</screen></entry>
+        <entry><screen>FALSE</screen></entry>
+        <entry>If TRUE, allow overall network configuration to proceed even if IPv4 configuration times out. Note that at least one IP configuration must succeed or overall network configuration will still fail.  For example, in IPv6-only networks, setting this property to TRUE allows the overall network configuration to succeed if IPv4 configuration fails but IPv6 configuration completes successfully.</entry>
+      </row>
+    </tbody>
+  </tgroup>
+</table>
+<table>
+  <title>ipv6 setting</title>
+  <tgroup cols="4">
+    <thead>
+      <row>
+        <entry>Key Name</entry>
+        <entry>Value Type</entry>
+        <entry>Default Value</entry>
+        <entry>Value Description</entry>
+      </row>
+    </thead>
+    <tbody>
+      <row>
+        <entry><screen>name</screen></entry>
+        <entry><screen>string</screen></entry>
+        <entry><screen>ipv6</screen></entry>
+        <entry>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.</entry>
+      </row>
+      <row>
+        <entry><screen>method</screen></entry>
+        <entry><screen>string</screen></entry>
+        <entry><screen></screen></entry>
+        <entry>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.</entry>
+      </row>
+      <row>
+        <entry><screen>dns</screen></entry>
+        <entry><screen>array of byte array</screen></entry>
+        <entry><screen>[]</screen></entry>
+        <entry>Array of DNS servers, where each member of the array is a byte array containing the IPv6 address of the DNS server (in network byte order). For the 'auto' method, these DNS servers are appended to those (if any) returned by automatic configuration.  DNS servers cannot be used with the 'shared' or 'link-local' methods as there is no usptream network.  In all other methods, these DNS servers are used as the only DNS servers for this connection.</entry>
+      </row>
+      <row>
+        <entry><screen>dns-search</screen></entry>
+        <entry><screen>array of string</screen></entry>
+        <entry><screen>[]</screen></entry>
+        <entry>List of DNS search domains.  For the 'auto' method, these search domains are appended to those returned by automatic configuration. Search domains cannot be used with the 'shared' or 'link-local' methods as there is no upstream network.  In all other methods, these search domains are used as the only search domains for this connection.</entry>
+      </row>
+      <row>
+        <entry><screen>addresses</screen></entry>
+        <entry><screen>array of (byte array, uint32, byte array)</screen></entry>
+        <entry><screen>[]</screen></entry>
+        <entry>Array of IPv6 address structures.  Each IPv6 address structure is composed of 3 members, the first being a byte array containing the IPv6 address (network byte order), the second a 32-bit integer containing the IPv6 address prefix, and the third a byte array containing the IPv6 address (network byte order) of the gateway associated with this address, if any. If no gateway is given, the third element should be given as all zeros.  For the 'auto' method, given IP addresses are appended to those returned by automatic configuration.  Addresses cannot be used with the 'shared' or 'link-local' methods as the interface is automatically assigned an address with these methods.</entry>
+      </row>
+      <row>
+        <entry><screen>routes</screen></entry>
+        <entry><screen>array of (byte array, uint32, byte array, uint32)</screen></entry>
+        <entry><screen>[]</screen></entry>
+        <entry>Array of IPv6 route structures.  Each IPv6 route structure is composed of 4 members; the first being the destination IPv6 network or address (network byte order) as a byte array, the second the destination network or address IPv6 prefix, the third being the next-hop IPv6 address (network byte order) if any, and the fourth being the route metric. For the 'auto' method, given IP routes are appended to those returned by automatic configuration.  Routes cannot be used with the 'shared' or 'link-local' methods because there is no upstream network.</entry>
+      </row>
+      <row>
+        <entry><screen>ignore-auto-routes</screen></entry>
+        <entry><screen>boolean</screen></entry>
+        <entry><screen>FALSE</screen></entry>
+        <entry>When the method is set to 'auto' or 'dhcp' and this property is set to TRUE, automatically configured routes are ignored and only routes specified in the 'routes' property, if any, are used.</entry>
+      </row>
+      <row>
+        <entry><screen>ignore-auto-dns</screen></entry>
+        <entry><screen>boolean</screen></entry>
+        <entry><screen>FALSE</screen></entry>
+        <entry>When the method is set to 'auto' or 'dhcp' and this property is set to TRUE, automatically configured nameservers and search domains are ignored and only nameservers and search domains specified in the 'dns' and 'dns-search' properties, if any, are used.</entry>
+      </row>
+      <row>
+        <entry><screen>never-default</screen></entry>
+        <entry><screen>boolean</screen></entry>
+        <entry><screen>FALSE</screen></entry>
+        <entry>If TRUE, this connection will never be the default IPv6 connection, meaning it will never be assigned the default IPv6 route by NetworkManager.</entry>
+      </row>
+      <row>
+        <entry><screen>may-fail</screen></entry>
+        <entry><screen>boolean</screen></entry>
+        <entry><screen>FALSE</screen></entry>
+        <entry>If TRUE, allow overall network configuration to proceed even if IPv6 configuration times out. Note that at least one IP configuration must succeed or overall network configuration will still fail.  For example, in IPv4-only networks, setting this property to TRUE allows the overall network configuration to succeed if IPv6 configuration fails but IPv4 configuration completes successfully.</entry>
+      </row>
+    </tbody>
+  </tgroup>
+</table>
+<table>
+  <title>802-11-olpc-mesh setting</title>
+  <tgroup cols="4">
+    <thead>
+      <row>
+        <entry>Key Name</entry>
+        <entry>Value Type</entry>
+        <entry>Default Value</entry>
+        <entry>Value Description</entry>
+      </row>
+    </thead>
+    <tbody>
+      <row>
+        <entry><screen>name</screen></entry>
+        <entry><screen>string</screen></entry>
+        <entry><screen>802-11-olpc-mesh</screen></entry>
+        <entry>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.</entry>
+      </row>
+      <row>
+        <entry><screen>ssid</screen></entry>
+        <entry><screen>byte array</screen></entry>
+        <entry><screen>[]</screen></entry>
+        <entry>SSID of the mesh network to join.</entry>
+      </row>
+      <row>
+        <entry><screen>channel</screen></entry>
+        <entry><screen>uint32</screen></entry>
+        <entry><screen>0</screen></entry>
+        <entry>Channel on which the mesh network to join is located.</entry>
+      </row>
+      <row>
+        <entry><screen>dhcp-anycast-address</screen></entry>
+        <entry><screen>byte array</screen></entry>
+        <entry><screen>[]</screen></entry>
+        <entry>Anycast DHCP MAC address used when requesting an IP address via DHCP.  The specific anycast address used determines which DHCP server class answers the the request.</entry>
+      </row>
+    </tbody>
+  </tgroup>
+</table>
+<table>
+  <title>ppp setting</title>
+  <tgroup cols="4">
+    <thead>
+      <row>
+        <entry>Key Name</entry>
+        <entry>Value Type</entry>
+        <entry>Default Value</entry>
+        <entry>Value Description</entry>
+      </row>
+    </thead>
+    <tbody>
+      <row>
+        <entry><screen>name</screen></entry>
+        <entry><screen>string</screen></entry>
+        <entry><screen>ppp</screen></entry>
+        <entry>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.</entry>
+      </row>
+      <row>
+        <entry><screen>noauth</screen></entry>
+        <entry><screen>boolean</screen></entry>
+        <entry><screen>TRUE</screen></entry>
+        <entry>If TRUE, do not require the other side (usually the PPP server) to authenticate itself to the client.  If FALSE, require authentication from the remote side.  In almost all cases, this should be TRUE.</entry>
+      </row>
+      <row>
+        <entry><screen>refuse-eap</screen></entry>
+        <entry><screen>boolean</screen></entry>
+        <entry><screen>FALSE</screen></entry>
+        <entry>If TRUE, the EAP authentication method will not be used.</entry>
+      </row>
+      <row>
+        <entry><screen>refuse-pap</screen></entry>
+        <entry><screen>boolean</screen></entry>
+        <entry><screen>FALSE</screen></entry>
+        <entry>If TRUE, the PAP authentication method will not be used.</entry>
+      </row>
+      <row>
+        <entry><screen>refuse-chap</screen></entry>
+        <entry><screen>boolean</screen></entry>
+        <entry><screen>FALSE</screen></entry>
+        <entry>If TRUE, the CHAP authentication method will not be used.</entry>
+      </row>
+      <row>
+        <entry><screen>refuse-mschap</screen></entry>
+        <entry><screen>boolean</screen></entry>
+        <entry><screen>FALSE</screen></entry>
+        <entry>If TRUE, the MSCHAP authentication method will not be used.</entry>
+      </row>
+      <row>
+        <entry><screen>refuse-mschapv2</screen></entry>
+        <entry><screen>boolean</screen></entry>
+        <entry><screen>FALSE</screen></entry>
+        <entry>If TRUE, the MSCHAPv2 authentication method will not be used.</entry>
+      </row>
+      <row>
+        <entry><screen>nobsdcomp</screen></entry>
+        <entry><screen>boolean</screen></entry>
+        <entry><screen>FALSE</screen></entry>
+        <entry>If TRUE, BSD compression will not be requested.</entry>
+      </row>
+      <row>
+        <entry><screen>nodeflate</screen></entry>
+        <entry><screen>boolean</screen></entry>
+        <entry><screen>FALSE</screen></entry>
+        <entry>If TRUE, 'deflate' compression will not be requested.</entry>
+      </row>
+      <row>
+        <entry><screen>no-vj-comp</screen></entry>
+        <entry><screen>boolean</screen></entry>
+        <entry><screen>FALSE</screen></entry>
+        <entry>If TRUE, Van Jacobsen TCP header compression will not be requested.</entry>
+      </row>
+      <row>
+        <entry><screen>require-mppe</screen></entry>
+        <entry><screen>boolean</screen></entry>
+        <entry><screen>FALSE</screen></entry>
+        <entry>If TRUE, MPPE (Microsoft Point-to-Point Encrpytion) will be required for the PPP session.  If either 64-bit or 128-bit MPPE is not available the session will fail.  Note that MPPE is not used on mobile broadband connections.</entry>
+      </row>
+      <row>
+        <entry><screen>require-mppe-128</screen></entry>
+        <entry><screen>boolean</screen></entry>
+        <entry><screen>FALSE</screen></entry>
+        <entry>If TRUE, 128-bit MPPE (Microsoft Point-to-Point Encrpytion) will be required for the PPP session, and the 'require-mppe' property must also be set to TRUE.  If 128-bit MPPE is not available the session will fail.</entry>
+      </row>
+      <row>
+        <entry><screen>mppe-stateful</screen></entry>
+        <entry><screen>boolean</screen></entry>
+        <entry><screen>FALSE</screen></entry>
+        <entry>If TRUE, stateful MPPE is used.  See pppd documentation for more information on stateful MPPE.</entry>
+      </row>
+      <row>
+        <entry><screen>crtscts</screen></entry>
+        <entry><screen>boolean</screen></entry>
+        <entry><screen>FALSE</screen></entry>
+        <entry>If TRUE, specify that pppd should set the serial port to use hardware flow control with RTS and CTS signals.  This value should normally be set to FALSE.</entry>
+      </row>
+      <row>
+        <entry><screen>baud</screen></entry>
+        <entry><screen>uint32</screen></entry>
+        <entry><screen>0</screen></entry>
+        <entry>If non-zero, instruct pppd to set the serial port to the specified baudrate.  This value should normally be left as 0 to automatically choose the speed.</entry>
+      </row>
+      <row>
+        <entry><screen>mru</screen></entry>
+        <entry><screen>uint32</screen></entry>
+        <entry><screen>0</screen></entry>
+        <entry>If non-zero, instruct pppd to request that the peer send packets no larger than the specified size.  If non-zero, the MRU should be between 128 and 16384.</entry>
+      </row>
+      <row>
+        <entry><screen>mtu</screen></entry>
+        <entry><screen>uint32</screen></entry>
+        <entry><screen>0</screen></entry>
+        <entry>If non-zero, instruct pppd to send packets no larger than the specified size.</entry>
+      </row>
+      <row>
+        <entry><screen>lcp-echo-failure</screen></entry>
+        <entry><screen>uint32</screen></entry>
+        <entry><screen>0</screen></entry>
+        <entry>If non-zero, instruct pppd to presume the connection to the peer has failed if the specified number of LCP echo-requests go unanswered by the peer.  The 'lcp-echo-interval' property must also be set to a non-zero value if this property is used.</entry>
+      </row>
+      <row>
+        <entry><screen>lcp-echo-interval</screen></entry>
+        <entry><screen>uint32</screen></entry>
+        <entry><screen>0</screen></entry>
+        <entry>If non-zero, instruct pppd to send an LCP echo-request frame to the peer every n seconds (where n is the specified value).  Note that some PPP peers will respond to echo requests and some will not, and it is not possible to autodetect this.</entry>
+      </row>
+    </tbody>
+  </tgroup>
+</table>
+<table>
+  <title>pppoe setting</title>
+  <tgroup cols="4">
+    <thead>
+      <row>
+        <entry>Key Name</entry>
+        <entry>Value Type</entry>
+        <entry>Default Value</entry>
+        <entry>Value Description</entry>
+      </row>
+    </thead>
+    <tbody>
+      <row>
+        <entry><screen>name</screen></entry>
+        <entry><screen>string</screen></entry>
+        <entry><screen>pppoe</screen></entry>
+        <entry>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.</entry>
+      </row>
+      <row>
+        <entry><screen>service</screen></entry>
+        <entry><screen>string</screen></entry>
+        <entry><screen></screen></entry>
+        <entry>If specified, instruct PPPoE to only initiate sessions with access concentrators that provide the specified serivce.  For most providers, this should be left blank.  It is only required if there are multiple access concentrators or a specific service is known to be required.</entry>
+      </row>
+      <row>
+        <entry><screen>username</screen></entry>
+        <entry><screen>string</screen></entry>
+        <entry><screen></screen></entry>
+        <entry>Username used to authenticate with the PPPoE service.</entry>
+      </row>
+      <row>
+        <entry><screen>password</screen></entry>
+        <entry><screen>string</screen></entry>
+        <entry><screen></screen></entry>
+        <entry>Password used to authenticate with the PPPoE service.</entry>
+      </row>
+      <row>
+        <entry><screen>password-flags</screen></entry>
+        <entry><screen>uint32</screen></entry>
+        <entry><screen>0</screen></entry>
+        <entry>Flags indicating how to handle the PPPoE password. (see <xref linkend="secrets-flags"/> for flag values)</entry>
+      </row>
+    </tbody>
+  </tgroup>
+</table>
+<table>
+  <title>serial setting</title>
+  <tgroup cols="4">
+    <thead>
+      <row>
+        <entry>Key Name</entry>
+        <entry>Value Type</entry>
+        <entry>Default Value</entry>
+        <entry>Value Description</entry>
+      </row>
+    </thead>
+    <tbody>
+      <row>
+        <entry><screen>name</screen></entry>
+        <entry><screen>string</screen></entry>
+        <entry><screen>serial</screen></entry>
+        <entry>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.</entry>
+      </row>
+      <row>
+        <entry><screen>baud</screen></entry>
+        <entry><screen>uint32</screen></entry>
+        <entry><screen>57600</screen></entry>
+        <entry>Speed to use for communication over the serial port.  Note that this value usually has no effect for mobile broadband modems as they generally ignore speed settings and use the highest available speed.</entry>
+      </row>
+      <row>
+        <entry><screen>bits</screen></entry>
+        <entry><screen>uint32</screen></entry>
+        <entry><screen>8</screen></entry>
+        <entry>Byte-width of the serial communication.  The 8 in '8n1' for example.</entry>
+      </row>
+      <row>
+        <entry><screen>parity</screen></entry>
+        <entry><screen>gchar</screen></entry>
+        <entry><screen>110</screen></entry>
+        <entry>Parity setting of the serial port.  Either 'E' for even parity, 'o' for odd parity, or 'n' for no parity.</entry>
+      </row>
+      <row>
+        <entry><screen>stopbits</screen></entry>
+        <entry><screen>uint32</screen></entry>
+        <entry><screen>1</screen></entry>
+        <entry>Number of stop bits for communication on the serial port.  Either 1 or 2.  The 1 in '8n1' for example.</entry>
+      </row>
+      <row>
+        <entry><screen>send-delay</screen></entry>
+        <entry><screen>uint64</screen></entry>
+        <entry><screen>0</screen></entry>
+        <entry>Time to delay between each byte sent to the modem, in microseconds.</entry>
+      </row>
+    </tbody>
+  </tgroup>
+</table>
+<table>
+  <title>vpn setting</title>
+  <tgroup cols="4">
+    <thead>
+      <row>
+        <entry>Key Name</entry>
+        <entry>Value Type</entry>
+        <entry>Default Value</entry>
+        <entry>Value Description</entry>
+      </row>
+    </thead>
+    <tbody>
+      <row>
+        <entry><screen>name</screen></entry>
+        <entry><screen>string</screen></entry>
+        <entry><screen>vpn</screen></entry>
+        <entry>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.</entry>
+      </row>
+      <row>
+        <entry><screen>service-type</screen></entry>
+        <entry><screen>string</screen></entry>
+        <entry><screen></screen></entry>
+        <entry>D-Bus service name of the VPN plugin that this setting uses to connect to its network.  i.e. org.freedesktop.NetworkManager.vpnc for the vpnc plugin.</entry>
+      </row>
+      <row>
+        <entry><screen>user-name</screen></entry>
+        <entry><screen>string</screen></entry>
+        <entry><screen></screen></entry>
+        <entry>User name of the currently logged in user for connections provided by the user settings service.  This name is provided to the VPN plugin to use in lieu of a custom username provided by that VPN plugins specific configuration.  The VPN plugin itself decides which user name to use.</entry>
+      </row>
+      <row>
+        <entry><screen>data</screen></entry>
+        <entry><screen>dict of (string::string)</screen></entry>
+        <entry><screen>[ ]</screen></entry>
+        <entry>Dictionary of key/value pairs of VPN plugin specific data.  Both keys and values must be strings.</entry>
+      </row>
+      <row>
+        <entry><screen>secrets</screen></entry>
+        <entry><screen>dict of (string::string)</screen></entry>
+        <entry><screen>[ ]</screen></entry>
+        <entry>Dictionary of key/value pairs of VPN plugin specific secrets like passwords or private keys.  Both keys and values must be strings.</entry>
+      </row>
+    </tbody>
+  </tgroup>
+</table>
+<table>
+  <title>wimax setting</title>
+  <tgroup cols="4">
+    <thead>
+      <row>
+        <entry>Key Name</entry>
+        <entry>Value Type</entry>
+        <entry>Default Value</entry>
+        <entry>Value Description</entry>
+      </row>
+    </thead>
+    <tbody>
+      <row>
+        <entry><screen>name</screen></entry>
+        <entry><screen>string</screen></entry>
+        <entry><screen>wimax</screen></entry>
+        <entry>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.</entry>
+      </row>
+      <row>
+        <entry><screen>network-name</screen></entry>
+        <entry><screen>string</screen></entry>
+        <entry><screen></screen></entry>
+        <entry>Network Service Provider (NSP) name of the WiMAX network this connection should use.</entry>
+      </row>
+      <row>
+        <entry><screen>mac-address</screen></entry>
+        <entry><screen>byte array</screen></entry>
+        <entry><screen>[]</screen></entry>
+        <entry>If specified, this connection will only apply to the WiMAX device whose MAC address matches.  This property does not change the MAC address of the device (known as MAC spoofing).</entry>
+      </row>
+    </tbody>
+  </tgroup>
+</table>
+<table>
+  <title>802-3-ethernet setting</title>
+  <tgroup cols="4">
+    <thead>
+      <row>
+        <entry>Key Name</entry>
+        <entry>Value Type</entry>
+        <entry>Default Value</entry>
+        <entry>Value Description</entry>
+      </row>
+    </thead>
+    <tbody>
+      <row>
+        <entry><screen>name</screen></entry>
+        <entry><screen>string</screen></entry>
+        <entry><screen>802-3-ethernet</screen></entry>
+        <entry>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.</entry>
+      </row>
+      <row>
+        <entry><screen>port</screen></entry>
+        <entry><screen>string</screen></entry>
+        <entry><screen></screen></entry>
+        <entry>Specific port type to use if multiple the device supports multiple attachment methods.  One of 'tp' (Twisted Pair), 'aui' (Attachment Unit Interface), 'bnc' (Thin Ethernet) or 'mii' (Media Independent Interface.  If the device supports only one port type, this setting is ignored.</entry>
+      </row>
+      <row>
+        <entry><screen>speed</screen></entry>
+        <entry><screen>uint32</screen></entry>
+        <entry><screen>0</screen></entry>
+        <entry>If non-zero, request that the device use only the specified speed.  In Mbit/s, ie 100 == 100Mbit/s.</entry>
+      </row>
+      <row>
+        <entry><screen>duplex</screen></entry>
+        <entry><screen>string</screen></entry>
+        <entry><screen></screen></entry>
+        <entry>If specified, request that the device only use the specified duplex mode.  Either 'half' or 'full'.</entry>
+      </row>
+      <row>
+        <entry><screen>auto-negotiate</screen></entry>
+        <entry><screen>boolean</screen></entry>
+        <entry><screen>TRUE</screen></entry>
+        <entry>If TRUE, allow auto-negotiation of port speed and duplex mode.  If FALSE, do not allow auto-negotiation,in which case the 'speed' and 'duplex' properties should be set.</entry>
+      </row>
+      <row>
+        <entry><screen>mac-address</screen></entry>
+        <entry><screen>byte array</screen></entry>
+        <entry><screen>[]</screen></entry>
+        <entry>If specified, this connection will only apply to the ethernet device whose permanent MAC address matches.  This property does not change the MAC address of the device (i.e. MAC spoofing).</entry>
+      </row>
+      <row>
+        <entry><screen>cloned-mac-address</screen></entry>
+        <entry><screen>byte array</screen></entry>
+        <entry><screen>[]</screen></entry>
+        <entry>If specified, request that the device use this MAC address instead of its permanent MAC address.  This is known as MAC cloning or spoofing.</entry>
+      </row>
+      <row>
+        <entry><screen>mtu</screen></entry>
+        <entry><screen>uint32</screen></entry>
+        <entry><screen>0</screen></entry>
+        <entry>If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple Ethernet frames.</entry>
+      </row>
+      <row>
+        <entry><screen>s390-subchannels</screen></entry>
+        <entry><screen>GPtrArray_gchararray_</screen></entry>
+        <entry><screen>[]</screen></entry>
+        <entry>Identifies specific subchannels that this network device uses for communcation with z/VM or s390 host.  Like the 'mac-address' property for non-z/VM devices, this property can be used to ensure this connection only applies to the network device that uses these subchannels. The list should contain exactly 3 strings, and each string may only be composed of hexadecimal characters and the period (.) character.</entry>
+      </row>
+      <row>
+        <entry><screen>s390-nettype</screen></entry>
+        <entry><screen>string</screen></entry>
+        <entry><screen></screen></entry>
+        <entry>s390 network device type; one of 'qeth', 'lcs', or 'ctc', representing the different types of virtual network devices available on s390 systems.</entry>
+      </row>
+      <row>
+        <entry><screen>s390-options</screen></entry>
+        <entry><screen>dict of (string::string)</screen></entry>
+        <entry><screen>[ ]</screen></entry>
+        <entry>Dictionary of key/value pairs of s390-specific device options.  Both keys and values must be strings.  Allowed keys include 'portno', 'layer2', 'portname', 'protocol', among others.</entry>
+      </row>
+    </tbody>
+  </tgroup>
+</table>
+<table>
+  <title>802-11-wireless setting</title>
+  <tgroup cols="4">
+    <thead>
+      <row>
+        <entry>Key Name</entry>
+        <entry>Value Type</entry>
+        <entry>Default Value</entry>
+        <entry>Value Description</entry>
+      </row>
+    </thead>
+    <tbody>
+      <row>
+        <entry><screen>name</screen></entry>
+        <entry><screen>string</screen></entry>
+        <entry><screen>802-11-wireless</screen></entry>
+        <entry>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.</entry>
+      </row>
+      <row>
+        <entry><screen>ssid</screen></entry>
+        <entry><screen>byte array</screen></entry>
+        <entry><screen>[]</screen></entry>
+        <entry>SSID of the WiFi network.  Must be specified.</entry>
+      </row>
+      <row>
+        <entry><screen>mode</screen></entry>
+        <entry><screen>string</screen></entry>
+        <entry><screen></screen></entry>
+        <entry>WiFi network mode; one of 'infrastructure' or 'adhoc'.  If blank, infrastructure is assumed.</entry>
+      </row>
+      <row>
+        <entry><screen>band</screen></entry>
+        <entry><screen>string</screen></entry>
+        <entry><screen></screen></entry>
+        <entry>802.11 frequency band of the network.  One of 'a' for 5GHz 802.11a or 'bg' for 2.4GHz 802.11.  This will lock associations to the WiFi network to the specific band, i.e. if 'a' is specified, the device will not associate with the same network in the 2.4GHz band even if the network's settings are compatible.  This setting depends on specific driver capability and may not work with all drivers.</entry>
+      </row>
+      <row>
+        <entry><screen>channel</screen></entry>
+        <entry><screen>uint32</screen></entry>
+        <entry><screen>0</screen></entry>
+        <entry>Wireless channel to use for the WiFi connection.  The device will only join (or create for Ad-Hoc networks) a WiFi network on the specified channel.  Because channel numbers overlap between bands, this property also requires the 'band' property to be set.</entry>
+      </row>
+      <row>
+        <entry><screen>bssid</screen></entry>
+        <entry><screen>byte array</screen></entry>
+        <entry><screen>[]</screen></entry>
+        <entry>If specified, directs the device to only associate with the given access point.  This capability is highly driver dependent and not supported by all devices.  Note: this property does not control the BSSID used when creating an Ad-Hoc network and is unlikely to in the future.</entry>
+      </row>
+      <row>
+        <entry><screen>rate</screen></entry>
+        <entry><screen>uint32</screen></entry>
+        <entry><screen>0</screen></entry>
+        <entry>If non-zero, directs the device to only use the specified bitrate for communication with the access point.  Units are in Kb/s, ie 5500 = 5.5 Mbit/s.  This property is highly driver dependent and not all devices support setting a static bitrate.</entry>
+      </row>
+      <row>
+        <entry><screen>tx-power</screen></entry>
+        <entry><screen>uint32</screen></entry>
+        <entry><screen>0</screen></entry>
+        <entry>If non-zero, directs the device to use the specified transmit power.  Units are dBm.  This property is highly driver dependent and not all devices support setting a static transmit power.</entry>
+      </row>
+      <row>
+        <entry><screen>mac-address</screen></entry>
+        <entry><screen>byte array</screen></entry>
+        <entry><screen>[]</screen></entry>
+        <entry>If specified, this connection will only apply to the WiFi device whose permanent MAC address matches.  This property does not change the MAC address of the device (i.e. MAC spoofing).</entry>
+      </row>
+      <row>
+        <entry><screen>cloned-mac-address</screen></entry>
+        <entry><screen>byte array</screen></entry>
+        <entry><screen>[]</screen></entry>
+        <entry>If specified, request that the WiFi device use this MAC address instead of its permanent MAC address.  This is known as MAC cloning or spoofing.</entry>
+      </row>
+      <row>
+        <entry><screen>mtu</screen></entry>
+        <entry><screen>uint32</screen></entry>
+        <entry><screen>0</screen></entry>
+        <entry>If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple Ethernet frames.</entry>
+      </row>
+      <row>
+        <entry><screen>seen-bssids</screen></entry>
+        <entry><screen>array of string</screen></entry>
+        <entry><screen>[]</screen></entry>
+        <entry>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.  The settings service will usually populate this property by periodically asking NetworkManager what the device's current AP is while connected to the network (or monitoring the device's 'active-ap' property) and adding the current AP's BSSID to this list.  This list helps NetworkManager find hidden APs by matching up scan results with the BSSIDs in this list.</entry>
+      </row>
+      <row>
+        <entry><screen>security</screen></entry>
+        <entry><screen>string</screen></entry>
+        <entry><screen></screen></entry>
+        <entry>If the wireless connection has any security restrictions, like 802.1x, WEP, or WPA, set this property to '802-11-wireless-security' and ensure the connection contains a valid 802-11-wireless-security setting.</entry>
+      </row>
+    </tbody>
+  </tgroup>
+</table>
+<table>
+  <title>802-11-wireless-security setting</title>
+  <tgroup cols="4">
+    <thead>
+      <row>
+        <entry>Key Name</entry>
+        <entry>Value Type</entry>
+        <entry>Default Value</entry>
+        <entry>Value Description</entry>
+      </row>
+    </thead>
+    <tbody>
+      <row>
+        <entry><screen>name</screen></entry>
+        <entry><screen>string</screen></entry>
+        <entry><screen>802-11-wireless-security</screen></entry>
+        <entry>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.</entry>
+      </row>
+      <row>
+        <entry><screen>key-mgmt</screen></entry>
+        <entry><screen>string</screen></entry>
+        <entry><screen></screen></entry>
+        <entry>Key management used for the connection.  One of 'none' (WEP), 'ieee8021x' (Dynamic WEP), 'wpa-none' (WPA-PSK Ad-Hoc), 'wpa-psk' (infrastructure WPA-PSK), or 'wpa-eap' (WPA-Enterprise).  This property must be set for any WiFi connection that uses security.</entry>
+      </row>
+      <row>
+        <entry><screen>wep-tx-keyidx</screen></entry>
+        <entry><screen>uint32</screen></entry>
+        <entry><screen>0</screen></entry>
+        <entry>When static WEP is used (ie, key-mgmt = 'none') and a non-default WEP key index is used by the AP, put that WEP key index here.  Valid values are 0 (default key) through 3.  Note that some consumer access points (like the Linksys WRT54G) number the keys 1 - 4.</entry>
+      </row>
+      <row>
+        <entry><screen>auth-alg</screen></entry>
+        <entry><screen>string</screen></entry>
+        <entry><screen></screen></entry>
+        <entry>When WEP is used (ie, key-mgmt = 'none' or 'ieee8021x') indicate the 802.11 authentication algorithm required by the AP here.  One of 'open' for Open System, 'shared' for Shared Key, or 'leap' for Cisco LEAP.  When using Cisco LEAP (ie, key-mgmt = 'ieee8021x' and auth-alg = 'leap') the 'leap-username' and 'leap-password' properties must be specified.</entry>
+      </row>
+      <row>
+        <entry><screen>proto</screen></entry>
+        <entry><screen>array of string</screen></entry>
+        <entry><screen>[]</screen></entry>
+        <entry>List of strings specifying the allowed WPA protocol versions to use.  Each element may be one 'wpa' (allow WPA) or 'rsn' (allow WPA2/RSN).  If not specified, both WPA and RSN connections are allowed.</entry>
+      </row>
+      <row>
+        <entry><screen>pairwise</screen></entry>
+        <entry><screen>array of string</screen></entry>
+        <entry><screen>[]</screen></entry>
+        <entry>If specified, will only connect to WPA networks that provide the specified pairwise encryption capabilities.  Each element may be one of 'wep40', 'wep104', 'tkip', or 'ccmp'.</entry>
+      </row>
+      <row>
+        <entry><screen>group</screen></entry>
+        <entry><screen>array of string</screen></entry>
+        <entry><screen>[]</screen></entry>
+        <entry>If specified, will only connect to WPA networks that provide the specified group/multicast encryption capabilities.  Each element may be one of 'wep40', 'wep104', 'tkip', or 'ccmp'.</entry>
+      </row>
+      <row>
+        <entry><screen>leap-username</screen></entry>
+        <entry><screen>string</screen></entry>
+        <entry><screen></screen></entry>
+        <entry>The login username for legacy LEAP connections (ie, key-mgmt = 'ieee8021x' and auth-alg = 'leap').</entry>
+      </row>
+      <row>
+        <entry><screen>wep-key0</screen></entry>
+        <entry><screen>string</screen></entry>
+        <entry><screen></screen></entry>
+        <entry>Index 0 WEP key.  This is the WEP key used in most networks.  See the 'wep-key-type' property for a description of how this key is interpreted.</entry>
+      </row>
+      <row>
+        <entry><screen>wep-key1</screen></entry>
+        <entry><screen>string</screen></entry>
+        <entry><screen></screen></entry>
+        <entry>Index 1 WEP key.  This WEP index is not used by most networks.  See the 'wep-key-type' property for a description of how this key is interpreted.</entry>
+      </row>
+      <row>
+        <entry><screen>wep-key2</screen></entry>
+        <entry><screen>string</screen></entry>
+        <entry><screen></screen></entry>
+        <entry>Index 2 WEP key.  This WEP index is not used by most networks.  See the 'wep-key-type' property for a description of how this key is interpreted.</entry>
+      </row>
+      <row>
+        <entry><screen>wep-key3</screen></entry>
+        <entry><screen>string</screen></entry>
+        <entry><screen></screen></entry>
+        <entry>Index 3 WEP key.  This WEP index is not used by most networks.  See the 'wep-key-type' property for a description of how this key is interpreted.</entry>
+      </row>
+      <row>
+        <entry><screen>wep-key-flags</screen></entry>
+        <entry><screen>uint32</screen></entry>
+        <entry><screen>0</screen></entry>
+        <entry>Flags indicating how to handle the WEP keys. (see <xref linkend="secrets-flags"/> for flag values)</entry>
+      </row>
+      <row>
+        <entry><screen>wep-key-type</screen></entry>
+        <entry><screen>uint32</screen></entry>
+        <entry><screen>0</screen></entry>
+        <entry>Controls the interpretation of WEP keys.  Allowed values are 1 (interpret WEP keys as hexadecimal or ASCII keys) or 2 (interpret WEP keys as WEP Passphrases).  If set to 1 and the keys are hexadecimal, they must be either 10 or 26 characters in length.  If set to 1 and the keys are ASCII keys, they must be either 5 or 13 characters in length.  If set to 2, the passphrase is hashed using  the de-facto MD5 method to derive the actual WEP key.</entry>
+      </row>
+      <row>
+        <entry><screen>psk</screen></entry>
+        <entry><screen>string</screen></entry>
+        <entry><screen></screen></entry>
+        <entry>Pre-Shared-Key for WPA networks.  If the key is 64-characters long, it must contain only hexadecimal characters and is interpreted as a hexadecimal WPA key.  Otherwise, the key must be between 8 and 63 ASCII characters (as specified in the 802.11i standard) and is interpreted as a WPA passphrase, and is hashed to derive the actual WPA-PSK used when connecting to the WiFi network.</entry>
+      </row>
+      <row>
+        <entry><screen>psk-flags</screen></entry>
+        <entry><screen>uint32</screen></entry>
+        <entry><screen>0</screen></entry>
+        <entry>Flags indicating how to handle the WPA PSK key. (see <xref linkend="secrets-flags"/> for flag values)</entry>
+      </row>
+      <row>
+        <entry><screen>leap-password</screen></entry>
+        <entry><screen>string</screen></entry>
+        <entry><screen></screen></entry>
+        <entry>The login password for legacy LEAP connections (ie, key-mgmt = 'ieee8021x' and auth-alg = 'leap').</entry>
+      </row>
+      <row>
+        <entry><screen>leap-password-flags</screen></entry>
+        <entry><screen>uint32</screen></entry>
+        <entry><screen>0</screen></entry>
+        <entry>Flags indicating how to handle the LEAP password. (see <xref linkend="secrets-flags"/> for flag values)</entry>
+      </row>
+    </tbody>
+  </tgroup>
+</table>
+  </para>
+</section>
diff --git a/docs/api/spec.html b/docs/api/spec.html
new file mode 100644
index 000000000..5a1c58d42
--- /dev/null
+++ b/docs/api/spec.html
@@ -0,0 +1,1361 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ascii" /><title>NetworkManager D-Bus Interface Specification version 0.9</title><style type="text/css">
+
+          body {
+            font-family: sans-serif;
+            margin: 2em;
+            height: 100%;
+            font-size: 1.2em;
+          }
+          h1 {
+            padding-top: 5px;
+            padding-bottom: 5px;
+            font-size: 1.6em;
+            background: #dadae2;
+          }
+          h2 {
+            font-size: 1.3em;
+          }
+          h3 {
+            font-size: 1.2em;
+          }
+          a:link, a:visited, a:link:hover, a:visited:hover {
+            font-weight: bold;
+          }
+          .topbox {
+            padding-top: 10px;
+            padding-left: 10px;
+            border-bottom: black solid 1px;
+            padding-bottom: 10px;
+            background: #dadae2;
+            font-size: 2em;
+            font-weight: bold;
+            color: #5c5c5c;
+          }
+          .topnavbox {
+            padding-left: 10px;
+            padding-top: 5px;
+            padding-bottom: 5px;
+            background: #abacba;
+            border-bottom: black solid 1px;
+            font-size: 1.2em;
+          }
+          .topnavbox a{
+            color: black;
+            font-weight: normal;
+          }
+          .sidebar {
+            float: left;
+            /* width:9em;
+            border-right:#abacba solid 1px;
+            border-left: #abacba solid 1px;
+            height:100%; */
+            border: #abacba solid 1px;
+            padding-left: 10px;
+            margin-left: 10px;
+            padding-right: 10px;
+            margin-right: 10px;
+            color: #5d5d5d;
+            background: #dadae2;
+          }
+          .sidebar a {
+            text-decoration: none;
+            border-bottom: #e29625 dotted 1px;
+            color: #e29625;
+            font-weight: normal;
+          }
+          .sidebar h1 {
+            font-size: 1.2em;
+            color: black;
+          }
+          .sidebar ul {
+            padding-left: 25px;
+            padding-bottom: 10px;
+            border-bottom: #abacba solid 1px;
+          }
+          .sidebar li {
+            padding-top: 2px;
+            padding-bottom: 2px;
+          }
+          .sidebar h2 {
+            font-style:italic;
+            font-size: 0.81em;
+            padding-left: 5px;
+            padding-right: 5px;
+            font-weight: normal;
+          }
+          .date {
+            font-size: 0.6em;
+            float: right;
+            font-style: italic;
+          }
+          .method {
+            margin-left: 1em;
+            margin-right: 4em;
+          }
+          .signal {
+            margin-left: 1em;
+            margin-right: 4em;
+          }
+
+        </style></head><body><h1 class="topbox">NetworkManager D-Bus Interface Specification</h1><h2>Version 0.9</h2><div>Copyright (C) 2008 - 2011 Red Hat, Inc.</div><div>Copyright (C) 2008 - 2009 Novell, Inc.</div><div class="license">
+<p>This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.</p>
+
+<p>This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.</p>
+
+<p>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.</p>
+</div><h2>Interfaces</h2><ul><li><code><a href="#org.freedesktop.NetworkManager">org.freedesktop.NetworkManager</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.AccessPoint">org.freedesktop.NetworkManager.AccessPoint</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.Device">org.freedesktop.NetworkManager.Device</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.Device.Wired">org.freedesktop.NetworkManager.Device.Wired</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.Device.Wireless">org.freedesktop.NetworkManager.Device.Wireless</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.Device.Modem">org.freedesktop.NetworkManager.Device.Modem</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.Device.Bluetooth">org.freedesktop.NetworkManager.Device.Bluetooth</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.Device.OlpcMesh">org.freedesktop.NetworkManager.Device.OlpcMesh</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.Device.WiMax">org.freedesktop.NetworkManager.Device.WiMax</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.WiMax.Nsp">org.freedesktop.NetworkManager.WiMax.Nsp</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.IP4Config">org.freedesktop.NetworkManager.IP4Config</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.IP6Config">org.freedesktop.NetworkManager.IP6Config</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.DHCP4Config">org.freedesktop.NetworkManager.DHCP4Config</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.DHCP6Config">org.freedesktop.NetworkManager.DHCP6Config</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.Settings">org.freedesktop.NetworkManager.Settings</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.Settings.Connection">org.freedesktop.NetworkManager.Settings.Connection</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.Connection.Active">org.freedesktop.NetworkManager.Connection.Active</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.AgentManager">org.freedesktop.NetworkManager.AgentManager</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.VPN.Connection">org.freedesktop.NetworkManager.VPN.Connection</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.VPN.Plugin">org.freedesktop.NetworkManager.VPN.Plugin</a></code></li></ul>
+  <h1><a name="org.freedesktop.NetworkManager" id="org.freedesktop.NetworkManager"></a>org.freedesktop.NetworkManager</h1><h2>Methods:</h2><div class="method"><h3><a name="org.freedesktop.NetworkManager.GetDevices" id="org.freedesktop.NetworkManager.GetDevices">GetDevices</a> (
+        
+        ) &#8594;
+        ao</h3><div class="docstring">
+        Get the list of network devices.
+      </div><div><h4>Returns</h4><dl><dt><code>devices</code> -
+      <code>ao</code></dt><dd>
+          List of object paths of network devices known to the system.
+        </dd></dl></div></div><div class="method"><h3><a name="org.freedesktop.NetworkManager.ActivateConnection" id="org.freedesktop.NetworkManager.ActivateConnection">ActivateConnection</a> (
+        o: connection, o: device, o: specific_object
+        ) &#8594;
+        o</h3><div class="docstring">
+        Activate a connection using the supplied device.
+      </div><div><h4>Parameters</h4><dl><dt><code>connection</code> -
+      <code>o</code></dt><dd>
+          The connection to activate the devices with.
+        </dd><dt><code>device</code> -
+      <code>o</code></dt><dd>
+          The object path of device to be activated for physical connections.  This parameter is ignored for VPN connections, because the specific_object (if provided) specifies the device to use.
+        </dd><dt><code>specific_object</code> -
+      <code>o</code></dt><dd>
+          The path of a connection-type-specific object this activation should use. 
+          This parameter is currently ignored for wired and mobile broadband connections,
+          and the value of "/" should be used (ie, no specific object).  For WiFi
+          connections, pass the object path of a specific AP from the card's scan
+          list, or "/" to pick and AP automatically.  For VPN connections, pass
+          the object path of an ActiveConnection object that should serve as the
+          "base" connection (to which the VPN connections lifetime will be tied),
+          or pass "/" and NM will automatically use the current default device.
+        </dd></dl></div><div><h4>Returns</h4><dl><dt><code>active_connection</code> -
+      <code>o</code></dt><dd>
+          The path of the active connection object representing this active connection.
+        </dd></dl></div><div><h4>Possible errors</h4><dl><dt><code>org.freedesktop.NetworkManager.Error.UnknownConnection</code></dt><dd>
+        Connection was not provided by the settings service.
+    <em>(generic description)</em></dd><dt><code>org.freedesktop.NetworkManager.Error.UnknownDevice</code></dt><dd>
+        Unknown device.
+    <em>(generic description)</em></dd><dt><code>org.freedesktop.NetworkManager.Error.ConnectionActivating</code></dt><dd>Another connection is already activating or the same connection is already active.  FIXME: check if the error name is correct.  FIXME: split into 2 errors?</dd><dt><code>org.freedesktop.NetworkManager.Error.ConnectionInvalid</code></dt><dd>The connection is invalid for this device.</dd></dl></div></div><div class="method"><h3><a name="org.freedesktop.NetworkManager.AddAndActivateConnection" id="org.freedesktop.NetworkManager.AddAndActivateConnection">AddAndActivateConnection</a> (
+        a{sa{sv}}: connection, o: device, o: specific_object
+        ) &#8594;
+        o, o</h3><div class="docstring">
+        Adds a new connection using the given details (if any) as a template
+        (automatically filling in missing settings with the capabilities of the
+        given device and specific object), then activate the new connection.
+        Cannot be used for VPN connections at this time.
+      </div><div><h4>Parameters</h4><dl><dt><code>connection</code> -
+      <code>a{sa{sv}}</code></dt><dd>
+          Connection settings and properties; if incomplete missing settings will
+          be automatically completed using the given device and specific object.
+        </dd><dt><code>device</code> -
+      <code>o</code></dt><dd>
+          The object path of device to be activated using the given connection.
+        </dd><dt><code>specific_object</code> -
+      <code>o</code></dt><dd>
+          The path of a connection-type-specific object this activation should use. 
+          This parameter is currently ignored for wired and mobile broadband connections,
+          and the value of "/" should be used (ie, no specific object).  For WiFi
+          connections, pass the object path of a specific AP from the card's scan
+          list, which will be used to complete the details of the newly added
+          connection.
+        </dd></dl></div><div><h4>Returns</h4><dl><dt><code>path</code> -
+      <code>o</code></dt><dd>
+          Object path of the new connection that was just added.
+        </dd><dt><code>active_connection</code> -
+      <code>o</code></dt><dd>
+          The path of the active connection object representing this active connection.
+        </dd></dl></div><div><h4>Possible errors</h4><dl><dt><code>org.freedesktop.NetworkManager.Error.UnknownConnection</code></dt><dd>
+        Connection was not provided by the settings service.
+    <em>(generic description)</em></dd><dt><code>org.freedesktop.NetworkManager.Error.UnknownDevice</code></dt><dd>
+        Unknown device.
+    <em>(generic description)</em></dd><dt><code>org.freedesktop.NetworkManager.Error.ConnectionInvalid</code></dt><dd>The connection is invalid for this device.</dd></dl></div></div><div class="method"><h3><a name="org.freedesktop.NetworkManager.DeactivateConnection" id="org.freedesktop.NetworkManager.DeactivateConnection">DeactivateConnection</a> (
+        o: active_connection
+        ) &#8594;
+        nothing</h3><div class="docstring">
+        Deactivate an active connection.
+      </div><div><h4>Parameters</h4><dl><dt><code>active_connection</code> -
+      <code>o</code></dt><dd>
+          The currently active connection to deactivate.
+        </dd></dl></div></div><div class="method"><h3><a name="org.freedesktop.NetworkManager.Sleep" id="org.freedesktop.NetworkManager.Sleep">Sleep</a> (
+        b: sleep
+        ) &#8594;
+        nothing</h3><div class="docstring">
+        Control the NetworkManager daemon's sleep state.  When asleep, all
+        interfaces that it manages are deactivated.  When awake, devices are
+        available to be activated.  This command should not be called directly
+        by users or clients; it is intended for system suspend/resume tracking.
+      </div><div><h4>Parameters</h4><dl><dt><code>sleep</code> -
+      <code>b</code></dt><dd>
+          Indicates whether the NetworkManager daemon should sleep or wake.
+        </dd></dl></div></div><div class="method"><h3><a name="org.freedesktop.NetworkManager.Enable" id="org.freedesktop.NetworkManager.Enable">Enable</a> (
+        b: enable
+        ) &#8594;
+        nothing</h3><div class="docstring">
+        Control whether overall networking is enabled or disabled.  When
+        disabled, all interfaces that NM manages are deactivated.  When enabled,
+        all managed interfaces are re-enabled and available to be activated.
+        This command should be used by clients that provide to users the ability
+        to enable/disable all networking.
+      </div><div><h4>Parameters</h4><dl><dt><code>enable</code> -
+      <code>b</code></dt><dd>
+          If FALSE, indicates that all networking should be disabled.  If TRUE,
+          indicates that NetworkManager should begin managing network devices.
+        </dd></dl></div></div><div class="method"><h3><a name="org.freedesktop.NetworkManager.GetPermissions" id="org.freedesktop.NetworkManager.GetPermissions">GetPermissions</a> (
+        
+        ) &#8594;
+        a{ss}</h3><div class="docstring">
+        Returns the permissions a caller has for various authenticated operations
+        that NetworkManager provides, like Enable/Disable networking, changing
+        WiFi, WWAN, and WiMAX state, etc.
+      </div><div><h4>Returns</h4><dl><dt><code>permissions</code> -
+      <code>a{ss}</code></dt><dd>
+          Dictionary of available permissions and results.  Each permission
+          is represented by a name (ie "org.freedesktop.NetworkManager.Foobar")
+          and each result is one of the following values: "yes" (the permission
+          is available), "auth" (the permission is available after a successful
+          authentication), or "no" (the permission is denied).  Clients may use
+          these values in the UI to indicate the ability to perform certain
+          operations.
+        </dd></dl></div></div><div class="method"><h3><a name="org.freedesktop.NetworkManager.SetLogging" id="org.freedesktop.NetworkManager.SetLogging">SetLogging</a> (
+        s: level, s: domains
+        ) &#8594;
+        nothing</h3><div class="docstring">
+        Set logging verbosity and which operations are logged.
+      </div><div><h4>Parameters</h4><dl><dt><code>level</code> -
+      <code>s</code></dt><dd>
+          One of [ERR, WARN, INFO, DEBUG].
+        </dd><dt><code>domains</code> -
+      <code>s</code></dt><dd>
+          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]
+        </dd></dl></div></div><div class="method"><h3><a name="org.freedesktop.NetworkManager.state" id="org.freedesktop.NetworkManager.state">state</a> (
+        
+        ) &#8594;
+        u</h3><div class="docstring">
+        The overall networking state as determined by the NetworkManager daemon,
+        based on the state of network devices under it's management.
+      </div><div><h4>Returns</h4><dl><dt><code>state</code> -
+      <code>u</code>
+      (<a xmlns="" href="#type-NM_STATE">NM_STATE</a>)
+    </dt><dd></dd></dl></div></div><h2>Signals:</h2><div class="signal"><h3><a name="org.freedesktop.NetworkManager.CheckPermissions" id="org.freedesktop.NetworkManager.CheckPermissions">CheckPermissions</a> (
+        
+        )</h3><div class="docstring">
+        Emitted when system authorization details change, indicating that
+        clients may wish to recheck permissions with GetPermissions.
+      </div></div><div class="signal"><h3><a name="org.freedesktop.NetworkManager.StateChanged" id="org.freedesktop.NetworkManager.StateChanged">StateChanged</a> (
+        u: state
+        )</h3><div class="docstring">
+        NetworkManager's state changed.
+      </div><div><h4>Parameters</h4><dl><dt><code>state</code> -
+      <code>u</code>
+      (<a xmlns="" href="#type-NM_STATE">NM_STATE</a>)
+    </dt><dd>
+          The new state of NetworkManager.
+        </dd></dl></div></div><div class="signal"><h3><a name="org.freedesktop.NetworkManager.PropertiesChanged" id="org.freedesktop.NetworkManager.PropertiesChanged">PropertiesChanged</a> (
+        a{sv}: properties
+        )</h3><div class="docstring">
+        NetworkManager's properties changed.
+      </div><div><h4>Parameters</h4><dl><dt><code>properties</code> -
+      <code>a{sv}</code>
+      (<a xmlns="" href="#type-String_Variant_Map">String_Variant_Map</a>)
+    </dt><dd>
+          The changed properties.
+        </dd></dl></div></div><div class="signal"><h3><a name="org.freedesktop.NetworkManager.DeviceAdded" id="org.freedesktop.NetworkManager.DeviceAdded">DeviceAdded</a> (
+        o: device_path
+        )</h3><div class="docstring">
+        A device was added to the system
+      </div><div><h4>Parameters</h4><dl><dt><code>device_path</code> -
+      <code>o</code></dt><dd>
+          The object path of the newly added device.
+        </dd></dl></div></div><div class="signal"><h3><a name="org.freedesktop.NetworkManager.DeviceRemoved" id="org.freedesktop.NetworkManager.DeviceRemoved">DeviceRemoved</a> (
+        o: device_path
+        )</h3><div class="docstring">
+        A device was removed from the system, and is no longer available.
+      </div><div><h4>Parameters</h4><dl><dt><code>device_path</code> -
+      <code>o</code></dt><dd>
+          The object path of the device that was just removed.
+        </dd></dl></div></div><h2>Properties:</h2><dl><dt><code>NetworkingEnabled</code> -
+      <code>b</code> -
+      <code>(read)</code></dt><dd>
+        Indicates if overall networking is currently enabled or not.  See the
+        Enable() method.
+      </dd><dt><code>WirelessEnabled</code> -
+      <code>b</code> -
+      <code>(readwrite)</code></dt><dd>
+        Indicates if wireless is currently enabled or not.
+      </dd><dt><code>WirelessHardwareEnabled</code> -
+      <code>b</code> -
+      <code>(read)</code></dt><dd>
+        Indicates if the wireless hardware is currently enabled, i.e. the state of the RF kill switch.
+      </dd><dt><code>WwanEnabled</code> -
+      <code>b</code> -
+      <code>(readwrite)</code></dt><dd>
+        Indicates if mobile broadband devices are currently enabled or not.
+      </dd><dt><code>WwanHardwareEnabled</code> -
+      <code>b</code> -
+      <code>(read)</code></dt><dd>
+        Indicates if the mobile broadband hardware is currently enabled, i.e. the state of the RF kill switch.
+      </dd><dt><code>WimaxEnabled</code> -
+      <code>b</code> -
+      <code>(readwrite)</code></dt><dd>
+        Indicates if WiMAX devices are currently enabled or not.
+      </dd><dt><code>WimaxHardwareEnabled</code> -
+      <code>b</code> -
+      <code>(read)</code></dt><dd>
+        Indicates if the WiMAX hardware is currently enabled, i.e. the state of the RF kill switch.
+      </dd><dt><code>ActiveConnections</code> -
+      <code>ao</code> -
+      <code>(read)</code></dt><dd>
+        List of active connection object paths.
+      </dd><dt><code>Version</code> -
+      <code>s</code> -
+      <code>(read)</code></dt><dd>
+        NetworkManager version.
+      </dd><dt><code>State</code> -
+      <code>u</code> -
+      <code>(read)</code>
+      (<a xmlns="" href="#type-NM_STATE">NM_STATE</a>)
+    </dt><dd>
+        The overall state of the NetworkManager daemon.
+      </dd></dl><h2>Enumerated types:</h2><h3><a name="type-NM_STATE" id="type-NM_STATE">NM_STATE</a></h3>
+        Describes the overall state of the daemon.
+      <dl><dt><code>NM_STATE_UNKNOWN = 0</code></dt><dd>
+          Networking state is unknown.
+        </dd><dt><code>NM_STATE_ASLEEP = 10</code></dt><dd>
+          Networking is inactive and all devices are disabled.
+        </dd><dt><code>NM_STATE_DISCONNECTED = 20</code></dt><dd>
+          There is no active network connection.
+        </dd><dt><code>NM_STATE_DISCONNECTING = 30</code></dt><dd>
+          Network connections are being cleaned up.
+        </dd><dt><code>NM_STATE_CONNECTING = 40</code></dt><dd>
+          A network device is connecting to a network and there is no other
+          available network connection.
+        </dd><dt><code>NM_STATE_CONNECTED_LOCAL = 50</code></dt><dd>
+          A network device is connected, but there is only link-local connectivity.
+        </dd><dt><code>NM_STATE_CONNECTED_SITE = 60</code></dt><dd>
+          A network device is connected, but there is only site-local connectivity.
+        </dd><dt><code>NM_STATE_CONNECTED_GLOBAL = 70</code></dt><dd>
+          A network device is connected, with global network connectivity.
+        </dd></dl>
+
+  <h1><a name="org.freedesktop.NetworkManager.AccessPoint" id="org.freedesktop.NetworkManager.AccessPoint"></a>org.freedesktop.NetworkManager.AccessPoint</h1><p>Interface has no methods.</p><h2>Signals:</h2><div class="signal"><h3><a name="org.freedesktop.NetworkManager.AccessPoint.PropertiesChanged" id="org.freedesktop.NetworkManager.AccessPoint.PropertiesChanged">PropertiesChanged</a> (
+        a{sv}: properties
+        )</h3><div class="docstring"></div><div><h4>Parameters</h4><dl><dt><code>properties</code> -
+      <code>a{sv}</code>
+      (<a xmlns="" href="#type-String_Variant_Map">String_Variant_Map</a>)
+    </dt><dd>
+                A dictionary mapping property names to variant boxed values
+            </dd></dl></div></div><h2>Properties:</h2><dl><dt><code>Flags</code> -
+      <code>u</code> -
+      <code>(read)</code>
+      (<a xmlns="" href="#type-NM_802_11_AP_FLAGS">NM_802_11_AP_FLAGS</a>)
+    </dt><dd>Flags describing the capabilities of the access point.</dd><dt><code>WpaFlags</code> -
+      <code>u</code> -
+      <code>(read)</code>
+      (<a xmlns="" href="#type-NM_802_11_AP_SEC">NM_802_11_AP_SEC</a>)
+    </dt><dd>Flags describing the access point's capabilities according to WPA (Wifi Protected Access).</dd><dt><code>RsnFlags</code> -
+      <code>u</code> -
+      <code>(read)</code>
+      (<a xmlns="" href="#type-NM_802_11_AP_SEC">NM_802_11_AP_SEC</a>)
+    </dt><dd>Flags describing the access point's capabilities according to the RSN (Robust Secure Network) protocol.</dd><dt><code>Ssid</code> -
+      <code>ay</code> -
+      <code>(read)</code></dt><dd>The Service Set Identifier identifying the access point.</dd><dt><code>Frequency</code> -
+      <code>u</code> -
+      <code>(read)</code></dt><dd>The radio channel frequency in use by the access point, in MHz.</dd><dt><code>HwAddress</code> -
+      <code>s</code> -
+      <code>(read)</code></dt><dd>The hardware address (BSSID) of the access point.</dd><dt><code>Mode</code> -
+      <code>u</code> -
+      <code>(read)</code>
+      (<a xmlns="" href="#type-NM_802_11_MODE">NM_802_11_MODE</a>)
+    </dt><dd>Describes the operating mode of the access point.</dd><dt><code>MaxBitrate</code> -
+      <code>u</code> -
+      <code>(read)</code></dt><dd>The maximum bitrate this access point is capable of, in kilobits/second (Kb/s).</dd><dt><code>Strength</code> -
+      <code>y</code> -
+      <code>(read)</code></dt><dd>The current signal quality of the access point, in percent.</dd></dl><h2>Sets of flags:</h2><h3 xmlns=""><a name="type-NM_802_11_AP_FLAGS" id="type-NM_802_11_AP_FLAGS">NM_802_11_AP_FLAGS</a></h3>
+        Flags describing the general capabilities of the access point.
+      <dl><dt><code>NM_802_11_AP_FLAGS_NONE = 0x0</code></dt><dd>Null capability - says nothing about the access point.</dd><dt><code>NM_802_11_AP_FLAGS_PRIVACY = 0x1</code></dt><dd>Access point supports privacy measures.</dd></dl><h3 xmlns=""><a name="type-NM_802_11_AP_SEC" id="type-NM_802_11_AP_SEC">NM_802_11_AP_SEC</a></h3>
+        Flags describing the security capabilities of the access point.
+      <dl><dt><code>NM_802_11_AP_SEC_NONE = 0x0</code></dt><dd>Null flag.</dd><dt><code>NM_802_11_AP_SEC_PAIR_WEP40 = 0x1</code></dt><dd>Access point supports pairwise 40-bit WEP encryption.</dd><dt><code>NM_802_11_AP_SEC_PAIR_WEP104 = 0x2</code></dt><dd>Access point supports pairwise 104-bit WEP encryption.</dd><dt><code>NM_802_11_AP_SEC_PAIR_TKIP = 0x4</code></dt><dd>Access point supports pairwise TKIP encryption.</dd><dt><code>NM_802_11_AP_SEC_PAIR_CCMP = 0x8</code></dt><dd>Access point supports pairwise CCMP encryption.</dd><dt><code>NM_802_11_AP_SEC_GROUP_WEP40 = 0x10</code></dt><dd>Access point supports a group 40-bit WEP cipher.</dd><dt><code>NM_802_11_AP_SEC_GROUP_WEP104 = 0x20</code></dt><dd>Access point supports a group 104-bit WEP cipher.</dd><dt><code>NM_802_11_AP_SEC_GROUP_TKIP = 0x40</code></dt><dd>Access point supports a group TKIP cipher.</dd><dt><code>NM_802_11_AP_SEC_GROUP_CCMP = 0x80</code></dt><dd>Access point supports a group CCMP cipher.</dd><dt><code>NM_802_11_AP_SEC_KEY_MGMT_PSK = 0x100</code></dt><dd>Access point supports PSK key management.</dd><dt><code>NM_802_11_AP_SEC_KEY_MGMT_802_1X = 0x200</code></dt><dd>Access point supports 802.1x key management.</dd></dl>
+
+  <h1><a name="org.freedesktop.NetworkManager.Device" id="org.freedesktop.NetworkManager.Device"></a>org.freedesktop.NetworkManager.Device</h1><h2>Methods:</h2><div class="method"><h3><a name="org.freedesktop.NetworkManager.Device.Disconnect" id="org.freedesktop.NetworkManager.Device.Disconnect">Disconnect</a> (
+        
+        ) &#8594;
+        nothing</h3><div class="docstring">
+        Disconnects a device and prevents the device from automatically activating further connections without user intervention.
+      </div></div><h2>Signals:</h2><div class="signal"><h3><a name="org.freedesktop.NetworkManager.Device.StateChanged" id="org.freedesktop.NetworkManager.Device.StateChanged">StateChanged</a> (
+        u: new_state, u: old_state, u: reason
+        )</h3><div class="docstring"></div><div><h4>Parameters</h4><dl><dt><code>new_state</code> -
+      <code>u</code>
+      (<a xmlns="" href="#type-NM_DEVICE_STATE">NM_DEVICE_STATE</a>)
+    </dt><dd>
+          The new state of the device.
+        </dd><dt><code>old_state</code> -
+      <code>u</code>
+      (<a xmlns="" href="#type-NM_DEVICE_STATE">NM_DEVICE_STATE</a>)
+    </dt><dd>
+          The previous state of the device.
+        </dd><dt><code>reason</code> -
+      <code>u</code>
+      (<a xmlns="" href="#type-NM_DEVICE_STATE_REASON">NM_DEVICE_STATE_REASON</a>)
+    </dt><dd>
+          A reason for the state transition.
+        </dd></dl></div></div><h2>Properties:</h2><dl><dt><code>Udi</code> -
+      <code>s</code> -
+      <code>(read)</code></dt><dd>
+        Operating-system specific transient device hardware identifier.  This
+        is an opaque string representing the underlying hardware for the device,
+        and shouldn't be used to keep track of individual devices.  For some
+        device types (Bluetooth, Modems) it is an identifier used by the
+        hardware service (ie bluez or ModemManager) to refer to that device,
+        and client programs use it get additional information from those
+        services which NM does not provide.  The Udi is not guaranteed to be
+        consistent across reboots or hotplugs of the hardware. If you're looking
+        for a way to uniquely track each device in your application, use the
+        object path.  If you're looking for a way to track a specific piece of
+        hardware across reboot or hotplug, use a MAC address or USB serial
+        number.
+      </dd><dt><code>Interface</code> -
+      <code>s</code> -
+      <code>(read)</code></dt><dd>
+        The name of the device's control (and often data) interface.
+      </dd><dt><code>IpInterface</code> -
+      <code>s</code> -
+      <code>(read)</code></dt><dd>
+        The name of the device's data interface when available.  This property
+        may not refer to the actual data interface until the device has
+        successfully established a data connection, indicated by the device's
+        State becoming ACTIVATED.
+      </dd><dt><code>Driver</code> -
+      <code>s</code> -
+      <code>(read)</code></dt><dd>
+        The driver handling the device.
+      </dd><dt><code>Capabilities</code> -
+      <code>u</code> -
+      <code>(read)</code>
+      (<a xmlns="" href="#type-NM_DEVICE_CAP">NM_DEVICE_CAP</a>)
+    </dt><dd>
+        Flags describing the capabilities of the device.
+      </dd><dt><code>Ip4Address</code> -
+      <code>i</code> -
+      <code>(read)</code></dt><dd>
+        The IPv4 address bound to the device. FIXME: what about devices with &gt;1 IP address?
+      </dd><dt><code>State</code> -
+      <code>u</code> -
+      <code>(read)</code>
+      (<a xmlns="" href="#type-NM_DEVICE_STATE">NM_DEVICE_STATE</a>)
+    </dt><dd>
+        The current state of the device.
+      </dd><dt><code>Ip4Config</code> -
+      <code>o</code> -
+      <code>(read)</code></dt><dd>
+        Object path of the Ip4Config object describing the configuration of the device.  Only valid when the device is in the NM_DEVICE_STATE_ACTIVATED state.
+      </dd><dt><code>Dhcp4Config</code> -
+      <code>o</code> -
+      <code>(read)</code></dt><dd>
+        Object path of the Dhcp4Config object describing the DHCP options returned by the DHCP server.  Only valid when the device is in the NM_DEVICE_STATE_ACTIVATED state.
+      </dd><dt><code>Ip6Config</code> -
+      <code>o</code> -
+      <code>(read)</code></dt><dd>
+        Object path of the Ip6Config object describing the configuration of the device.  Only valid when the device is in the NM_DEVICE_STATE_ACTIVATED state.
+      </dd><dt><code>Dhcp6Config</code> -
+      <code>o</code> -
+      <code>(read)</code></dt><dd>
+        Object path of the Dhcp6Config object describing the DHCP options
+        returned by the DHCP server.  Only valid when the device is in the
+        NM_DEVICE_STATE_ACTIVATED state.
+      </dd><dt><code>Managed</code> -
+      <code>b</code> -
+      <code>(read)</code></dt><dd>
+        Whether or not this device is managed by NetworkManager.
+      </dd><dt><code>FirmwareMissing</code> -
+      <code>b</code> -
+      <code>(read)</code></dt><dd>
+        If TRUE, indicates the device is likely missing firmware necessary for
+        its operation.
+      </dd><dt><code>DeviceType</code> -
+      <code>u</code> -
+      <code>(read)</code>
+      (<a xmlns="" href="#type-NM_DEVICE_TYPE">NM_DEVICE_TYPE</a>)
+    </dt><dd>
+        The general type of the network device; ie Ethernet, WiFi, etc.
+      </dd></dl><h2>Enumerated types:</h2><h3><a name="type-NM_DEVICE_STATE" id="type-NM_DEVICE_STATE">NM_DEVICE_STATE</a></h3><dl><dt><code>NM_DEVICE_STATE_UNKNOWN = 0</code></dt><dd>
+          The device is in an unknown state.
+        </dd><dt><code>NM_DEVICE_STATE_UNMANAGED = 10</code></dt><dd>
+          The device is recognized but not managed by NetworkManager.
+        </dd><dt><code>NM_DEVICE_STATE_UNAVAILABLE = 20</code></dt><dd>
+          The device cannot be used (carrier off, rfkill, etc).
+        </dd><dt><code>NM_DEVICE_STATE_DISCONNECTED = 30</code></dt><dd>
+          The device is not connected.
+        </dd><dt><code>NM_DEVICE_STATE_PREPARE = 40</code></dt><dd>
+          The device is preparing to connect.
+        </dd><dt><code>NM_DEVICE_STATE_CONFIG = 50</code></dt><dd>
+          The device is being configured.
+        </dd><dt><code>NM_DEVICE_STATE_NEED_AUTH = 60</code></dt><dd>
+          The device is awaiting secrets necessary to continue connection.
+        </dd><dt><code>NM_DEVICE_STATE_IP_CONFIG = 70</code></dt><dd>
+          The IP settings of the device are being requested and configured.
+        </dd><dt><code>NM_DEVICE_STATE_IP_CHECK = 80</code></dt><dd>
+          The device's IP connectivity ability is being determined.
+        </dd><dt><code>NM_DEVICE_STATE_SECONDARIES = 90</code></dt><dd>
+          The device is waiting for secondary connections to be activated.
+        </dd><dt><code>NM_DEVICE_STATE_ACTIVATED = 100</code></dt><dd>
+          The device is active.
+        </dd><dt><code>NM_DEVICE_STATE_DEACTIVATING = 110</code></dt><dd>
+          The device's network connection is being torn down.
+        </dd><dt><code>NM_DEVICE_STATE_FAILED = 120</code></dt><dd>
+          The device is in a failure state following an attempt to activate it.
+        </dd></dl><h3><a name="type-NM_DEVICE_TYPE" id="type-NM_DEVICE_TYPE">NM_DEVICE_TYPE</a></h3><dl><dt><code>NM_DEVICE_TYPE_UNKNOWN = 0</code></dt><dd>
+          The device type is unknown.
+        </dd><dt><code>NM_DEVICE_TYPE_ETHERNET = 1</code></dt><dd>
+          The device is wired Ethernet device.
+        </dd><dt><code>NM_DEVICE_TYPE_WIFI = 2</code></dt><dd>
+          The device is an 802.11 WiFi device.
+        </dd><dt><code>NM_DEVICE_TYPE_UNUSED1 = 3</code></dt><dd>Unused</dd><dt><code>NM_DEVICE_TYPE_UNUSED2 = 4</code></dt><dd>Unused</dd><dt><code>NM_DEVICE_TYPE_BT = 5</code></dt><dd>
+          The device is Bluetooth device that provides PAN or DUN capabilities.
+        </dd><dt><code>NM_DEVICE_TYPE_OLPC_MESH = 6</code></dt><dd>
+          The device is an OLPC mesh networking device.
+        </dd><dt><code>NM_DEVICE_TYPE_WIMAX = 7</code></dt><dd>
+          The device is an 802.16e Mobile WiMAX device.
+        </dd><dt><code>NM_DEVICE_TYPE_MODEM = 8</code></dt><dd>
+          The device is a modem supporting one or more of analog telephone,
+          CDMA/EVDO, GSM/UMTS/HSPA, or LTE standards to access a cellular or
+          wireline data network.
+        </dd></dl><h3><a name="type-NM_DEVICE_STATE_REASON" id="type-NM_DEVICE_STATE_REASON">NM_DEVICE_STATE_REASON</a></h3><dl><dt><code>NM_DEVICE_STATE_REASON_UNKNOWN = 0</code></dt><dd>
+          The reason for the device state change is unknown.
+        </dd><dt><code>NM_DEVICE_STATE_REASON_NONE = 1</code></dt><dd>
+          The state change is normal.
+        </dd><dt><code>NM_DEVICE_STATE_REASON_NOW_MANAGED = 2</code></dt><dd>
+          The device is now managed.
+        </dd><dt><code>NM_DEVICE_STATE_REASON_NOW_UNMANAGED = 3</code></dt><dd>
+          The device is no longer managed.
+        </dd><dt><code>NM_DEVICE_STATE_REASON_CONFIG_FAILED = 4</code></dt><dd>
+          The device could not be readied for configuration.
+        </dd><dt><code>NM_DEVICE_STATE_REASON_CONFIG_UNAVAILABLE = 5</code></dt><dd>
+          IP configuration could not be reserved (no available address, timeout, etc).
+        </dd><dt><code>NM_DEVICE_STATE_REASON_CONFIG_EXPIRED = 6</code></dt><dd>
+          The IP configuration is no longer valid.
+        </dd><dt><code>NM_DEVICE_STATE_REASON_NO_SECRETS = 7</code></dt><dd>
+          Secrets were required, but not provided.
+        </dd><dt><code>NM_DEVICE_STATE_REASON_SUPPLICANT_DISCONNECT = 8</code></dt><dd>
+          The 802.1X supplicant disconnected from the access point or authentication server.
+        </dd><dt><code>NM_DEVICE_STATE_REASON_SUPPLICANT_CONFIG_FAILED = 9</code></dt><dd>
+          Configuration of the 802.1X supplicant failed.
+        </dd><dt><code>NM_DEVICE_STATE_REASON_SUPPLICANT_FAILED = 10</code></dt><dd>
+          The 802.1X supplicant quit or failed unexpectedly.
+        </dd><dt><code>NM_DEVICE_STATE_REASON_SUPPLICANT_TIMEOUT = 11</code></dt><dd>
+          The 802.1X supplicant took too long to authenticate.
+        </dd><dt><code>NM_DEVICE_STATE_REASON_PPP_START_FAILED = 12</code></dt><dd>
+          The PPP service failed to start within the allowed time.
+        </dd><dt><code>NM_DEVICE_STATE_REASON_PPP_DISCONNECT = 13</code></dt><dd>
+          The PPP service disconnected unexpectedly.
+        </dd><dt><code>NM_DEVICE_STATE_REASON_PPP_FAILED = 14</code></dt><dd>
+          The PPP service quit or failed unexpectedly.
+        </dd><dt><code>NM_DEVICE_STATE_REASON_DHCP_START_FAILED = 15</code></dt><dd>
+          The DHCP service failed to start within the allowed time.
+        </dd><dt><code>NM_DEVICE_STATE_REASON_DHCP_ERROR = 16</code></dt><dd>
+          The DHCP service reported an unexpected error.
+        </dd><dt><code>NM_DEVICE_STATE_REASON_DHCP_FAILED = 17</code></dt><dd>
+          The DHCP service quit or failed unexpectedly.
+        </dd><dt><code>NM_DEVICE_STATE_REASON_SHARED_START_FAILED = 18</code></dt><dd>
+          The shared connection service failed to start.
+        </dd><dt><code>NM_DEVICE_STATE_REASON_SHARED_FAILED = 19</code></dt><dd>
+          The shared connection service quit or failed unexpectedly.
+        </dd><dt><code>NM_DEVICE_STATE_REASON_AUTOIP_START_FAILED = 20</code></dt><dd>
+          The AutoIP service failed to start.
+        </dd><dt><code>NM_DEVICE_STATE_REASON_AUTOIP_ERROR = 21</code></dt><dd>
+          The AutoIP service reported an unexpected error.
+        </dd><dt><code>NM_DEVICE_STATE_REASON_AUTOIP_FAILED = 22</code></dt><dd>
+          The AutoIP service quit or failed unexpectedly.
+        </dd><dt><code>NM_DEVICE_STATE_REASON_MODEM_BUSY = 23</code></dt><dd>
+          Dialing failed because the line was busy.
+        </dd><dt><code>NM_DEVICE_STATE_REASON_MODEM_NO_DIAL_TONE = 24</code></dt><dd>
+          Dialing failed because there was no dial tone.
+        </dd><dt><code>NM_DEVICE_STATE_REASON_MODEM_NO_CARRIER = 25</code></dt><dd>
+          Dialing failed because there was carrier.
+        </dd><dt><code>NM_DEVICE_STATE_REASON_MODEM_DIAL_TIMEOUT = 26</code></dt><dd>
+          Dialing timed out.
+        </dd><dt><code>NM_DEVICE_STATE_REASON_MODEM_DIAL_FAILED = 27</code></dt><dd>
+          Dialing failed.
+        </dd><dt><code>NM_DEVICE_STATE_REASON_MODEM_INIT_FAILED = 28</code></dt><dd>
+          Modem initialization failed.
+        </dd><dt><code>NM_DEVICE_STATE_REASON_GSM_APN_FAILED = 29</code></dt><dd>
+          Failed to select the specified GSM APN.
+        </dd><dt><code>NM_DEVICE_STATE_REASON_GSM_REGISTRATION_NOT_SEARCHING = 30</code></dt><dd>
+          Not searching for networks.
+        </dd><dt><code>NM_DEVICE_STATE_REASON_GSM_REGISTRATION_DENIED = 31</code></dt><dd>
+          Network registration was denied.
+        </dd><dt><code>NM_DEVICE_STATE_REASON_GSM_REGISTRATION_TIMEOUT = 32</code></dt><dd>
+          Network registration timed out.
+        </dd><dt><code>NM_DEVICE_STATE_REASON_GSM_REGISTRATION_FAILED = 33</code></dt><dd>
+          Failed to register with the requested GSM network.
+        </dd><dt><code>NM_DEVICE_STATE_REASON_GSM_PIN_CHECK_FAILED = 34</code></dt><dd>
+          PIN check failed.
+        </dd><dt><code>NM_DEVICE_STATE_REASON_FIRMWARE_MISSING = 35</code></dt><dd>
+          Necessary firmware for the device may be missing.
+        </dd><dt><code>NM_DEVICE_STATE_REASON_REMOVED = 36</code></dt><dd>
+          The device was removed.
+        </dd><dt><code>NM_DEVICE_STATE_REASON_SLEEPING = 37</code></dt><dd>
+          NetworkManager went to sleep.
+        </dd><dt><code>NM_DEVICE_STATE_REASON_CONNECTION_REMOVED = 38</code></dt><dd>
+          The device's active connection was removed or disappeared.
+        </dd><dt><code>NM_DEVICE_STATE_REASON_USER_REQUESTED = 39</code></dt><dd>
+          A user or client requested the disconnection.
+        </dd><dt><code>NM_DEVICE_STATE_REASON_CARRIER = 40</code></dt><dd>
+          The device's carrier/link changed.
+        </dd><dt><code>NM_DEVICE_STATE_REASON_CONNECTION_ASSUMED = 41</code></dt><dd>
+          The device's existing connection was assumed.
+        </dd><dt><code>NM_DEVICE_STATE_REASON_SUPPLICANT_AVAILABLE = 42</code></dt><dd>
+          The 802.1x supplicant is now available.
+        </dd><dt><code>NM_DEVICE_STATE_REASON_MODEM_NOT_FOUND = 43</code></dt><dd>
+          The modem could not be found.
+        </dd><dt><code>NM_DEVICE_STATE_REASON_BT_FAILED = 44</code></dt><dd>
+          The Bluetooth connection timed out or failed.
+        </dd></dl><h2>Sets of flags:</h2><h3 xmlns=""><a name="type-NM_DEVICE_CAP" id="type-NM_DEVICE_CAP">NM_DEVICE_CAP</a></h3><dl><dt><code>NM_DEVICE_CAP_NONE = 0x0</code></dt><dd>Null capability.</dd><dt><code>NM_DEVICE_CAP_NM_SUPPORTED = 0x1</code></dt><dd>The device is supported by NetworkManager.</dd><dt><code>NM_DEVICE_CAP_CARRIER_DETECT = 0x2</code></dt><dd>The device supports carrier detection.</dd></dl>
+
+  <h1><a name="org.freedesktop.NetworkManager.Device.Wired" id="org.freedesktop.NetworkManager.Device.Wired"></a>org.freedesktop.NetworkManager.Device.Wired</h1><p>Interface has no methods.</p><h2>Signals:</h2><div class="signal"><h3><a name="org.freedesktop.NetworkManager.Device.Wired.PropertiesChanged" id="org.freedesktop.NetworkManager.Device.Wired.PropertiesChanged">PropertiesChanged</a> (
+        a{sv}: properties
+        )</h3><div class="docstring"></div><div><h4>Parameters</h4><dl><dt><code>properties</code> -
+      <code>a{sv}</code>
+      (<a xmlns="" href="#type-String_Variant_Map">String_Variant_Map</a>)
+    </dt><dd>
+                A dictionary mapping property names to variant boxed values
+            </dd></dl></div></div><h2>Properties:</h2><dl><dt><code>HwAddress</code> -
+      <code>s</code> -
+      <code>(read)</code></dt><dd>
+        Active hardware address of the device.
+      </dd><dt><code>PermHwAddress</code> -
+      <code>s</code> -
+      <code>(read)</code></dt><dd>
+        Permanent hardware address of the device.
+      </dd><dt><code>Speed</code> -
+      <code>u</code> -
+      <code>(read)</code></dt><dd>
+        Design speed of the device, in megabits/second (Mb/s).
+      </dd><dt><code>Carrier</code> -
+      <code>b</code> -
+      <code>(read)</code></dt><dd>
+        Indicates whether the physical carrier is found (e.g. whether a cable is plugged in or not).
+      </dd></dl>
+
+  <h1><a name="org.freedesktop.NetworkManager.Device.Wireless" id="org.freedesktop.NetworkManager.Device.Wireless"></a>org.freedesktop.NetworkManager.Device.Wireless</h1><h2>Methods:</h2><div class="method"><h3><a name="org.freedesktop.NetworkManager.Device.Wireless.GetAccessPoints" id="org.freedesktop.NetworkManager.Device.Wireless.GetAccessPoints">GetAccessPoints</a> (
+        
+        ) &#8594;
+        ao</h3><div class="docstring">
+        Get the list of access points visible to this device.
+      </div><div><h4>Returns</h4><dl><dt><code>access_points</code> -
+      <code>ao</code></dt><dd>
+          List of access point object paths
+        </dd></dl></div></div><h2>Signals:</h2><div class="signal"><h3><a name="org.freedesktop.NetworkManager.Device.Wireless.PropertiesChanged" id="org.freedesktop.NetworkManager.Device.Wireless.PropertiesChanged">PropertiesChanged</a> (
+        a{sv}: properties
+        )</h3><div class="docstring">
+            Emitted when the wireless device's properties changed.
+        </div><div><h4>Parameters</h4><dl><dt><code>properties</code> -
+      <code>a{sv}</code>
+      (<a xmlns="" href="#type-String_Variant_Map">String_Variant_Map</a>)
+    </dt><dd>
+                A dictionary containing the FIXME: check changed parameters.
+            </dd></dl></div></div><div class="signal"><h3><a name="org.freedesktop.NetworkManager.Device.Wireless.AccessPointAdded" id="org.freedesktop.NetworkManager.Device.Wireless.AccessPointAdded">AccessPointAdded</a> (
+        o: access_point
+        )</h3><div class="docstring">
+            Emitted when a new access point is found by the device.
+        </div><div><h4>Parameters</h4><dl><dt><code>access_point</code> -
+      <code>o</code></dt><dd>
+                The object path of the newly found access point.
+            </dd></dl></div></div><div class="signal"><h3><a name="org.freedesktop.NetworkManager.Device.Wireless.AccessPointRemoved" id="org.freedesktop.NetworkManager.Device.Wireless.AccessPointRemoved">AccessPointRemoved</a> (
+        o: access_point
+        )</h3><div class="docstring">
+            Emitted when an access point disappears from view of the device.
+        </div><div><h4>Parameters</h4><dl><dt><code>access_point</code> -
+      <code>o</code></dt><dd>
+                The object path of the access point that has disappeared.
+            </dd></dl></div></div><h2>Properties:</h2><dl><dt><code>HwAddress</code> -
+      <code>s</code> -
+      <code>(read)</code></dt><dd>
+        The active hardware address of the device.
+      </dd><dt><code>PermHwAddress</code> -
+      <code>s</code> -
+      <code>(read)</code></dt><dd>
+        The permanent hardware address of the device.
+      </dd><dt><code>Mode</code> -
+      <code>u</code> -
+      <code>(read)</code>
+      (<a xmlns="" href="#type-NM_802_11_MODE">NM_802_11_MODE</a>)
+    </dt><dd>
+        The operating mode of the wireless device.
+      </dd><dt><code>Bitrate</code> -
+      <code>u</code> -
+      <code>(read)</code></dt><dd>
+        The bit rate currently used by the wireless device, in kilobits/second (Kb/s).
+      </dd><dt><code>ActiveAccessPoint</code> -
+      <code>o</code> -
+      <code>(read)</code></dt><dd>
+        Object path of the access point currently used by the wireless device.
+      </dd><dt><code>WirelessCapabilities</code> -
+      <code>u</code> -
+      <code>(read)</code>
+      (<a xmlns="" href="#type-NM_802_11_DEVICE_CAP">NM_802_11_DEVICE_CAP</a>)
+    </dt><dd>
+        The capabilities of the wireless device.
+      </dd></dl><h2>Sets of flags:</h2><h3 xmlns=""><a name="type-NM_802_11_DEVICE_CAP" id="type-NM_802_11_DEVICE_CAP">NM_802_11_DEVICE_CAP</a></h3>
+        Flags describing the capabilities of a wireless device.
+      <dl><dt><code>NM_802_11_DEVICE_CAP_NONE = 0x0</code></dt><dd>Null capability - syntactic sugar for no capabilities supported.  Do not AND this with other capabilities!</dd><dt><code>NM_802_11_DEVICE_CAP_CIPHER_WEP40 = 0x1</code></dt><dd>The device supports the 40-bit WEP cipher.</dd><dt><code>NM_802_11_DEVICE_CAP_CIPHER_WEP104 = 0x2</code></dt><dd>The device supports the 104-bit WEP cipher.</dd><dt><code>NM_802_11_DEVICE_CAP_CIPHER_TKIP = 0x4</code></dt><dd>The device supports the TKIP cipher.</dd><dt><code>NM_802_11_DEVICE_CAP_CIPHER_CCMP = 0x8</code></dt><dd>The device supports the CCMP cipher.</dd><dt><code>NM_802_11_DEVICE_CAP_WPA = 0x10</code></dt><dd>The device supports the WPA encryption/authentication protocol.</dd><dt><code>NM_802_11_DEVICE_CAP_RSN = 0x20</code></dt><dd>The device supports the RSN encryption/authentication protocol.</dd></dl>
+
+  <h1><a name="org.freedesktop.NetworkManager.Device.Modem" id="org.freedesktop.NetworkManager.Device.Modem"></a>org.freedesktop.NetworkManager.Device.Modem</h1><p>Interface has no methods.</p><h2>Signals:</h2><div class="signal"><h3><a name="org.freedesktop.NetworkManager.Device.Modem.PropertiesChanged" id="org.freedesktop.NetworkManager.Device.Modem.PropertiesChanged">PropertiesChanged</a> (
+        a{sv}: properties
+        )</h3><div class="docstring"></div><div><h4>Parameters</h4><dl><dt><code>properties</code> -
+      <code>a{sv}</code>
+      (<a xmlns="" href="#type-String_Variant_Map">String_Variant_Map</a>)
+    </dt><dd>
+                A dictionary mapping property names to variant boxed values
+            </dd></dl></div></div><h2>Properties:</h2><dl><dt><code>ModemCapabilities</code> -
+      <code>u</code> -
+      <code>(read)</code>
+      (<a xmlns="" href="#type-NM_DEVICE_MODEM_CAPABILITIES">NM_DEVICE_MODEM_CAPABILITIES</a>)
+    </dt><dd>
+        The generic family of access technologies the modem supports.  Not all
+        capabilities are available at the same time however; some modems require
+        a firmware reload or other reinitialization to switch between eg CDMA/EVDO
+        and GSM/UMTS.
+      </dd><dt><code>CurrentCapabilities</code> -
+      <code>u</code> -
+      <code>(read)</code>
+      (<a xmlns="" href="#type-NM_DEVICE_MODEM_CAPABILITIES">NM_DEVICE_MODEM_CAPABILITIES</a>)
+    </dt><dd>
+        The generic family of access technologies the modem currently supports
+        without a firmware reload or reinitialization.
+      </dd></dl><h2>Sets of flags:</h2><h3 xmlns=""><a name="type-NM_DEVICE_MODEM_CAPABILITIES" id="type-NM_DEVICE_MODEM_CAPABILITIES">NM_DEVICE_MODEM_CAPABILITIES</a></h3>
+        Flags describing one or more of the general access technology families
+        that a modem device supports.
+      <dl><dt><code>NM_DEVICE_MODEM_CAPABILITY_NONE = 0x0</code></dt><dd>Modem has no capabilties.</dd><dt><code>NM_DEVICE_MODEM_CAPABILITY_POTS = 0x1</code></dt><dd>
+          Modem supports the analog wired telephone network (ie 56k dialup) and
+          does not have wireless/cellular capabilities.
+        </dd><dt><code>NM_DEVICE_MODEM_CAPABILITY_CDMA_EVDO = 0x2</code></dt><dd>
+          Modem supports at least one of CDMA 1xRTT, EVDO revision 0, EVDO
+          revision A, or EVDO revision B.
+        </dd><dt><code>NM_DEVICE_MODEM_CAPABILITY_GSM_UMTS = 0x4</code></dt><dd>
+          Modem supports at least one of GSM, GPRS, EDGE, UMTS, HSDPA, HSUPA, or
+          HSPA+ packet switched data capability.
+        </dd><dt><code>NM_DEVICE_MODEM_CAPABILITY_LTE = 0x8</code></dt><dd>
+          Modem has at LTE data capability.
+        </dd></dl>
+
+  <h1><a name="org.freedesktop.NetworkManager.Device.Bluetooth" id="org.freedesktop.NetworkManager.Device.Bluetooth"></a>org.freedesktop.NetworkManager.Device.Bluetooth</h1><p>Interface has no methods.</p><h2>Signals:</h2><div class="signal"><h3><a name="org.freedesktop.NetworkManager.Device.Bluetooth.PropertiesChanged" id="org.freedesktop.NetworkManager.Device.Bluetooth.PropertiesChanged">PropertiesChanged</a> (
+        a{sv}: properties
+        )</h3><div class="docstring"></div><div><h4>Parameters</h4><dl><dt><code>properties</code> -
+      <code>a{sv}</code>
+      (<a xmlns="" href="#type-String_Variant_Map">String_Variant_Map</a>)
+    </dt><dd>
+                A dictionary mapping property names to variant boxed values
+            </dd></dl></div></div><h2>Properties:</h2><dl><dt><code>HwAddress</code> -
+      <code>s</code> -
+      <code>(read)</code></dt><dd>
+        Bluetooth hardware address of the device.
+      </dd><dt><code>Name</code> -
+      <code>s</code> -
+      <code>(read)</code></dt><dd>
+        Bluetooth name of the device.
+      </dd><dt><code>BtCapabilities</code> -
+      <code>u</code> -
+      <code>(read)</code>
+      (<a xmlns="" href="#type-NM_BT_CAPABILITIES">NM_BT_CAPABILITIES</a>)
+    </dt><dd>
+        Bluetooth capabilities of the device (either DUN or NAP).
+      </dd></dl><h2>Sets of flags:</h2><h3 xmlns=""><a name="type-NM_BT_CAPABILITIES" id="type-NM_BT_CAPABILITIES">NM_BT_CAPABILITIES</a></h3>
+        Flags describing the capabilities of a Bluetooth device.
+      <dl><dt><code>NM_BT_CAPABILITY_NONE = 0x0</code></dt><dd>The device has no recognized capabilities.</dd><dt><code>NM_BT_CAPABILITY_DUN = 0x1</code></dt><dd>The device supports Bluetooth Dial-Up Networking.</dd><dt><code>NM_BT_CAPABILITY_PAN = 0x2</code></dt><dd>The device supports Bluetooth Personal Area Networking.</dd></dl>
+
+  <h1><a name="org.freedesktop.NetworkManager.Device.OlpcMesh" id="org.freedesktop.NetworkManager.Device.OlpcMesh"></a>org.freedesktop.NetworkManager.Device.OlpcMesh</h1><p>Interface has no methods.</p><h2>Signals:</h2><div class="signal"><h3><a name="org.freedesktop.NetworkManager.Device.OlpcMesh.PropertiesChanged" id="org.freedesktop.NetworkManager.Device.OlpcMesh.PropertiesChanged">PropertiesChanged</a> (
+        a{sv}: properties
+        )</h3><div class="docstring">
+            Emitted when the wireless device's properties changed.
+        </div><div><h4>Parameters</h4><dl><dt><code>properties</code> -
+      <code>a{sv}</code>
+      (<a xmlns="" href="#type-String_Variant_Map">String_Variant_Map</a>)
+    </dt><dd>
+                A dictionary containing the FIXME: check changed parameters.
+            </dd></dl></div></div><h2>Properties:</h2><dl><dt><code>HwAddress</code> -
+      <code>s</code> -
+      <code>(read)</code></dt><dd>
+        The hardware address of the device.
+      </dd><dt><code>Companion</code> -
+      <code>o</code> -
+      <code>(read)</code></dt><dd>
+        The object path of the companion device.
+      </dd><dt><code>ActiveChannel</code> -
+      <code>u</code> -
+      <code>(read)</code></dt><dd>
+        The currently active channel.
+      </dd></dl>
+
+  <h1><a name="org.freedesktop.NetworkManager.Device.WiMax" id="org.freedesktop.NetworkManager.Device.WiMax"></a>org.freedesktop.NetworkManager.Device.WiMax</h1><h2>Methods:</h2><div class="method"><h3><a name="org.freedesktop.NetworkManager.Device.WiMax.GetNspList" id="org.freedesktop.NetworkManager.Device.WiMax.GetNspList">GetNspList</a> (
+        
+        ) &#8594;
+        ao</h3><div class="docstring">
+        Get the list of NSPs visible to this device.
+      </div><div><h4>Returns</h4><dl><dt><code>nsps</code> -
+      <code>ao</code></dt><dd>
+          List of NSP object paths
+        </dd></dl></div></div><h2>Signals:</h2><div class="signal"><h3><a name="org.freedesktop.NetworkManager.Device.WiMax.PropertiesChanged" id="org.freedesktop.NetworkManager.Device.WiMax.PropertiesChanged">PropertiesChanged</a> (
+        a{sv}: properties
+        )</h3><div class="docstring">
+            Emitted when the WiMax device's properties changed.
+        </div><div><h4>Parameters</h4><dl><dt><code>properties</code> -
+      <code>a{sv}</code>
+      (<a xmlns="" href="#type-String_Variant_Map">String_Variant_Map</a>)
+    </dt><dd>
+                A dictionary mapping property names to variant boxed values.
+            </dd></dl></div></div><div class="signal"><h3><a name="org.freedesktop.NetworkManager.Device.WiMax.NspAdded" id="org.freedesktop.NetworkManager.Device.WiMax.NspAdded">NspAdded</a> (
+        o: nsp
+        )</h3><div class="docstring">
+            Emitted when a new NSP is found by the device.
+        </div><div><h4>Parameters</h4><dl><dt><code>nsp</code> -
+      <code>o</code></dt><dd>
+                The object path of the newly found NSP.
+            </dd></dl></div></div><div class="signal"><h3><a name="org.freedesktop.NetworkManager.Device.WiMax.NspRemoved" id="org.freedesktop.NetworkManager.Device.WiMax.NspRemoved">NspRemoved</a> (
+        o: nsp
+        )</h3><div class="docstring">
+            Emitted when an NSP disappears from view of the device.
+        </div><div><h4>Parameters</h4><dl><dt><code>nsp</code> -
+      <code>o</code></dt><dd>
+                The object path of the NSP that has disappeared.
+            </dd></dl></div></div><h2>Properties:</h2><dl><dt><code>HwAddress</code> -
+      <code>s</code> -
+      <code>(read)</code></dt><dd>
+        Hardware address of the device.
+      </dd><dt><code>CenterFrequency</code> -
+      <code>u</code> -
+      <code>(read)</code></dt><dd>
+        Center frequency (in KHz) of the radio channel the device is using to
+        communicate with the network when connected.  Has no meaning when the
+        device is not connected.
+      </dd><dt><code>Rssi</code> -
+      <code>i</code> -
+      <code>(read)</code></dt><dd>
+        RSSI of the current radio link in dBm.  This value indicates how strong
+        the raw received RF signal from the base station is, but does not
+        indicate the overall quality of the radio link.  Has no meaning when the
+        device is not connected.
+      </dd><dt><code>Cinr</code> -
+      <code>i</code> -
+      <code>(read)</code></dt><dd>
+        CINR (Carrier to Interference + Noise Ratio) of the current radio link
+        in dB.  CINR is a more accurate measure of radio link quality.  Has no
+        meaning when the device is not connected.
+      </dd><dt><code>TxPower</code> -
+      <code>i</code> -
+      <code>(read)</code></dt><dd>
+        Average power of the last burst transmitted by the device, in units of
+        0.5 dBm.  i.e. a TxPower of -11 represents an actual device TX power of
+        -5.5 dBm.  Has no meaning when the device is not connected.
+      </dd><dt><code>Bsid</code> -
+      <code>s</code> -
+      <code>(read)</code></dt><dd>
+        The ID of the serving base station as received from the network.  Has
+        no meaning when the device is not connected.
+      </dd><dt><code>ActiveNsp</code> -
+      <code>o</code> -
+      <code>(read)</code></dt><dd>
+        Object path of the NSP currently used by the WiMax device.
+      </dd></dl>
+
+  <h1><a name="org.freedesktop.NetworkManager.WiMax.Nsp" id="org.freedesktop.NetworkManager.WiMax.Nsp"></a>org.freedesktop.NetworkManager.WiMax.Nsp</h1><p>Interface has no methods.</p><h2>Signals:</h2><div class="signal"><h3><a name="org.freedesktop.NetworkManager.WiMax.Nsp.PropertiesChanged" id="org.freedesktop.NetworkManager.WiMax.Nsp.PropertiesChanged">PropertiesChanged</a> (
+        a{sv}: properties
+        )</h3><div class="docstring"></div><div><h4>Parameters</h4><dl><dt><code>properties</code> -
+      <code>a{sv}</code>
+      (<a xmlns="" href="#type-String_Variant_Map">String_Variant_Map</a>)
+    </dt><dd>
+                A dictionary mapping property names to variant boxed values.
+            </dd></dl></div></div><h2>Properties:</h2><dl><dt><code>Name</code> -
+      <code>s</code> -
+      <code>(read)</code></dt><dd>The name of the NSP.</dd><dt><code>SignalQuality</code> -
+      <code>u</code> -
+      <code>(read)</code></dt><dd>The current signal quality of the NSP, in percent.</dd><dt><code>NetworkType</code> -
+      <code>u</code> -
+      <code>(read)</code>
+      (<a xmlns="" href="#type-NM_WIMAX_NSP_NETWORK_TYPE">NM_WIMAX_NSP_NETWORK_TYPE</a>)
+    </dt><dd>The network type of the NSP.</dd></dl><h2>Sets of flags:</h2><h3 xmlns=""><a name="type-NM_WIMAX_NSP_NETWORK_TYPE" id="type-NM_WIMAX_NSP_NETWORK_TYPE">NM_WIMAX_NSP_NETWORK_TYPE</a></h3>
+        Network type of the NSP.
+      <dl><dt><code>NM_WIMAX_NSP_NETWORK_TYPE_UNKNOWN = 0x0</code></dt><dd>Unknown network.</dd><dt><code>NM_WIMAX_NSP_NETWORK_TYPE_HOME = 0x1</code></dt><dd>Home network.</dd><dt><code>NM_WIMAX_NSP_NETWORK_TYPE_PARTNER = 0x2</code></dt><dd>Partner network.</dd><dt><code>NM_WIMAX_NSP_NETWORK_TYPE_ROAMING_PARTNER = 0x3</code></dt><dd>Roaming partner network.</dd></dl>
+
+  <h1><a name="org.freedesktop.NetworkManager.IP4Config" id="org.freedesktop.NetworkManager.IP4Config"></a>org.freedesktop.NetworkManager.IP4Config</h1><p>Interface has no methods.</p><p>Interface has no signals.</p><h2>Properties:</h2><dl><dt><code>Addresses</code> -
+      <code>aau</code> -
+      <code>(read)</code></dt><dd>Array of tuples of IPv4 address/prefix/gateway.  All 3
+      elements of each tuple are in network byte order.  Essentially:
+      [(addr, prefix, gateway), (addr, prefix, gateway), ...]
+      </dd><dt><code>Nameservers</code> -
+      <code>au</code> -
+      <code>(read)</code></dt><dd>The nameservers in use.</dd><dt><code>WinsServers</code> -
+      <code>au</code> -
+      <code>(read)</code></dt><dd>The Windows Internet Name Service servers associated with the connection.  Each address is in network byte order.</dd><dt><code>Domains</code> -
+      <code>as</code> -
+      <code>(read)</code></dt><dd>A list of domains this address belongs to.</dd><dt><code>Routes</code> -
+      <code>aau</code> -
+      <code>(read)</code></dt><dd>Tuples of IPv4 route/prefix/next-hop/metric.  All 4 elements
+      of each tuple are in network byte order.  'route' and 'next hop' are IPv4
+      addresses, while prefix and metric are simple unsigned integers.  Essentially:
+      [(route, prefix, next-hop, metric), (route, prefix, next-hop, metric), ...]
+      </dd></dl>
+
+  <h1><a name="org.freedesktop.NetworkManager.IP6Config" id="org.freedesktop.NetworkManager.IP6Config"></a>org.freedesktop.NetworkManager.IP6Config</h1><p>Interface has no methods.</p><p>Interface has no signals.</p><h2>Properties:</h2><dl><dt><code>Addresses</code> -
+      <code>a(ayuay)</code> -
+      <code>(read)</code></dt><dd>Tuples of IPv6 address/prefix/gateway.</dd><dt><code>Nameservers</code> -
+      <code>aay</code> -
+      <code>(read)</code></dt><dd>The nameservers in use.</dd><dt><code>Domains</code> -
+      <code>as</code> -
+      <code>(read)</code></dt><dd>A list of domains this address belongs to.</dd><dt><code>Routes</code> -
+      <code>a(ayuayu)</code> -
+      <code>(read)</code></dt><dd>Tuples of IPv6 route/prefix/next-hop/metric.</dd></dl>
+
+    <h1><a name="org.freedesktop.NetworkManager.DHCP4Config" id="org.freedesktop.NetworkManager.DHCP4Config"></a>org.freedesktop.NetworkManager.DHCP4Config</h1>
+            Options and configuration returned by the IPv4 DHCP server.
+        <p>Interface has no methods.</p><h2>Signals:</h2><div class="signal"><h3><a name="org.freedesktop.NetworkManager.DHCP4Config.PropertiesChanged" id="org.freedesktop.NetworkManager.DHCP4Config.PropertiesChanged">PropertiesChanged</a> (
+        a{sv}: properties
+        )</h3><div class="docstring"></div><div><h4>Parameters</h4><dl><dt><code>properties</code> -
+      <code>a{sv}</code>
+      (<a xmlns="" href="#type-String_Variant_Map">String_Variant_Map</a>)
+    </dt><dd>
+                    A dictionary mapping property names to variant boxed values
+                </dd></dl></div></div><h2>Properties:</h2><dl><dt><code>Options</code> -
+      <code>a{sv}</code> -
+      <code>(read)</code></dt><dd>Configuration options returned by a DHCP server, if any.</dd></dl>
+
+    <h1><a name="org.freedesktop.NetworkManager.DHCP6Config" id="org.freedesktop.NetworkManager.DHCP6Config"></a>org.freedesktop.NetworkManager.DHCP6Config</h1>
+            Options and configuration returned by the IPv6 DHCP server.
+        <p>Interface has no methods.</p><h2>Signals:</h2><div class="signal"><h3><a name="org.freedesktop.NetworkManager.DHCP6Config.PropertiesChanged" id="org.freedesktop.NetworkManager.DHCP6Config.PropertiesChanged">PropertiesChanged</a> (
+        a{sv}: properties
+        )</h3><div class="docstring"></div><div><h4>Parameters</h4><dl><dt><code>properties</code> -
+      <code>a{sv}</code>
+      (<a xmlns="" href="#type-String_Variant_Map">String_Variant_Map</a>)
+    </dt><dd>
+                    A dictionary mapping property names to variant boxed values
+                </dd></dl></div></div><h2>Properties:</h2><dl><dt><code>Options</code> -
+      <code>a{sv}</code> -
+      <code>(read)</code></dt><dd>Configuration options returned by a DHCP server, if any.</dd></dl>
+
+  <h1><a name="org.freedesktop.NetworkManager.Settings" id="org.freedesktop.NetworkManager.Settings"></a>org.freedesktop.NetworkManager.Settings</h1>
+      The Settings interface allows clients to view and administrate the connections stored and used by NetworkManager.
+    <h2>Methods:</h2><div class="method"><h3><a name="org.freedesktop.NetworkManager.Settings.ListConnections" id="org.freedesktop.NetworkManager.Settings.ListConnections">ListConnections</a> (
+        
+        ) &#8594;
+        ao</h3><div class="docstring">
+        List the connections stored by this Settings object.
+      </div><div><h4>Returns</h4><dl><dt><code>connections</code> -
+      <code>ao</code></dt><dd>
+          List of connections.
+        </dd></dl></div></div><div class="method"><h3><a name="org.freedesktop.NetworkManager.Settings.AddConnection" id="org.freedesktop.NetworkManager.Settings.AddConnection">AddConnection</a> (
+        a{sa{sv}}: connection
+        ) &#8594;
+        o</h3><div class="docstring">
+        Add new connection.
+      </div><div><h4>Parameters</h4><dl><dt><code>connection</code> -
+      <code>a{sa{sv}}</code></dt><dd>
+          Connection settings and properties.
+        </dd></dl></div><div><h4>Returns</h4><dl><dt><code>path</code> -
+      <code>o</code></dt><dd>
+          Object path of the new connection that was just added.
+        </dd></dl></div></div><div class="method"><h3><a name="org.freedesktop.NetworkManager.Settings.SaveHostname" id="org.freedesktop.NetworkManager.Settings.SaveHostname">SaveHostname</a> (
+        s: hostname
+        ) &#8594;
+        nothing</h3><div class="docstring">
+        Save the hostname to persistent configuration.
+      </div><div><h4>Parameters</h4><dl><dt><code>hostname</code> -
+      <code>s</code></dt><dd>
+          The hostname to save to persistent configuration.  If blank, the persistent hostname is cleared.
+        </dd></dl></div></div><h2>Signals:</h2><div class="signal"><h3><a name="org.freedesktop.NetworkManager.Settings.PropertiesChanged" id="org.freedesktop.NetworkManager.Settings.PropertiesChanged">PropertiesChanged</a> (
+        a{sv}: properties
+        )</h3><div class="docstring"></div><div><h4>Parameters</h4><dl><dt><code>properties</code> -
+      <code>a{sv}</code>
+      (<a xmlns="" href="#type-String_Variant_Map">String_Variant_Map</a>)
+    </dt><dd>
+                A dictionary mapping property names to variant boxed values
+            </dd></dl></div></div><div class="signal"><h3><a name="org.freedesktop.NetworkManager.Settings.NewConnection" id="org.freedesktop.NetworkManager.Settings.NewConnection">NewConnection</a> (
+        o: connection
+        )</h3><div class="docstring">
+        Emitted when a new connection has been added.
+      </div><div><h4>Parameters</h4><dl><dt><code>connection</code> -
+      <code>o</code></dt><dd>
+          Object path of the new connection.
+        </dd></dl></div></div><h2>Properties:</h2><dl><dt><code>Hostname</code> -
+      <code>s</code> -
+      <code>(read)</code></dt><dd>
+        The machine hostname stored in persistent configuration.
+      </dd><dt><code>CanModify</code> -
+      <code>b</code> -
+      <code>(read)</code></dt><dd>
+        If true, adding and modifying connections is supported.
+      </dd></dl>
+
+
+    <h1><a name="org.freedesktop.NetworkManager.Settings.Connection" id="org.freedesktop.NetworkManager.Settings.Connection"></a>org.freedesktop.NetworkManager.Settings.Connection</h1>
+            Represents a single network connection configuration.
+        <h2>Methods:</h2><div class="method"><h3><a name="org.freedesktop.NetworkManager.Settings.Connection.Update" id="org.freedesktop.NetworkManager.Settings.Connection.Update">Update</a> (
+        a{sa{sv}}: properties
+        ) &#8594;
+        nothing</h3><div class="docstring">
+            Update the connection with new settings and properties, replacing
+            all previous settings and properties.  Secrets may be part of the
+            update request, and will be either stored in persistent storage or
+            given to a Secret Agent for storage, depending on the request.
+          </div><div><h4>Parameters</h4><dl><dt><code>properties</code> -
+      <code>a{sa{sv}}</code></dt><dd>
+              New connection settings, properties, and (optionally) secrets.
+            </dd></dl></div></div><div class="method"><h3><a name="org.freedesktop.NetworkManager.Settings.Connection.Delete" id="org.freedesktop.NetworkManager.Settings.Connection.Delete">Delete</a> (
+        
+        ) &#8594;
+        nothing</h3><div class="docstring">
+            Delete the connection.
+          </div></div><div class="method"><h3><a name="org.freedesktop.NetworkManager.Settings.Connection.GetSettings" id="org.freedesktop.NetworkManager.Settings.Connection.GetSettings">GetSettings</a> (
+        
+        ) &#8594;
+        a{sa{sv}}</h3><div class="docstring">
+                Get the settings maps describing this network configuration.
+                This will never include any secrets required for connection
+                to the network, as those are often protected.  Secrets must
+                be requested separately using the GetSecrets() call.
+            </div><div><h4>Returns</h4><dl><dt><code>settings</code> -
+      <code>a{sa{sv}}</code>
+      (<a xmlns="" href="#type-String_String_Variant_Map_Map">String_String_Variant_Map_Map</a>)
+    </dt><dd>
+                    The nested settings maps describing this object.
+                </dd></dl></div></div><div class="method"><h3><a name="org.freedesktop.NetworkManager.Settings.Connection.GetSecrets" id="org.freedesktop.NetworkManager.Settings.Connection.GetSecrets">GetSecrets</a> (
+        s: setting_name
+        ) &#8594;
+        a{sa{sv}}</h3><div class="docstring">
+                Get the secrets belonging to this network configuration.  Only
+                secrets from persistent storage or a Secret Agent running in
+                the requestor's session will be returned.  The user will never
+                be prompted for secrets as a result of this request.
+            </div><div><h4>Parameters</h4><dl><dt><code>setting_name</code> -
+      <code>s</code></dt><dd>
+                    Name of the setting to return secrets for.  If empty, all
+                    all secrets will be returned.
+                </dd></dl></div><div><h4>Returns</h4><dl><dt><code>secrets</code> -
+      <code>a{sa{sv}}</code>
+      (<a xmlns="" href="#type-String_String_Variant_Map_Map">String_String_Variant_Map_Map</a>)
+    </dt><dd>
+                    Nested settings maps containing secrets.
+                </dd></dl></div></div><h2>Signals:</h2><div class="signal"><h3><a name="org.freedesktop.NetworkManager.Settings.Connection.Updated" id="org.freedesktop.NetworkManager.Settings.Connection.Updated">Updated</a> (
+        
+        )</h3><div class="docstring">
+                Emitted when any settings or permissions change.  When handling
+                this signal, clients should re-read the connection using the
+                GetSettings method to get the changes and to ensure the client
+                still has permission to access the connection.
+            </div></div><div class="signal"><h3><a name="org.freedesktop.NetworkManager.Settings.Connection.Removed" id="org.freedesktop.NetworkManager.Settings.Connection.Removed">Removed</a> (
+        
+        )</h3><div class="docstring">
+                Emitted when this connection is no longer available.  This
+                happens when the connection is deleted or if it is no longer
+                accessable by any of the system's logged-in users.  After
+                receipt of this signal, the object no longer exists.
+            </div></div><p>Interface has no properties.</p>
+
+
+  <h1><a name="org.freedesktop.NetworkManager.Connection.Active" id="org.freedesktop.NetworkManager.Connection.Active"></a>org.freedesktop.NetworkManager.Connection.Active</h1><p>Interface has no methods.</p><h2>Signals:</h2><div class="signal"><h3><a name="org.freedesktop.NetworkManager.Connection.Active.PropertiesChanged" id="org.freedesktop.NetworkManager.Connection.Active.PropertiesChanged">PropertiesChanged</a> (
+        a{sv}: properties
+        )</h3><div class="docstring"></div><div><h4>Parameters</h4><dl><dt><code>properties</code> -
+      <code>a{sv}</code>
+      (<a xmlns="" href="#type-String_Variant_Map">String_Variant_Map</a>)
+    </dt><dd>
+                A dictionary mapping property names to variant boxed values
+            </dd></dl></div></div><h2>Properties:</h2><dl><dt><code>Connection</code> -
+      <code>o</code> -
+      <code>(read)</code></dt><dd>The path of the connection.</dd><dt><code>SpecificObject</code> -
+      <code>o</code> -
+      <code>(read)</code></dt><dd>A specific object associated with the active connection.</dd><dt><code>Devices</code> -
+      <code>ao</code> -
+      <code>(read)</code></dt><dd>Array of object paths representing devices which are part of this active connection.</dd><dt><code>State</code> -
+      <code>u</code> -
+      <code>(read)</code>
+      (<a xmlns="" href="#type-NM_ACTIVE_CONNECTION_STATE">NM_ACTIVE_CONNECTION_STATE</a>)
+    </dt><dd>The state of this active connection.</dd><dt><code>Default</code> -
+      <code>b</code> -
+      <code>(read)</code></dt><dd>Whether this active connection is the default IPv4 connection, i.e. whether it currently owns the default IPv4 route.</dd><dt><code>Default6</code> -
+      <code>b</code> -
+      <code>(read)</code></dt><dd>Whether this active connection is the default IPv6 connection, i.e. whether it currently owns the default IPv6 route.</dd><dt><code>Vpn</code> -
+      <code>b</code> -
+      <code>(read)</code></dt><dd>Whether this active connection is also a VPN connection.</dd></dl><h2>Enumerated types:</h2><h3><a name="type-NM_ACTIVE_CONNECTION_STATE" id="type-NM_ACTIVE_CONNECTION_STATE">NM_ACTIVE_CONNECTION_STATE</a></h3><dl><dt><code>NM_ACTIVE_CONNECTION_STATE_UNKNOWN = 0</code></dt><dd>
+          The active connection is in an unknown state.
+        </dd><dt><code>NM_ACTIVE_CONNECTION_STATE_ACTIVATING = 1</code></dt><dd>
+          The connection is activating.
+        </dd><dt><code>NM_ACTIVE_CONNECTION_STATE_ACTIVATED = 2</code></dt><dd>
+          The connection is activated.
+        </dd><dt><code>NM_ACTIVE_CONNECTION_STATE_DEACTIVATING = 3</code></dt><dd>
+          The connection is being torn down and cleaned up.
+        </dd></dl>
+
+  <h1><a name="org.freedesktop.NetworkManager.AgentManager" id="org.freedesktop.NetworkManager.AgentManager"></a>org.freedesktop.NetworkManager.AgentManager</h1><h2>Methods:</h2><div class="method"><h3><a name="org.freedesktop.NetworkManager.AgentManager.Register" id="org.freedesktop.NetworkManager.AgentManager.Register">Register</a> (
+        s: identifier
+        ) &#8594;
+        nothing</h3><div class="docstring">
+        Called by secret Agents to register their ability to provide and save
+        network secrets.
+      </div><div><h4>Parameters</h4><dl><dt><code>identifier</code> -
+      <code>s</code></dt><dd>
+          Identifies this agent; only one agent in each user session may use the
+          same identifier.  Identifier formatting follows the same rules as
+          D-Bus bus names with the exception that the ':' character is not
+          allowed.  The valid set of characters is "[A-Z][a-z][0-9]_-." and the
+          identifier is limited in length to 255 characters with a minimum
+          of 3 characters.  An example valid identifier is 'org.gnome.nm-applet'
+          (without quotes).
+        </dd></dl></div></div><div class="method"><h3><a name="org.freedesktop.NetworkManager.AgentManager.Unregister" id="org.freedesktop.NetworkManager.AgentManager.Unregister">Unregister</a> (
+        
+        ) &#8594;
+        nothing</h3><div class="docstring">
+        Called by secret Agents to notify NetworkManager that they will no
+        longer handle requests for network secrets.  Agents are automatically
+        unregistered when they disconnect from D-Bus.
+      </div></div><p>Interface has no signals.</p><p>Interface has no properties.</p>
+
+  <h1><a name="org.freedesktop.NetworkManager.VPN.Connection" id="org.freedesktop.NetworkManager.VPN.Connection"></a>org.freedesktop.NetworkManager.VPN.Connection</h1>
+      Represents an active connection to a Virtual Private Network.
+    <p>Interface has no methods.</p><h2>Signals:</h2><div class="signal"><h3><a name="org.freedesktop.NetworkManager.VPN.Connection.PropertiesChanged" id="org.freedesktop.NetworkManager.VPN.Connection.PropertiesChanged">PropertiesChanged</a> (
+        a{sv}: properties
+        )</h3><div class="docstring"></div><div><h4>Parameters</h4><dl><dt><code>properties</code> -
+      <code>a{sv}</code>
+      (<a xmlns="" href="#type-String_Variant_Map">String_Variant_Map</a>)
+    </dt><dd>
+                A dictionary mapping property names to variant boxed values
+            </dd></dl></div></div><div class="signal"><h3><a name="org.freedesktop.NetworkManager.VPN.Connection.VpnStateChanged" id="org.freedesktop.NetworkManager.VPN.Connection.VpnStateChanged">VpnStateChanged</a> (
+        u: state, u: reason
+        )</h3><div class="docstring">
+        Emitted when the state of the VPN connection has changed.
+      </div><div><h4>Parameters</h4><dl><dt><code>state</code> -
+      <code>u</code>
+      (<a xmlns="" href="#type-NM_VPN_CONNECTION_STATE">NM_VPN_CONNECTION_STATE</a>)
+    </dt><dd>
+          The new state of the VPN connection.
+        </dd><dt><code>reason</code> -
+      <code>u</code>
+      (<a xmlns="" href="#type-NM_VPN_CONNECTION_STATE_REASON">NM_VPN_CONNECTION_STATE_REASON</a>)
+    </dt><dd>
+          Reason code describing the change to the new state.
+        </dd></dl></div></div><h2>Properties:</h2><dl><dt><code>VpnState</code> -
+      <code>u</code> -
+      <code>(read)</code>
+      (<a xmlns="" href="#type-NM_VPN_CONNECTION_STATE">NM_VPN_CONNECTION_STATE</a>)
+    </dt><dd>The VPN-specific state of the connection.</dd><dt><code>Banner</code> -
+      <code>s</code> -
+      <code>(read)</code></dt><dd>The banner string of the VPN connection.</dd></dl><h2>Enumerated types:</h2><h3><a name="type-NM_VPN_CONNECTION_STATE" id="type-NM_VPN_CONNECTION_STATE">NM_VPN_CONNECTION_STATE</a></h3><dl><dt><code>NM_VPN_CONNECTION_STATE_UNKNOWN = 0</code></dt><dd>
+          The state of the VPN connection is unknown.
+        </dd><dt><code>NM_VPN_CONNECTION_STATE_PREPARE = 1</code></dt><dd>
+          The VPN connection is preparing to connect.
+        </dd><dt><code>NM_VPN_CONNECTION_STATE_NEED_AUTH = 2</code></dt><dd>
+          The VPN connection needs authorization credentials.
+        </dd><dt><code>NM_VPN_CONNECTION_STATE_CONNECT = 3</code></dt><dd>
+          The VPN connection is being established.  FIXME: Should be CONNECTING or CONNECTED.
+        </dd><dt><code>NM_VPN_CONNECTION_STATE_IP_CONFIG_GET = 4</code></dt><dd>
+          The VPN connection is getting an IP address.  FIXME: Should be an -ING 
+        </dd><dt><code>NM_VPN_CONNECTION_STATE_ACTIVATED = 5</code></dt><dd>
+          The VPN connection is active.
+        </dd><dt><code>NM_VPN_CONNECTION_STATE_FAILED = 6</code></dt><dd>
+          The VPN connection failed.
+        </dd><dt><code>NM_VPN_CONNECTION_STATE_DISCONNECTED = 7</code></dt><dd>
+          The VPN connection is disconnected.
+        </dd></dl><h3><a name="type-NM_VPN_CONNECTION_STATE_REASON" id="type-NM_VPN_CONNECTION_STATE_REASON">NM_VPN_CONNECTION_STATE_REASON</a></h3><dl><dt><code>NM_VPN_CONNECTION_STATE_REASON_UNKNOWN = 0</code></dt><dd>
+          The reason for the VPN connection state change is unknown.
+        </dd><dt><code>NM_VPN_CONNECTION_STATE_REASON_NONE = 1</code></dt><dd>
+          No reason was given for the VPN connection state change.
+        </dd><dt><code>NM_VPN_CONNECTION_STATE_REASON_USER_DISCONNECTED = 2</code></dt><dd>
+          The VPN connection changed state because the user disconnected it.
+        </dd><dt><code>NM_VPN_CONNECTION_STATE_REASON_DEVICE_DISCONNECTED = 3</code></dt><dd>
+          The VPN connection changed state because the device it was using was disconnected.
+        </dd><dt><code>NM_VPN_CONNECTION_STATE_REASON_SERVICE_STOPPED = 4</code></dt><dd>
+          The service providing the VPN connection was stopped.
+        </dd><dt><code>NM_VPN_CONNECTION_STATE_REASON_IP_CONFIG_INVALID = 5</code></dt><dd>
+          The IP config of the VPN connection was invalid.
+        </dd><dt><code>NM_VPN_CONNECTION_STATE_REASON_CONNECT_TIMEOUT = 6</code></dt><dd>
+          The connection attempt to the VPN service timed out.
+        </dd><dt><code>NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_TIMEOUT = 7</code></dt><dd>
+          A timeout occurred while starting the service providing the VPN connection.
+        </dd><dt><code>NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_FAILED = 8</code></dt><dd>
+          Starting the service starting the service providing the VPN connection failed.
+        </dd><dt><code>NM_VPN_CONNECTION_STATE_REASON_NO_SECRETS = 9</code></dt><dd>
+          Necessary secrets for the VPN connection were not provided.
+        </dd><dt><code>NM_VPN_CONNECTION_STATE_REASON_LOGIN_FAILED = 10</code></dt><dd>
+          Authentication to the VPN server failed.
+        </dd><dt><code>NM_VPN_CONNECTION_STATE_REASON_CONNECTION_REMOVED = 11</code></dt><dd>
+          The connection was deleted from settings.
+        </dd></dl>
+
+  <h1><a name="org.freedesktop.NetworkManager.VPN.Plugin" id="org.freedesktop.NetworkManager.VPN.Plugin"></a>org.freedesktop.NetworkManager.VPN.Plugin</h1>
+      This interface is provided by plugins providing VPN services to the NetworkManager daemon.
+    <h2>Methods:</h2><div class="method"><h3><a name="org.freedesktop.NetworkManager.VPN.Plugin.Connect" id="org.freedesktop.NetworkManager.VPN.Plugin.Connect">Connect</a> (
+        a{sa{sv}}: connection
+        ) &#8594;
+        nothing</h3><div class="docstring">
+        Tells the plugin to connect.
+      </div><div><h4>Parameters</h4><dl><dt><code>connection</code> -
+      <code>a{sa{sv}}</code>
+      (<a xmlns="" href="#type-String_String_Variant_Map_Map">String_String_Variant_Map_Map</a>)
+    </dt><dd>
+          Describes the connection to be established.
+        </dd></dl></div><div><h4>Possible errors</h4><dl><dt><code>org.freedesktop.NetworkManager.VPN.Error.StartingInProgress</code></dt><dd>The request could not be processed because the VPN connection is already being started.<em>(generic description)</em></dd><dt><code>org.freedesktop.NetworkManager.VPN.Error.AlreadyStarted</code></dt><dd>The request could not be processed because a VPN connection was already active.<em>(generic description)</em></dd><dt><code>org.freedesktop.NetworkManager.VPN.Error.StoppingInProgress</code></dt><dd>The request could not be processed because the VPN connection is already being stopped.<em>(generic description)</em></dd><dt><code>org.freedesktop.NetworkManager.VPN.Error.BadArguments</code></dt><dd>Invalid arguments were passed with the request.  FIXME: too general.<em>(generic description)</em></dd><dt><code>org.freedesktop.NetworkManager.VPN.Error.LaunchFailed</code></dt><dd>A binary providing the service failed to launch.<em>(generic description)</em></dd></dl></div></div><div class="method"><h3><a name="org.freedesktop.NetworkManager.VPN.Plugin.NeedSecrets" id="org.freedesktop.NetworkManager.VPN.Plugin.NeedSecrets">NeedSecrets</a> (
+        a{sa{sv}}: settings
+        ) &#8594;
+        s</h3><div class="docstring">
+        Asks the plugin whether the provided connection will require secrets to connect successfully.
+      </div><div><h4>Parameters</h4><dl><dt><code>settings</code> -
+      <code>a{sa{sv}}</code>
+      (<a xmlns="" href="#type-String_String_Variant_Map_Map">String_String_Variant_Map_Map</a>)
+    </dt><dd>
+          Describes the connection that may need secrets.
+        </dd></dl></div><div><h4>Returns</h4><dl><dt><code>setting_name</code> -
+      <code>s</code></dt><dd>
+          The setting name within the provided connection that requires secrets, if any.
+        </dd></dl></div><div><h4>Possible errors</h4><dl><dt><code>org.freedesktop.NetworkManager.VPN.Error.ConnectionInvalid</code></dt><dd>The request could not be processed because the VPN connection settings were invalid.<em>(generic description)</em></dd></dl></div></div><div class="method"><h3><a name="org.freedesktop.NetworkManager.VPN.Plugin.Disconnect" id="org.freedesktop.NetworkManager.VPN.Plugin.Disconnect">Disconnect</a> (
+        
+        ) &#8594;
+        nothing</h3><div class="docstring">
+        Disconnect the plugin.
+      </div><div><h4>Possible errors</h4><dl><dt><code>org.freedesktop.NetworkManager.VPN.Error.StoppingInProgress</code></dt><dd>The request could not be processed because the VPN connection is already being stopped.<em>(generic description)</em></dd><dt><code>org.freedesktop.NetworkManager.VPN.Error.AlreadyStopped</code></dt><dd>The request could not be processed because the VPN connection was already stopped.<em>(generic description)</em></dd></dl></div></div><div class="method"><h3><a name="org.freedesktop.NetworkManager.VPN.Plugin.SetIp4Config" id="org.freedesktop.NetworkManager.VPN.Plugin.SetIp4Config">SetIp4Config</a> (
+        a{sv}: config
+        ) &#8594;
+        nothing</h3><div class="docstring">
+        Set IPv4 details on the connection.
+      </div><div><h4>Parameters</h4><dl><dt><code>config</code> -
+      <code>a{sv}</code>
+      (<a xmlns="" href="#type-String_Variant_Map">String_Variant_Map</a>)
+    </dt><dd>
+          Ip4Config details for the conneciton.
+        </dd></dl></div></div><div class="method"><h3><a name="org.freedesktop.NetworkManager.VPN.Plugin.SetFailure" id="org.freedesktop.NetworkManager.VPN.Plugin.SetFailure">SetFailure</a> (
+        s: reason
+        ) &#8594;
+        nothing</h3><div class="docstring">
+        Indicate a failure to the plugin.
+      </div><div><h4>Parameters</h4><dl><dt><code>reason</code> -
+      <code>s</code></dt><dd>
+          The reason for the failure.
+        </dd></dl></div></div><h2>Signals:</h2><div class="signal"><h3><a name="org.freedesktop.NetworkManager.VPN.Plugin.StateChanged" id="org.freedesktop.NetworkManager.VPN.Plugin.StateChanged">StateChanged</a> (
+        u: state
+        )</h3><div class="docstring">
+        Emitted when the plugin state changes.
+      </div><div><h4>Parameters</h4><dl><dt><code>state</code> -
+      <code>u</code>
+      (<a xmlns="" href="#type-NM_VPN_CONNECTION_STATE">NM_VPN_CONNECTION_STATE</a>)
+    </dt><dd>
+          The new state of the plugin.
+        </dd></dl></div></div><div class="signal"><h3><a name="org.freedesktop.NetworkManager.VPN.Plugin.Ip4Config" id="org.freedesktop.NetworkManager.VPN.Plugin.Ip4Config">Ip4Config</a> (
+        a{sv}: ip4config
+        )</h3><div class="docstring">
+        The plugin obtained an IPv4 configuration.
+      </div><div><h4>Parameters</h4><dl><dt><code>ip4config</code> -
+      <code>a{sv}</code>
+      (<a xmlns="" href="#type-String_Variant_Map">String_Variant_Map</a>)
+    </dt><dd>
+          The IPv4 configuration.
+        </dd></dl></div></div><div class="signal"><h3><a name="org.freedesktop.NetworkManager.VPN.Plugin.LoginBanner" id="org.freedesktop.NetworkManager.VPN.Plugin.LoginBanner">LoginBanner</a> (
+        s: banner
+        )</h3><div class="docstring">
+        Emitted when the plugin receives a login banner from the VPN service.
+      </div><div><h4>Parameters</h4><dl><dt><code>banner</code> -
+      <code>s</code></dt><dd>
+          The login banner string.
+        </dd></dl></div></div><div class="signal"><h3><a name="org.freedesktop.NetworkManager.VPN.Plugin.Failure" id="org.freedesktop.NetworkManager.VPN.Plugin.Failure">Failure</a> (
+        u: reason
+        )</h3><div class="docstring">
+        Emitted when a failure in the VPN plugin occurs.
+      </div><div><h4>Parameters</h4><dl><dt><code>reason</code> -
+      <code>u</code>
+      (<a xmlns="" href="#type-NM_VPN_PLUGIN_FAILURE">NM_VPN_PLUGIN_FAILURE</a>)
+    </dt><dd>
+          Reason code for the failure.
+        </dd></dl></div></div><h2>Properties:</h2><dl><dt><code>State</code> -
+      <code>u</code> -
+      <code>(read)</code>
+      (<a xmlns="" href="#type-NM_VPN_CONNECTION_STATE">NM_VPN_CONNECTION_STATE</a>)
+    </dt><dd>
+        The state of the plugin.
+      </dd></dl><h2>Enumerated types:</h2><h3><a name="type-NM_VPN_PLUGIN_FAILURE" id="type-NM_VPN_PLUGIN_FAILURE">NM_VPN_PLUGIN_FAILURE</a></h3><dl><dt><code>NM_VPN_PLUGIN_FAILURE_LOGIN_FAILED = 0</code></dt><dd>
+          Login failed.
+        </dd><dt><code>NM_VPN_PLUGIN_FAILURE_CONNECT_FAILED = 1</code></dt><dd>
+          Connect failed.
+        </dd><dt><code>NM_VPN_PLUGIN_FAILURE_BAD_IP_CONFIG = 2</code></dt><dd>
+          Invalid IP configuration returned from the VPN plugin.
+        </dd></dl>
+<h1>Generic types:</h1><h2>Enumerated types:</h2><h3><a name="type-NM_802_11_MODE" id="type-NM_802_11_MODE">NM_802_11_MODE</a></h3><dl><dt><code>NM_802_11_MODE_UNKNOWN = 0</code></dt><dd>Mode is unknown.</dd><dt><code>NM_802_11_MODE_ADHOC = 1</code></dt><dd>Uncoordinated network without central infrastructure.</dd><dt><code>NM_802_11_MODE_INFRA = 2</code></dt><dd>Coordinated network with one or more central controllers.</dd></dl><h2>Mapping types:</h2><div class="struct"><h3><a name="type-String_Variant_Map" id="type-String_Variant_Map">String_Variant_Map</a> - a{
+        s: Key &#8594; v: Value
+        }
+      </h3><div class="docstring">A mapping from strings to variants representing extra
+      key-value pairs.</div><div><h4>Members</h4><dl><dt><code>Key</code> -
+      <code>s</code></dt><dd><em>(undocumented)</em></dd><dt><code>Value</code> -
+      <code>v</code></dt><dd><em>(undocumented)</em></dd></dl></div></div><div class="struct"><h3><a name="type-String_String_Map" id="type-String_String_Map">String_String_Map</a> - a{
+        s: Key &#8594; s: Value
+        }
+      </h3><div class="docstring">A mapping from strings to strings representing extra
+      key-value pairs.</div><div><h4>Members</h4><dl><dt><code>Key</code> -
+      <code>s</code></dt><dd><em>(undocumented)</em></dd><dt><code>Value</code> -
+      <code>s</code></dt><dd><em>(undocumented)</em></dd></dl></div></div><div class="struct"><h3><a name="type-String_String_Variant_Map_Map" id="type-String_String_Variant_Map_Map">String_String_Variant_Map_Map</a> - a{
+        s: Key &#8594; a{sv}: Value
+        }
+      </h3><div class="docstring">A mapping from strings to a map of string to variant.</div><div><h4>Members</h4><dl><dt><code>Key</code> -
+      <code>s</code></dt><dd><em>(undocumented)</em></dd><dt><code>Value</code> -
+      <code>a{sv}</code>
+      (<a xmlns="" href="#type-String_Variant_Map">String_Variant_Map</a>)
+    </dt><dd><em>(undocumented)</em></dd></dl></div></div><h1>Errors:</h1>
+  
+
+  <h2><a name="org.freedesktop.NetworkManager.Error.UnknownConnection" id="org.freedesktop.NetworkManager.Error.UnknownConnection"></a>org.freedesktop.NetworkManager.Error.UnknownConnection</h2>
+        Connection was not provided by the settings service.
+    
+
+  <h2><a name="org.freedesktop.NetworkManager.Error.UnknownDevice" id="org.freedesktop.NetworkManager.Error.UnknownDevice"></a>org.freedesktop.NetworkManager.Error.UnknownDevice</h2>
+        Unknown device.
+    
+
+  <h2><a name="org.freedesktop.NetworkManager.Error.PermissionDenied" id="org.freedesktop.NetworkManager.Error.PermissionDenied"></a>org.freedesktop.NetworkManager.Error.PermissionDenied</h2>
+    User does not have the permission to activate this connection.
+    
+
+<h1>Errors:</h1>
+  <h2><a name="org.freedesktop.NetworkManager.VPN.Error.General" id="org.freedesktop.NetworkManager.VPN.Error.General"></a>org.freedesktop.NetworkManager.VPN.Error.General</h2>This is a drab, nondescript error.
+  <h2><a name="org.freedesktop.NetworkManager.VPN.Error.StartingInProgress" id="org.freedesktop.NetworkManager.VPN.Error.StartingInProgress"></a>org.freedesktop.NetworkManager.VPN.Error.StartingInProgress</h2>The request could not be processed because the VPN connection is already being started.
+  <h2><a name="org.freedesktop.NetworkManager.VPN.Error.AlreadyStarted" id="org.freedesktop.NetworkManager.VPN.Error.AlreadyStarted"></a>org.freedesktop.NetworkManager.VPN.Error.AlreadyStarted</h2>The request could not be processed because a VPN connection was already active.
+  <h2><a name="org.freedesktop.NetworkManager.VPN.Error.StoppingInProgress" id="org.freedesktop.NetworkManager.VPN.Error.StoppingInProgress"></a>org.freedesktop.NetworkManager.VPN.Error.StoppingInProgress</h2>The request could not be processed because the VPN connection is already being stopped.
+  <h2><a name="org.freedesktop.NetworkManager.VPN.Error.AlreadyStopped" id="org.freedesktop.NetworkManager.VPN.Error.AlreadyStopped"></a>org.freedesktop.NetworkManager.VPN.Error.AlreadyStopped</h2>The request could not be processed because the VPN connection was already stopped.
+  <h2><a name="org.freedesktop.NetworkManager.VPN.Error.WrongState" id="org.freedesktop.NetworkManager.VPN.Error.WrongState"></a>org.freedesktop.NetworkManager.VPN.Error.WrongState</h2>The request could not be processed because the VPN connection is in the wrong state for this type of request. FIXME: too general?
+  <h2><a name="org.freedesktop.NetworkManager.VPN.Error.BadArguments" id="org.freedesktop.NetworkManager.VPN.Error.BadArguments"></a>org.freedesktop.NetworkManager.VPN.Error.BadArguments</h2>Invalid arguments were passed with the request.  FIXME: too general.
+  <h2><a name="org.freedesktop.NetworkManager.VPN.Error.LaunchFailed" id="org.freedesktop.NetworkManager.VPN.Error.LaunchFailed"></a>org.freedesktop.NetworkManager.VPN.Error.LaunchFailed</h2>A binary providing the service failed to launch.
+  <h2><a name="org.freedesktop.NetworkManager.VPN.Error.ConnectionInvalid" id="org.freedesktop.NetworkManager.VPN.Error.ConnectionInvalid"></a>org.freedesktop.NetworkManager.VPN.Error.ConnectionInvalid</h2>The request could not be processed because the VPN connection settings were invalid.
+<h1>Index</h1><h2>Index of interfaces</h2><ul><li><code><a href="#org.freedesktop.NetworkManager">org.freedesktop.NetworkManager</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.AccessPoint">org.freedesktop.NetworkManager.AccessPoint</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.Device">org.freedesktop.NetworkManager.Device</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.Device.Wired">org.freedesktop.NetworkManager.Device.Wired</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.Device.Wireless">org.freedesktop.NetworkManager.Device.Wireless</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.Device.Modem">org.freedesktop.NetworkManager.Device.Modem</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.Device.Bluetooth">org.freedesktop.NetworkManager.Device.Bluetooth</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.Device.OlpcMesh">org.freedesktop.NetworkManager.Device.OlpcMesh</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.Device.WiMax">org.freedesktop.NetworkManager.Device.WiMax</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.WiMax.Nsp">org.freedesktop.NetworkManager.WiMax.Nsp</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.IP4Config">org.freedesktop.NetworkManager.IP4Config</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.IP6Config">org.freedesktop.NetworkManager.IP6Config</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.DHCP4Config">org.freedesktop.NetworkManager.DHCP4Config</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.DHCP6Config">org.freedesktop.NetworkManager.DHCP6Config</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.Settings">org.freedesktop.NetworkManager.Settings</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.Settings.Connection">org.freedesktop.NetworkManager.Settings.Connection</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.Connection.Active">org.freedesktop.NetworkManager.Connection.Active</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.AgentManager">org.freedesktop.NetworkManager.AgentManager</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.VPN.Connection">org.freedesktop.NetworkManager.VPN.Connection</a></code></li><li><code><a href="#org.freedesktop.NetworkManager.VPN.Plugin">org.freedesktop.NetworkManager.VPN.Plugin</a></code></li></ul><h2>Index of types</h2><ul><li><code><a href="#type-NM_802_11_AP_FLAGS">NM_802_11_AP_FLAGS</a></code>
+    - u</li><li><code><a href="#type-NM_802_11_AP_SEC">NM_802_11_AP_SEC</a></code>
+    - u</li><li><code><a href="#type-NM_802_11_DEVICE_CAP">NM_802_11_DEVICE_CAP</a></code>
+    - u</li><li><code><a href="#type-NM_802_11_MODE">NM_802_11_MODE</a></code>
+    - u</li><li><code><a href="#type-NM_ACTIVE_CONNECTION_STATE">NM_ACTIVE_CONNECTION_STATE</a></code>
+    - u</li><li><code><a href="#type-NM_BT_CAPABILITIES">NM_BT_CAPABILITIES</a></code>
+    - u</li><li><code><a href="#type-NM_DEVICE_CAP">NM_DEVICE_CAP</a></code>
+    - u</li><li><code><a href="#type-NM_DEVICE_MODEM_CAPABILITIES">NM_DEVICE_MODEM_CAPABILITIES</a></code>
+    - u</li><li><code><a href="#type-NM_DEVICE_STATE">NM_DEVICE_STATE</a></code>
+    - u</li><li><code><a href="#type-NM_DEVICE_STATE_REASON">NM_DEVICE_STATE_REASON</a></code>
+    - u</li><li><code><a href="#type-NM_DEVICE_TYPE">NM_DEVICE_TYPE</a></code>
+    - u</li><li><code><a href="#type-NM_STATE">NM_STATE</a></code>
+    - u</li><li><code><a href="#type-NM_VPN_CONNECTION_STATE">NM_VPN_CONNECTION_STATE</a></code>
+    - u</li><li><code><a href="#type-NM_VPN_CONNECTION_STATE_REASON">NM_VPN_CONNECTION_STATE_REASON</a></code>
+    - u</li><li><code><a href="#type-NM_VPN_PLUGIN_FAILURE">NM_VPN_PLUGIN_FAILURE</a></code>
+    - u</li><li><code><a href="#type-NM_WIMAX_NSP_NETWORK_TYPE">NM_WIMAX_NSP_NETWORK_TYPE</a></code>
+    - u</li><li><code><a href="#type-String_String_Map">String_String_Map</a></code>
+    - a{ s &#8594; s }
+  </li><li><code><a href="#type-String_String_Variant_Map_Map">String_String_Variant_Map_Map</a></code>
+    - a{ s &#8594; a{sv} }
+  </li><li><code><a href="#type-String_Variant_Map">String_Variant_Map</a></code>
+    - a{ s &#8594; v }
+  </li></ul></body></html>
diff --git a/docs/api/version.xml b/docs/api/version.xml
new file mode 100644
index 000000000..ad75678a7
--- /dev/null
+++ b/docs/api/version.xml
@@ -0,0 +1 @@
+0.8.998
diff --git a/docs/api/version.xml.in b/docs/api/version.xml.in
new file mode 100644
index 000000000..d78bda934
--- /dev/null
+++ b/docs/api/version.xml.in
@@ -0,0 +1 @@
+@VERSION@
diff --git a/docs/libnm-glib/Makefile.am b/docs/libnm-glib/Makefile.am
index 4a3a6e1e1..7dfea79af 100644
--- a/docs/libnm-glib/Makefile.am
+++ b/docs/libnm-glib/Makefile.am
@@ -5,7 +5,7 @@ AUTOMAKE_OPTIONS = 1.6
 DOC_MODULE=libnm-glib
 
 # The top-level SGML file.
-DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
+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
@@ -43,20 +43,22 @@ IGNORE_HFILES= \
 	nm-device-bt-bindings.h \
 	nm-device-ethernet-bindings.h \
 	nm-device-wifi-bindings.h \
+	nm-device-modem-bindings.h \
+	nm-device-wimax-bindings.h \
 	nm-dhcp4-config-bindings.h \
 	nm-dhcp6-config-bindings.h \
-	nm-exported-connection-bindings.h \
-	nm-exported-connection-glue.h \
+	nm-settings-connection-glue.h \
 	nm-ip4-config-bindings.h \
 	nm-ip6-config-bindings.h \
 	nm-settings-bindings.h \
 	nm-settings-glue.h \
-	nm-settings-system-bindings.h \
+	nm-settings-connection-bindings.h \
+	nm-secret-agent-bindings.h \
 	nm-vpn-connection-bindings.h \
 	nm-vpn-plugin-glue.h
 
 # Images to copy into HTML directory.
-HTML_IMAGES = 
+HTML_IMAGES = libnm-glib.png
 
 # Extra XML files that are included by $(DOC_MAIN_SGML_FILE).
 content_files = 
diff --git a/docs/libnm-glib/Makefile.in b/docs/libnm-glib/Makefile.in
index 639a44947..d64f56a16 100644
--- a/docs/libnm-glib/Makefile.in
+++ b/docs/libnm-glib/Makefile.in
@@ -44,11 +44,16 @@ 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/gtk-doc.m4 $(top_srcdir)/m4/intltool.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)/configure.ac
+	$(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)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -65,7 +70,6 @@ SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -74,8 +78,6 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -92,6 +94,7 @@ DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCLIENT_VERSION = @DHCLIENT_VERSION@
 DHCPCD_PATH = @DHCPCD_PATH@
 DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -100,6 +103,7 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GIO_CFLAGS = @GIO_CFLAGS@
 GIO_LIBS = @GIO_LIBS@
@@ -108,8 +112,8 @@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_LIBS = @GLIB_LIBS@
 GMODULE_CFLAGS = @GMODULE_CFLAGS@
 GMODULE_LIBS = @GMODULE_LIBS@
-GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
 GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
 GREP = @GREP@
@@ -124,13 +128,23 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
 INTLLIBS = @INTLLIBS@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 IPTABLES_PATH = @IPTABLES_PATH@
+IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
+IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
@@ -138,6 +152,8 @@ LIBDL = @LIBDL@
 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
 LIBM = @LIBM@
 LIBNL_CFLAGS = @LIBNL_CFLAGS@
 LIBNL_LIBS = @LIBNL_LIBS@
@@ -146,13 +162,15 @@ LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
 NM = @NM@
 NMEDIT = @NMEDIT@
@@ -178,12 +196,9 @@ PKGCONFIG_PATH = @PKGCONFIG_PATH@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-POFILES = @POFILES@
 POLKIT_CFLAGS = @POLKIT_CFLAGS@
 POLKIT_LIBS = @POLKIT_LIBS@
 POSUB = @POSUB@
-PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
 PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
 RANLIB = @RANLIB@
 RESOLVCONF_PATH = @RESOLVCONF_PATH@
@@ -198,10 +213,13 @@ UUID_CFLAGS = @UUID_CFLAGS@
 UUID_LIBS = @UUID_LIBS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -256,7 +274,7 @@ AUTOMAKE_OPTIONS = 1.6
 DOC_MODULE = libnm-glib
 
 # The top-level SGML file.
-DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.sgml
+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
@@ -294,21 +312,23 @@ IGNORE_HFILES = \
 	nm-device-bt-bindings.h \
 	nm-device-ethernet-bindings.h \
 	nm-device-wifi-bindings.h \
+	nm-device-modem-bindings.h \
+	nm-device-wimax-bindings.h \
 	nm-dhcp4-config-bindings.h \
 	nm-dhcp6-config-bindings.h \
-	nm-exported-connection-bindings.h \
-	nm-exported-connection-glue.h \
+	nm-settings-connection-glue.h \
 	nm-ip4-config-bindings.h \
 	nm-ip6-config-bindings.h \
 	nm-settings-bindings.h \
 	nm-settings-glue.h \
-	nm-settings-system-bindings.h \
+	nm-settings-connection-bindings.h \
+	nm-secret-agent-bindings.h \
 	nm-vpn-connection-bindings.h \
 	nm-vpn-plugin-glue.h
 
 
 # Images to copy into HTML directory.
-HTML_IMAGES = 
+HTML_IMAGES = libnm-glib.png
 
 # Extra XML files that are included by $(DOC_MAIN_SGML_FILE).
 content_files = 
@@ -344,17 +364,18 @@ GTKDOC_LIBS = \
 #
 GPATH = $(srcdir)
 TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
-EXTRA_DIST = \
+SETUP_FILES = \
 	$(content_files)		\
-	$(HTML_IMAGES)			\
 	$(DOC_MAIN_SGML_FILE)		\
 	$(DOC_MODULE)-sections.txt	\
 	$(DOC_MODULE)-overrides.txt
 
-DOC_STAMPS = scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
-	pdf-build.stamp \
-	$(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp \
-	$(srcdir)/pdf.stamp
+EXTRA_DIST = \
+	$(SETUP_FILES)
+
+DOC_STAMPS = setup-build.stamp scan-build.stamp tmpl-build.stamp sgml-build.stamp \
+	html-build.stamp pdf-build.stamp \
+	setup.stamp tmpl.stamp sgml.stamp html.stamp pdf.stamp
 
 SCANOBJ_FILES = \
 	$(DOC_MODULE).args 	 \
@@ -576,20 +597,38 @@ docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
 
 $(REPORT_FILES): sgml-build.stamp
 
+#### setup ####
+
+setup-build.stamp:
+	-@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
+	   echo 'gtk-doc: Preparing build'; \
+	   files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \
+	   if test "x$$files" != "x" ; then \
+	       for file in $$files ; do \
+	           test -f $(abs_srcdir)/$$file && \
+	               cp -p $(abs_srcdir)/$$file $(abs_builddir)/; \
+	       done \
+	   fi; \
+	   test -f $(abs_srcdir)/tmpl && \
+	       cp -rp $(abs_srcdir)/tmpl $(abs_builddir)/; \
+	fi
+	@touch setup-build.stamp
+
+setup.stamp: setup-build.stamp
+	@true
+
 #### scan ####
 
 scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
 	@echo 'gtk-doc: Scanning header files'
-	@-chmod -R u+w $(srcdir)
-	@_source_dir='' ; for i in $(DOC_SOURCE_DIR) ; do \
+	@_source_dir='' ; \
+	for i in $(DOC_SOURCE_DIR) ; do \
 	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
-	  done ; \
-	  cd $(srcdir) && \
-	  gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES)
-	@if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
-	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
+	done ; \
+	gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES)
+	@if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
+	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) ; \
 	else \
-	    cd $(srcdir) ; \
 	    for i in $(SCANOBJ_FILES) ; do \
                test -f $$i || touch $$i ; \
 	    done \
@@ -601,10 +640,14 @@ $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)
 
 #### templates ####
 
-tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
+tmpl-build.stamp: setup.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
 	@echo 'gtk-doc: Rebuilding template files'
-	@-chmod -R u+w $(srcdir)
-	@cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
+	@gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
+	@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
+	  if test -w $(abs_srcdir) ; then \
+	    cp -rp $(abs_builddir)/tmpl $(abs_srcdir)/; \
+	  fi \
+	fi
 	@touch tmpl-build.stamp
 
 tmpl.stamp: tmpl-build.stamp
@@ -618,11 +661,11 @@ $(srcdir)/tmpl/*.sgml:
 sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
 	@echo 'gtk-doc: Building XML'
 	@-chmod -R u+w $(srcdir)
-	@_source_dir='' ; for i in $(DOC_SOURCE_DIR) ; do \
+	@_source_dir='' ; \
+	for i in $(DOC_SOURCE_DIR) ; do \
 	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
-	  done ; \
-	  cd $(srcdir) && \
-	  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)
+	done ; \
+	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)
 	@touch sgml-build.stamp
 
 sgml.stamp: sgml-build.stamp
@@ -632,26 +675,32 @@ sgml.stamp: sgml-build.stamp
 
 html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
 	@echo 'gtk-doc: Building HTML'
-	@-chmod -R u+w $(srcdir)
-	@rm -rf $(srcdir)/html
-	@mkdir $(srcdir)/html
+	@rm -rf html
+	@mkdir html
 	@mkhtml_options=""; \
 	gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-path"; \
 	if test "$(?)" = "0"; then \
-	  mkhtml_options=--path="$(srcdir)"; \
+	  mkhtml_options=--path="$(abs_srcdir)"; \
 	fi; \
-	cd $(srcdir)/html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
-	@test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
+	cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
+	-@test "x$(HTML_IMAGES)" = "x" || \
+	for file in $(HTML_IMAGES) ; do \
+	  if test -f $(abs_srcdir)/$$file ; then \
+	    cp $(abs_srcdir)/$$file $(abs_builddir)/html; \
+	  fi; \
+	  if test -f $(abs_builddir)/$$file ; then \
+	    cp $(abs_builddir)/$$file $(abs_builddir)/html; \
+	  fi; \
+	done;
 	@echo 'gtk-doc: Fixing cross-references'
-	@cd $(srcdir) && gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+	@gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
 	@touch html-build.stamp
 
 #### pdf ####
 
 pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
 	@echo 'gtk-doc: Building PDF'
-	@-chmod -R u+w $(srcdir)
-	@rm -rf $(srcdir)/$(DOC_MODULE).pdf
+	@rm -rf $(DOC_MODULE).pdf
 	@mkpdf_imgdirs=""; \
 	if test "x$(HTML_IMAGES)" != "x"; then \
 	  for img in $(HTML_IMAGES); do \
@@ -662,7 +711,7 @@ pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
 	    fi; \
 	  done; \
 	fi; \
-	cd $(srcdir) && gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
+	gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
 	@touch pdf-build.stamp
 
 ##############
@@ -672,12 +721,15 @@ clean-local:
 	rm -rf .libs
 
 distclean-local:
-	cd $(srcdir) && \
-	  rm -rf xml $(REPORT_FILES) $(DOC_MODULE).pdf \
-	         $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
+	rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \
+	    $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
+	if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
+	    rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \
+	    rm -rf tmpl; \
+	fi
 
 maintainer-clean-local: clean
-	cd $(srcdir) && rm -rf xml html
+	rm -rf xml html
 
 install-data-local:
 	@installfiles=`echo $(srcdir)/html/*`; \
@@ -722,11 +774,11 @@ uninstall-local:
 dist-hook: dist-check-gtkdoc dist-hook-local
 	mkdir $(distdir)/tmpl
 	mkdir $(distdir)/html
-	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
-	cp $(srcdir)/html/* $(distdir)/html
-	-cp $(srcdir)/$(DOC_MODULE).pdf $(distdir)/
-	-cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
-	-cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
+	-cp $(build)/tmpl/*.sgml $(distdir)/tmpl
+	cp $(builddir)/html/* $(distdir)/html
+	-cp $(builddir)/$(DOC_MODULE).pdf $(distdir)/
+	-cp $(build)/$(DOC_MODULE).types $(distdir)/
+	-cp $(build)/$(DOC_MODULE)-sections.txt $(distdir)/
 	cd $(distdir) && rm -f $(DISTCLEANFILES)
 	$(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
 
diff --git a/docs/libnm-glib/html/NMAccessPoint.html b/docs/libnm-glib/html/NMAccessPoint.html
index 71c134c96..9aa7c5902 100644
--- a/docs/libnm-glib/html/NMAccessPoint.html
+++ b/docs/libnm-glib/html/NMAccessPoint.html
@@ -3,19 +3,19 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>NMAccessPoint</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="libnm-glib Reference Manual">
-<link rel="up" href="ch01.html" title="libnm-glib Objects">
-<link rel="prev" href="NMDeviceBt.html" title="NMDeviceBt">
+<link rel="up" href="ch02.html" title="libnm-glib API Reference">
+<link rel="prev" href="NMWimaxNsp.html" title="NMWimaxNsp">
 <link rel="next" href="NMIP4Config.html" title="NMIP4Config">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
 <tr valign="middle">
-<td><a accesskey="p" href="NMDeviceBt.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="ch01.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="NMWimaxNsp.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
+<td><a accesskey="u" href="ch02.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
 <th width="100%" align="center">libnm-glib Reference Manual</th>
 <td><a accesskey="n" href="NMIP4Config.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
@@ -30,7 +30,7 @@
                   <a href="#NMAccessPoint.properties" class="shortcut">Properties</a>
 </td></tr>
 </table>
-<div class="refentry" title="NMAccessPoint">
+<div class="refentry">
 <a name="NMAccessPoint"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
@@ -39,33 +39,38 @@
 </td>
 <td valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv" title="Synopsis">
+<div class="refsynopsisdiv">
 <a name="NMAccessPoint.synopsis"></a><h2>Synopsis</h2>
 <pre class="synopsis">#define             <a class="link" href="NMAccessPoint.html#NM-ACCESS-POINT-FLAGS:CAPS" title="NM_ACCESS_POINT_FLAGS">NM_ACCESS_POINT_FLAGS</a>
 #define             <a class="link" href="NMAccessPoint.html#NM-ACCESS-POINT-WPA-FLAGS:CAPS" title="NM_ACCESS_POINT_WPA_FLAGS">NM_ACCESS_POINT_WPA_FLAGS</a>
 #define             <a class="link" href="NMAccessPoint.html#NM-ACCESS-POINT-RSN-FLAGS:CAPS" title="NM_ACCESS_POINT_RSN_FLAGS">NM_ACCESS_POINT_RSN_FLAGS</a>
 #define             <a class="link" href="NMAccessPoint.html#NM-ACCESS-POINT-SSID:CAPS" title="NM_ACCESS_POINT_SSID">NM_ACCESS_POINT_SSID</a>
+#define             <a class="link" href="NMAccessPoint.html#NM-ACCESS-POINT-BSSID:CAPS" title="NM_ACCESS_POINT_BSSID">NM_ACCESS_POINT_BSSID</a>
 #define             <a class="link" href="NMAccessPoint.html#NM-ACCESS-POINT-FREQUENCY:CAPS" title="NM_ACCESS_POINT_FREQUENCY">NM_ACCESS_POINT_FREQUENCY</a>
-#define             <a class="link" href="NMAccessPoint.html#NM-ACCESS-POINT-HW-ADDRESS:CAPS" title="NM_ACCESS_POINT_HW_ADDRESS">NM_ACCESS_POINT_HW_ADDRESS</a>
 #define             <a class="link" href="NMAccessPoint.html#NM-ACCESS-POINT-MODE:CAPS" title="NM_ACCESS_POINT_MODE">NM_ACCESS_POINT_MODE</a>
 #define             <a class="link" href="NMAccessPoint.html#NM-ACCESS-POINT-MAX-BITRATE:CAPS" title="NM_ACCESS_POINT_MAX_BITRATE">NM_ACCESS_POINT_MAX_BITRATE</a>
 #define             <a class="link" href="NMAccessPoint.html#NM-ACCESS-POINT-STRENGTH:CAPS" title="NM_ACCESS_POINT_STRENGTH">NM_ACCESS_POINT_STRENGTH</a>
+#define             <a class="link" href="NMAccessPoint.html#NM-ACCESS-POINT-HW-ADDRESS:CAPS" title="NM_ACCESS_POINT_HW_ADDRESS">NM_ACCESS_POINT_HW_ADDRESS</a>
                     <a class="link" href="NMAccessPoint.html#NMAccessPoint-struct" title="NMAccessPoint">NMAccessPoint</a>;
                     <a class="link" href="NMAccessPoint.html#NMAccessPointClass" title="NMAccessPointClass">NMAccessPointClass</a>;
 <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="returnvalue">GObject</span></a> *           <a class="link" href="NMAccessPoint.html#nm-access-point-new" title="nm_access_point_new ()">nm_access_point_new</a>                 (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGConnection.html#DBusGConnection"><span class="type">DBusGConnection</span></a> *connection</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *path</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             <a class="link" href="NMAccessPoint.html#nm-access-point-get-flags" title="nm_access_point_get_flags ()">nm_access_point_get_flags</a>           (<em class="parameter"><code><a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a> *ap</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             <a class="link" href="NMAccessPoint.html#nm-access-point-get-wpa-flags" title="nm_access_point_get_wpa_flags ()">nm_access_point_get_wpa_flags</a>       (<em class="parameter"><code><a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a> *ap</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             <a class="link" href="NMAccessPoint.html#nm-access-point-get-rsn-flags" title="nm_access_point_get_rsn_flags ()">nm_access_point_get_rsn_flags</a>       (<em class="parameter"><code><a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a> *ap</code></em>);
-const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *  <a class="link" href="NMAccessPoint.html#nm-access-point-get-ssid" title="nm_access_point_get_ssid ()">nm_access_point_get_ssid</a>            (<em class="parameter"><code><a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a> *ap</code></em>);
+<span class="returnvalue">NM80211ApFlags</span>      <a class="link" href="NMAccessPoint.html#nm-access-point-get-flags" title="nm_access_point_get_flags ()">nm_access_point_get_flags</a>           (<em class="parameter"><code><a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a> *ap</code></em>);
+<span class="returnvalue">NM80211ApSecurityFlags</span>  <a class="link" href="NMAccessPoint.html#nm-access-point-get-wpa-flags" title="nm_access_point_get_wpa_flags ()">nm_access_point_get_wpa_flags</a>   (<em class="parameter"><code><a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a> *ap</code></em>);
+<span class="returnvalue">NM80211ApSecurityFlags</span>  <a class="link" href="NMAccessPoint.html#nm-access-point-get-rsn-flags" title="nm_access_point_get_rsn_flags ()">nm_access_point_get_rsn_flags</a>   (<em class="parameter"><code><a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a> *ap</code></em>);
+const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *      <a class="link" href="NMAccessPoint.html#nm-access-point-get-ssid" title="nm_access_point_get_ssid ()">nm_access_point_get_ssid</a>        (<em class="parameter"><code><a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a> *ap</code></em>);
+const <span class="returnvalue">char</span> *            <a class="link" href="NMAccessPoint.html#nm-access-point-get-bssid" title="nm_access_point_get_bssid ()">nm_access_point_get_bssid</a>       (<em class="parameter"><code><a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a> *ap</code></em>);
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             <a class="link" href="NMAccessPoint.html#nm-access-point-get-frequency" title="nm_access_point_get_frequency ()">nm_access_point_get_frequency</a>       (<em class="parameter"><code><a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a> *ap</code></em>);
-const <span class="returnvalue">char</span> *        <a class="link" href="NMAccessPoint.html#nm-access-point-get-hw-address" title="nm_access_point_get_hw_address ()">nm_access_point_get_hw_address</a>      (<em class="parameter"><code><a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a> *ap</code></em>);
 <span class="returnvalue">NM80211Mode</span>         <a class="link" href="NMAccessPoint.html#nm-access-point-get-mode" title="nm_access_point_get_mode ()">nm_access_point_get_mode</a>            (<em class="parameter"><code><a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a> *ap</code></em>);
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             <a class="link" href="NMAccessPoint.html#nm-access-point-get-max-bitrate" title="nm_access_point_get_max_bitrate ()">nm_access_point_get_max_bitrate</a>     (<em class="parameter"><code><a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a> *ap</code></em>);
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint8"><span class="returnvalue">guint8</span></a>              <a class="link" href="NMAccessPoint.html#nm-access-point-get-strength" title="nm_access_point_get_strength ()">nm_access_point_get_strength</a>        (<em class="parameter"><code><a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a> *ap</code></em>);
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="returnvalue">GSList</span></a> *                <a class="link" href="NMAccessPoint.html#nm-access-point-filter-connections" title="nm_access_point_filter_connections ()">nm_access_point_filter_connections</a>
+                                                        (<em class="parameter"><code><a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a> *ap</code></em>,
+                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> *connections</code></em>);
+const <span class="returnvalue">char</span> *            <a class="link" href="NMAccessPoint.html#nm-access-point-get-hw-address" title="nm_access_point_get_hw_address ()">nm_access_point_get_hw_address</a>  (<em class="parameter"><code><a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a> *ap</code></em>);
 </pre>
 </div>
-<div class="refsect1" title="Object Hierarchy">
+<div class="refsect1">
 <a name="NMAccessPoint.object-hierarchy"></a><h2>Object Hierarchy</h2>
 <pre class="synopsis">
   <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>
@@ -73,28 +78,29 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMAcc
          +----NMAccessPoint
 </pre>
 </div>
-<div class="refsect1" title="Properties">
+<div class="refsect1">
 <a name="NMAccessPoint.properties"></a><h2>Properties</h2>
 <pre class="synopsis">
+  "<a class="link" href="NMAccessPoint.html#NMAccessPoint--bssid" title='The "bssid" property'>bssid</a>"                    <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read
   "<a class="link" href="NMAccessPoint.html#NMAccessPoint--flags" title='The "flags" property'>flags</a>"                    <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read
   "<a class="link" href="NMAccessPoint.html#NMAccessPoint--frequency" title='The "frequency" property'>frequency</a>"                <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read
   "<a class="link" href="NMAccessPoint.html#NMAccessPoint--hw-address" title='The "hw-address" property'>hw-address</a>"               <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read
   "<a class="link" href="NMAccessPoint.html#NMAccessPoint--max-bitrate" title='The "max-bitrate" property'>max-bitrate</a>"              <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read
   "<a class="link" href="NMAccessPoint.html#NMAccessPoint--mode" title='The "mode" property'>mode</a>"                     <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read
   "<a class="link" href="NMAccessPoint.html#NMAccessPoint--rsn-flags" title='The "rsn-flags" property'>rsn-flags</a>"                <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read
-  "<a class="link" href="NMAccessPoint.html#NMAccessPoint--ssid" title='The "ssid" property'>ssid</a>"                     <span class="type">nm-ssid*</span>              : Read
+  "<a class="link" href="NMAccessPoint.html#NMAccessPoint--ssid" title='The "ssid" property'>ssid</a>"                     <span class="type">NMSsid</span>*               : Read
   "<a class="link" href="NMAccessPoint.html#NMAccessPoint--strength" title='The "strength" property'>strength</a>"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guchar"><span class="type">guchar</span></a>                : Read
   "<a class="link" href="NMAccessPoint.html#NMAccessPoint--wpa-flags" title='The "wpa-flags" property'>wpa-flags</a>"                <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read
 </pre>
 </div>
-<div class="refsect1" title="Description">
+<div class="refsect1">
 <a name="NMAccessPoint.description"></a><h2>Description</h2>
 <p>
 </p>
 </div>
-<div class="refsect1" title="Details">
+<div class="refsect1">
 <a name="NMAccessPoint.details"></a><h2>Details</h2>
-<div class="refsect2" title="NM_ACCESS_POINT_FLAGS">
+<div class="refsect2">
 <a name="NM-ACCESS-POINT-FLAGS:CAPS"></a><h3>NM_ACCESS_POINT_FLAGS</h3>
 <pre class="programlisting">#define NM_ACCESS_POINT_FLAGS       "flags"
 </pre>
@@ -102,7 +108,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMAcc
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_ACCESS_POINT_WPA_FLAGS">
+<div class="refsect2">
 <a name="NM-ACCESS-POINT-WPA-FLAGS:CAPS"></a><h3>NM_ACCESS_POINT_WPA_FLAGS</h3>
 <pre class="programlisting">#define NM_ACCESS_POINT_WPA_FLAGS   "wpa-flags"
 </pre>
@@ -110,7 +116,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMAcc
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_ACCESS_POINT_RSN_FLAGS">
+<div class="refsect2">
 <a name="NM-ACCESS-POINT-RSN-FLAGS:CAPS"></a><h3>NM_ACCESS_POINT_RSN_FLAGS</h3>
 <pre class="programlisting">#define NM_ACCESS_POINT_RSN_FLAGS   "rsn-flags"
 </pre>
@@ -118,7 +124,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMAcc
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_ACCESS_POINT_SSID">
+<div class="refsect2">
 <a name="NM-ACCESS-POINT-SSID:CAPS"></a><h3>NM_ACCESS_POINT_SSID</h3>
 <pre class="programlisting">#define NM_ACCESS_POINT_SSID        "ssid"
 </pre>
@@ -126,23 +132,23 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMAcc
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_ACCESS_POINT_FREQUENCY">
-<a name="NM-ACCESS-POINT-FREQUENCY:CAPS"></a><h3>NM_ACCESS_POINT_FREQUENCY</h3>
-<pre class="programlisting">#define NM_ACCESS_POINT_FREQUENCY   "frequency"
+<div class="refsect2">
+<a name="NM-ACCESS-POINT-BSSID:CAPS"></a><h3>NM_ACCESS_POINT_BSSID</h3>
+<pre class="programlisting">#define NM_ACCESS_POINT_BSSID       "bssid"
 </pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_ACCESS_POINT_HW_ADDRESS">
-<a name="NM-ACCESS-POINT-HW-ADDRESS:CAPS"></a><h3>NM_ACCESS_POINT_HW_ADDRESS</h3>
-<pre class="programlisting">#define NM_ACCESS_POINT_HW_ADDRESS  "hw-address"
+<div class="refsect2">
+<a name="NM-ACCESS-POINT-FREQUENCY:CAPS"></a><h3>NM_ACCESS_POINT_FREQUENCY</h3>
+<pre class="programlisting">#define NM_ACCESS_POINT_FREQUENCY   "frequency"
 </pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_ACCESS_POINT_MODE">
+<div class="refsect2">
 <a name="NM-ACCESS-POINT-MODE:CAPS"></a><h3>NM_ACCESS_POINT_MODE</h3>
 <pre class="programlisting">#define NM_ACCESS_POINT_MODE        "mode"
 </pre>
@@ -150,7 +156,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMAcc
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_ACCESS_POINT_MAX_BITRATE">
+<div class="refsect2">
 <a name="NM-ACCESS-POINT-MAX-BITRATE:CAPS"></a><h3>NM_ACCESS_POINT_MAX_BITRATE</h3>
 <pre class="programlisting">#define NM_ACCESS_POINT_MAX_BITRATE "max-bitrate"
 </pre>
@@ -158,7 +164,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMAcc
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_ACCESS_POINT_STRENGTH">
+<div class="refsect2">
 <a name="NM-ACCESS-POINT-STRENGTH:CAPS"></a><h3>NM_ACCESS_POINT_STRENGTH</h3>
 <pre class="programlisting">#define NM_ACCESS_POINT_STRENGTH    "strength"
 </pre>
@@ -166,14 +172,22 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMAcc
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMAccessPoint">
+<div class="refsect2">
+<a name="NM-ACCESS-POINT-HW-ADDRESS:CAPS"></a><h3>NM_ACCESS_POINT_HW_ADDRESS</h3>
+<pre class="programlisting">#define NM_ACCESS_POINT_HW_ADDRESS  "hw-address"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="NMAccessPoint-struct"></a><h3>NMAccessPoint</h3>
 <pre class="programlisting">typedef struct _NMAccessPoint NMAccessPoint;</pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMAccessPointClass">
+<div class="refsect2">
 <a name="NMAccessPointClass"></a><h3>NMAccessPointClass</h3>
 <pre class="programlisting">typedef struct {
 	NMObjectClass parent;
@@ -191,7 +205,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMAcc
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_access_point_new ()">
+<div class="refsect2">
 <a name="nm-access-point-new"></a><h3>nm_access_point_new ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="returnvalue">GObject</span></a> *           nm_access_point_new                 (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGConnection.html#DBusGConnection"><span class="type">DBusGConnection</span></a> *connection</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *path</code></em>);</pre>
@@ -208,23 +222,22 @@ Creates a new <a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><s
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>path</code></em> :</span></p></td>
-<td>the DBusobject path of the access point
-</td>
+<td>the DBusobject path of the access point</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a new access point
+<td>a new access point. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_access_point_get_flags ()">
+<div class="refsect2">
 <a name="nm-access-point-get-flags"></a><h3>nm_access_point_get_flags ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_access_point_get_flags           (<em class="parameter"><code><a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a> *ap</code></em>);</pre>
+<pre class="programlisting"><span class="returnvalue">NM80211ApFlags</span>      nm_access_point_get_flags           (<em class="parameter"><code><a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a> *ap</code></em>);</pre>
 <p>
-Gets the flags of the access point
+Gets the flags of the access point.
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
@@ -236,18 +249,17 @@ Gets the flags of the access point
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the flags
-</td>
+<td>the flags</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_access_point_get_wpa_flags ()">
+<div class="refsect2">
 <a name="nm-access-point-get-wpa-flags"></a><h3>nm_access_point_get_wpa_flags ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_access_point_get_wpa_flags       (<em class="parameter"><code><a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a> *ap</code></em>);</pre>
+<pre class="programlisting"><span class="returnvalue">NM80211ApSecurityFlags</span>  nm_access_point_get_wpa_flags   (<em class="parameter"><code><a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a> *ap</code></em>);</pre>
 <p>
-Gets the WPA flags of the access point.
+Gets the WPA (version 1) flags of the access point.
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
@@ -259,18 +271,18 @@ Gets the WPA flags of the access point.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the WPA flags
-</td>
+<td>the WPA flags</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_access_point_get_rsn_flags ()">
+<div class="refsect2">
 <a name="nm-access-point-get-rsn-flags"></a><h3>nm_access_point_get_rsn_flags ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_access_point_get_rsn_flags       (<em class="parameter"><code><a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a> *ap</code></em>);</pre>
+<pre class="programlisting"><span class="returnvalue">NM80211ApSecurityFlags</span>  nm_access_point_get_rsn_flags   (<em class="parameter"><code><a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a> *ap</code></em>);</pre>
 <p>
-Gets the RSN flags of the access point.
+Gets the RSN (Robust Secure Network, ie WPA version 2) flags of the access
+point.
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
@@ -282,16 +294,15 @@ Gets the RSN flags of the access point.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the RSN flags
-</td>
+<td>the RSN flags</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_access_point_get_ssid ()">
+<div class="refsect2">
 <a name="nm-access-point-get-ssid"></a><h3>nm_access_point_get_ssid ()</h3>
-<pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *  nm_access_point_get_ssid            (<em class="parameter"><code><a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a> *ap</code></em>);</pre>
+<pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *      nm_access_point_get_ssid        (<em class="parameter"><code><a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a> *ap</code></em>);</pre>
 <p>
 Gets the SSID of the access point.
 </p>
@@ -305,19 +316,18 @@ Gets the SSID of the access point.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="type">GByteArray</span></a> containing the SSID. This is the internal copy used by the
-access point, and must not be modified.
-</td>
+<td>the <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="type">GByteArray</span></a> containing the SSID. This is the internal copy used by the
+access point, and must not be modified.</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_access_point_get_frequency ()">
-<a name="nm-access-point-get-frequency"></a><h3>nm_access_point_get_frequency ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_access_point_get_frequency       (<em class="parameter"><code><a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a> *ap</code></em>);</pre>
+<div class="refsect2">
+<a name="nm-access-point-get-bssid"></a><h3>nm_access_point_get_bssid ()</h3>
+<pre class="programlisting">const <span class="returnvalue">char</span> *            nm_access_point_get_bssid       (<em class="parameter"><code><a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a> *ap</code></em>);</pre>
 <p>
-Gets the frequency of the access point.
+Gets the Basic Service Set ID (BSSID) of the WiFi access point.
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
@@ -329,18 +339,18 @@ Gets the frequency of the access point.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the frequency
-</td>
+<td>the BSSID of the access point. This is an internal string and must
+not be modified or freed.</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_access_point_get_hw_address ()">
-<a name="nm-access-point-get-hw-address"></a><h3>nm_access_point_get_hw_address ()</h3>
-<pre class="programlisting">const <span class="returnvalue">char</span> *        nm_access_point_get_hw_address      (<em class="parameter"><code><a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a> *ap</code></em>);</pre>
+<div class="refsect2">
+<a name="nm-access-point-get-frequency"></a><h3>nm_access_point_get_frequency ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_access_point_get_frequency       (<em class="parameter"><code><a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a> *ap</code></em>);</pre>
 <p>
-Gets the hardware (MAC) address of the access point.
+Gets the frequency of the access point.
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
@@ -352,15 +362,13 @@ Gets the hardware (MAC) address of the access point.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the hardware address of the access point. This is the internal string used by the
-access point and must not be modified.
-</td>
+<td>the frequency</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_access_point_get_mode ()">
+<div class="refsect2">
 <a name="nm-access-point-get-mode"></a><h3>nm_access_point_get_mode ()</h3>
 <pre class="programlisting"><span class="returnvalue">NM80211Mode</span>         nm_access_point_get_mode            (<em class="parameter"><code><a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a> *ap</code></em>);</pre>
 <p>
@@ -376,14 +384,13 @@ Gets the mode of the access point.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the mode
-</td>
+<td>the mode</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_access_point_get_max_bitrate ()">
+<div class="refsect2">
 <a name="nm-access-point-get-max-bitrate"></a><h3>nm_access_point_get_max_bitrate ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_access_point_get_max_bitrate     (<em class="parameter"><code><a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a> *ap</code></em>);</pre>
 <p>
@@ -399,14 +406,13 @@ Gets the maximum bit rate of the access point.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the maximum bit rate
-</td>
+<td>the maximum bit rate</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_access_point_get_strength ()">
+<div class="refsect2">
 <a name="nm-access-point-get-strength"></a><h3>nm_access_point_get_strength ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint8"><span class="returnvalue">guint8</span></a>              nm_access_point_get_strength        (<em class="parameter"><code><a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a> *ap</code></em>);</pre>
 <p>
@@ -422,16 +428,86 @@ Gets the current signal strength of the access point.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the signal strength
+<td>the signal strength</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-access-point-filter-connections"></a><h3>nm_access_point_filter_connections ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="returnvalue">GSList</span></a> *                nm_access_point_filter_connections
+                                                        (<em class="parameter"><code><a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a> *ap</code></em>,
+                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> *connections</code></em>);</pre>
+<p>
+Filters a given list of connections for a given <a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a> object and
+return connections which may be activated with the access point.  Any
+returned connections will match the <em class="parameter"><code>ap</code></em>'s SSID and (if given) BSSID and
+other attributes like security settings, channel, etc.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>ap</code></em> :</span></p></td>
+<td>an <a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a> to filter connections for</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>connections</code></em> :</span></p></td>
+<td>a list of <span class="type">NMConnection</span> objects to filter</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>a
+list of <span class="type">NMConnection</span> objects that could be activated with the given <em class="parameter"><code>ap</code></em>.
+The elements of the list are owned by their creator and should not be freed
+by the caller, but the returned list itself is owned by the caller and should
+be freed with <a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#g-slist-free"><code class="function">g_slist_free()</code></a> when it is no longer required. <span class="annotation">[<acronym title="Free data container after the code is done."><span class="acronym">transfer container</span></acronym>][<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NetworkManager.Connection]</span>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<hr>
+<div class="refsect2">
+<a name="nm-access-point-get-hw-address"></a><h3>nm_access_point_get_hw_address ()</h3>
+<pre class="programlisting">const <span class="returnvalue">char</span> *            nm_access_point_get_hw_address  (<em class="parameter"><code><a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a> *ap</code></em>);</pre>
+<div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
+<h3 class="title">Warning</h3>
+<p><code class="literal">nm_access_point_get_hw_address</code> has been deprecated since version 0.9 and should not be used in newly-written code. Use <a class="link" href="NMAccessPoint.html#nm-access-point-get-bssid" title="nm_access_point_get_bssid ()"><code class="function">nm_access_point_get_bssid()</code></a> instead.</p>
 </div>
-<div class="refsect1" title="Property Details">
+<p>
+Gets the hardware (MAC) address of the access point.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>ap</code></em> :</span></p></td>
+<td>a <a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>the hardware address of the access point. This is the internal string used by the
+access point and must not be modified.</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<div class="refsect1">
 <a name="NMAccessPoint.property-details"></a><h2>Property Details</h2>
-<div class="refsect2" title='The "flags" property'>
+<div class="refsect2">
+<a name="NMAccessPoint--bssid"></a><h3>The <code class="literal">"bssid"</code> property</h3>
+<pre class="programlisting">  "bssid"                    <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read</pre>
+<p>
+The BSSID of the access point.
+</p>
+<p>Default value: NULL</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="NMAccessPoint--flags"></a><h3>The <code class="literal">"flags"</code> property</h3>
 <pre class="programlisting">  "flags"                    <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read</pre>
 <p>
@@ -441,7 +517,7 @@ The flags of the access point.
 <p>Default value: 0</p>
 </div>
 <hr>
-<div class="refsect2" title='The "frequency" property'>
+<div class="refsect2">
 <a name="NMAccessPoint--frequency"></a><h3>The <code class="literal">"frequency"</code> property</h3>
 <pre class="programlisting">  "frequency"                <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read</pre>
 <p>
@@ -451,7 +527,7 @@ The frequency of the access point.
 <p>Default value: 0</p>
 </div>
 <hr>
-<div class="refsect2" title='The "hw-address" property'>
+<div class="refsect2">
 <a name="NMAccessPoint--hw-address"></a><h3>The <code class="literal">"hw-address"</code> property</h3>
 <pre class="programlisting">  "hw-address"               <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read</pre>
 <p>
@@ -460,7 +536,7 @@ The hardware address of the access point.
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "max-bitrate" property'>
+<div class="refsect2">
 <a name="NMAccessPoint--max-bitrate"></a><h3>The <code class="literal">"max-bitrate"</code> property</h3>
 <pre class="programlisting">  "max-bitrate"              <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read</pre>
 <p>
@@ -469,7 +545,7 @@ The maximum bit rate of the access point.
 <p>Default value: 0</p>
 </div>
 <hr>
-<div class="refsect2" title='The "mode" property'>
+<div class="refsect2">
 <a name="NMAccessPoint--mode"></a><h3>The <code class="literal">"mode"</code> property</h3>
 <pre class="programlisting">  "mode"                     <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read</pre>
 <p>
@@ -479,7 +555,7 @@ The mode of the access point.
 <p>Default value: 2</p>
 </div>
 <hr>
-<div class="refsect2" title='The "rsn-flags" property'>
+<div class="refsect2">
 <a name="NMAccessPoint--rsn-flags"></a><h3>The <code class="literal">"rsn-flags"</code> property</h3>
 <pre class="programlisting">  "rsn-flags"                <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read</pre>
 <p>
@@ -488,15 +564,15 @@ The RSN flags of the access point.
 <p>Default value: 0</p>
 </div>
 <hr>
-<div class="refsect2" title='The "ssid" property'>
+<div class="refsect2">
 <a name="NMAccessPoint--ssid"></a><h3>The <code class="literal">"ssid"</code> property</h3>
-<pre class="programlisting">  "ssid"                     <span class="type">nm-ssid*</span>              : Read</pre>
+<pre class="programlisting">  "ssid"                     <span class="type">NMSsid</span>*               : Read</pre>
 <p>
 The SSID of the access point.
 </p>
 </div>
 <hr>
-<div class="refsect2" title='The "strength" property'>
+<div class="refsect2">
 <a name="NMAccessPoint--strength"></a><h3>The <code class="literal">"strength"</code> property</h3>
 <pre class="programlisting">  "strength"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guchar"><span class="type">guchar</span></a>                : Read</pre>
 <p>
@@ -505,7 +581,7 @@ The current signal strength of the access point.
 <p>Default value: 0</p>
 </div>
 <hr>
-<div class="refsect2" title='The "wpa-flags" property'>
+<div class="refsect2">
 <a name="NMAccessPoint--wpa-flags"></a><h3>The <code class="literal">"wpa-flags"</code> property</h3>
 <pre class="programlisting">  "wpa-flags"                <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read</pre>
 <p>
@@ -517,6 +593,6 @@ The WPA flags of the access point.
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.15</div>
+          Generated by GTK-Doc V1.17</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMActiveConnection.html b/docs/libnm-glib/html/NMActiveConnection.html
index bf28b0a53..4c37d3b5b 100644
--- a/docs/libnm-glib/html/NMActiveConnection.html
+++ b/docs/libnm-glib/html/NMActiveConnection.html
@@ -3,19 +3,19 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>NMActiveConnection</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="libnm-glib Reference Manual">
-<link rel="up" href="ch01.html" title="libnm-glib Objects">
+<link rel="up" href="ch02.html" title="libnm-glib API Reference">
 <link rel="prev" href="NMClient.html" title="NMClient">
 <link rel="next" href="NMDevice.html" title="NMDevice">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
 <tr valign="middle">
 <td><a accesskey="p" href="NMClient.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="ch01.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
+<td><a accesskey="u" href="ch02.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
 <th width="100%" align="center">libnm-glib Reference Manual</th>
 <td><a accesskey="n" href="NMDevice.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
@@ -30,7 +30,7 @@
                   <a href="#NMActiveConnection.properties" class="shortcut">Properties</a>
 </td></tr>
 </table>
-<div class="refentry" title="NMActiveConnection">
+<div class="refentry">
 <a name="NMActiveConnection"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
@@ -39,10 +39,9 @@
 </td>
 <td valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv" title="Synopsis">
+<div class="refsynopsisdiv">
 <a name="NMActiveConnection.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">#define             <a class="link" href="NMActiveConnection.html#NM-ACTIVE-CONNECTION-SERVICE-NAME:CAPS" title="NM_ACTIVE_CONNECTION_SERVICE_NAME">NM_ACTIVE_CONNECTION_SERVICE_NAME</a>
-#define             <a class="link" href="NMActiveConnection.html#NM-ACTIVE-CONNECTION-CONNECTION:CAPS" title="NM_ACTIVE_CONNECTION_CONNECTION">NM_ACTIVE_CONNECTION_CONNECTION</a>
+<pre class="synopsis">#define             <a class="link" href="NMActiveConnection.html#NM-ACTIVE-CONNECTION-CONNECTION:CAPS" title="NM_ACTIVE_CONNECTION_CONNECTION">NM_ACTIVE_CONNECTION_CONNECTION</a>
 #define             <a class="link" href="NMActiveConnection.html#NM-ACTIVE-CONNECTION-SPECIFIC-OBJECT:CAPS" title="NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT">NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT</a>
 #define             <a class="link" href="NMActiveConnection.html#NM-ACTIVE-CONNECTION-DEVICES:CAPS" title="NM_ACTIVE_CONNECTION_DEVICES">NM_ACTIVE_CONNECTION_DEVICES</a>
 #define             <a class="link" href="NMActiveConnection.html#NM-ACTIVE-CONNECTION-STATE:CAPS" title="NM_ACTIVE_CONNECTION_STATE">NM_ACTIVE_CONNECTION_STATE</a>
@@ -52,9 +51,6 @@
                     <a class="link" href="NMActiveConnection.html#NMActiveConnectionClass" title="NMActiveConnectionClass">NMActiveConnectionClass</a>;
 <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="returnvalue">GObject</span></a> *           <a class="link" href="NMActiveConnection.html#nm-active-connection-new" title="nm_active_connection_new ()">nm_active_connection_new</a>            (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGConnection.html#DBusGConnection"><span class="type">DBusGConnection</span></a> *connection</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *path</code></em>);
-const <span class="returnvalue">char</span> *        <a class="link" href="NMActiveConnection.html#nm-active-connection-get-service-name" title="nm_active_connection_get_service_name ()">nm_active_connection_get_service_name</a>
-                                                        (<em class="parameter"><code><a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> *connection</code></em>);
-<a href="http://projects.gnome.org/NetworkManager/developers/libnm-util/08/NMConnection.html#NMConnectionScope"><span class="returnvalue">NMConnectionScope</span></a>   <a class="link" href="NMActiveConnection.html#nm-active-connection-get-scope" title="nm_active_connection_get_scope ()">nm_active_connection_get_scope</a>      (<em class="parameter"><code><a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> *connection</code></em>);
 const <span class="returnvalue">char</span> *        <a class="link" href="NMActiveConnection.html#nm-active-connection-get-connection" title="nm_active_connection_get_connection ()">nm_active_connection_get_connection</a> (<em class="parameter"><code><a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> *connection</code></em>);
 const <span class="returnvalue">char</span> *        <a class="link" href="NMActiveConnection.html#nm-active-connection-get-specific-object" title="nm_active_connection_get_specific_object ()">nm_active_connection_get_specific_object</a>
                                                         (<em class="parameter"><code><a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> *connection</code></em>);
@@ -64,7 +60,7 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMActiveConnection.html#nm-active-connection-get-default6" title="nm_active_connection_get_default6 ()">nm_active_connection_get_default6</a>   (<em class="parameter"><code><a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> *connection</code></em>);
 </pre>
 </div>
-<div class="refsect1" title="Object Hierarchy">
+<div class="refsect1">
 <a name="NMActiveConnection.object-hierarchy"></a><h2>Object Hierarchy</h2>
 <pre class="synopsis">
   <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>
@@ -73,34 +69,25 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.
                +----<a class="link" href="NMVPNConnection.html" title="NMVPNConnection">NMVPNConnection</a>
 </pre>
 </div>
-<div class="refsect1" title="Properties">
+<div class="refsect1">
 <a name="NMActiveConnection.properties"></a><h2>Properties</h2>
 <pre class="synopsis">
   "<a class="link" href="NMActiveConnection.html#NMActiveConnection--connection" title='The "connection" property'>connection</a>"               <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read
   "<a class="link" href="NMActiveConnection.html#NMActiveConnection--default" title='The "default" property'>default</a>"                  <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read
   "<a class="link" href="NMActiveConnection.html#NMActiveConnection--default6" title='The "default6" property'>default6</a>"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read
-  "<a class="link" href="NMActiveConnection.html#NMActiveConnection--devices" title='The "devices" property'>devices</a>"                  <span class="type">nm-object-array*</span>      : Read
-  "<a class="link" href="NMActiveConnection.html#NMActiveConnection--service-name" title='The "service-name" property'>service-name</a>"             <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read
+  "<a class="link" href="NMActiveConnection.html#NMActiveConnection--devices" title='The "devices" property'>devices</a>"                  <span class="type">NMObjectArray</span>*        : Read
   "<a class="link" href="NMActiveConnection.html#NMActiveConnection--specific-object" title='The "specific-object" property'>specific-object</a>"          <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read
   "<a class="link" href="NMActiveConnection.html#NMActiveConnection--state" title='The "state" property'>state</a>"                    <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read
 </pre>
 </div>
-<div class="refsect1" title="Description">
+<div class="refsect1">
 <a name="NMActiveConnection.description"></a><h2>Description</h2>
 <p>
 </p>
 </div>
-<div class="refsect1" title="Details">
+<div class="refsect1">
 <a name="NMActiveConnection.details"></a><h2>Details</h2>
-<div class="refsect2" title="NM_ACTIVE_CONNECTION_SERVICE_NAME">
-<a name="NM-ACTIVE-CONNECTION-SERVICE-NAME:CAPS"></a><h3>NM_ACTIVE_CONNECTION_SERVICE_NAME</h3>
-<pre class="programlisting">#define NM_ACTIVE_CONNECTION_SERVICE_NAME        "service-name"
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="NM_ACTIVE_CONNECTION_CONNECTION">
+<div class="refsect2">
 <a name="NM-ACTIVE-CONNECTION-CONNECTION:CAPS"></a><h3>NM_ACTIVE_CONNECTION_CONNECTION</h3>
 <pre class="programlisting">#define NM_ACTIVE_CONNECTION_CONNECTION          "connection"
 </pre>
@@ -108,7 +95,7 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT">
+<div class="refsect2">
 <a name="NM-ACTIVE-CONNECTION-SPECIFIC-OBJECT:CAPS"></a><h3>NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT</h3>
 <pre class="programlisting">#define NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT     "specific-object"
 </pre>
@@ -116,7 +103,7 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_ACTIVE_CONNECTION_DEVICES">
+<div class="refsect2">
 <a name="NM-ACTIVE-CONNECTION-DEVICES:CAPS"></a><h3>NM_ACTIVE_CONNECTION_DEVICES</h3>
 <pre class="programlisting">#define NM_ACTIVE_CONNECTION_DEVICES             "devices"
 </pre>
@@ -124,7 +111,7 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_ACTIVE_CONNECTION_STATE">
+<div class="refsect2">
 <a name="NM-ACTIVE-CONNECTION-STATE:CAPS"></a><h3>NM_ACTIVE_CONNECTION_STATE</h3>
 <pre class="programlisting">#define NM_ACTIVE_CONNECTION_STATE               "state"
 </pre>
@@ -132,7 +119,7 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_ACTIVE_CONNECTION_DEFAULT">
+<div class="refsect2">
 <a name="NM-ACTIVE-CONNECTION-DEFAULT:CAPS"></a><h3>NM_ACTIVE_CONNECTION_DEFAULT</h3>
 <pre class="programlisting">#define NM_ACTIVE_CONNECTION_DEFAULT             "default"
 </pre>
@@ -140,7 +127,7 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_ACTIVE_CONNECTION_DEFAULT6">
+<div class="refsect2">
 <a name="NM-ACTIVE-CONNECTION-DEFAULT6:CAPS"></a><h3>NM_ACTIVE_CONNECTION_DEFAULT6</h3>
 <pre class="programlisting">#define NM_ACTIVE_CONNECTION_DEFAULT6            "default6"
 </pre>
@@ -148,14 +135,14 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMActiveConnection">
+<div class="refsect2">
 <a name="NMActiveConnection-struct"></a><h3>NMActiveConnection</h3>
 <pre class="programlisting">typedef struct _NMActiveConnection NMActiveConnection;</pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMActiveConnectionClass">
+<div class="refsect2">
 <a name="NMActiveConnectionClass"></a><h3>NMActiveConnectionClass</h3>
 <pre class="programlisting">typedef struct {
 	NMObjectClass parent;
@@ -173,7 +160,7 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_active_connection_new ()">
+<div class="refsect2">
 <a name="nm-active-connection-new"></a><h3>nm_active_connection_new ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="returnvalue">GObject</span></a> *           nm_active_connection_new            (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGConnection.html#DBusGConnection"><span class="type">DBusGConnection</span></a> *connection</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *path</code></em>);</pre>
@@ -190,71 +177,22 @@ Creates a new <a class="link" href="NMActiveConnection.html" title="NMActiveConn
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>path</code></em> :</span></p></td>
-<td>the DBus object path of the device
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a new active connection
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_active_connection_get_service_name ()">
-<a name="nm-active-connection-get-service-name"></a><h3>nm_active_connection_get_service_name ()</h3>
-<pre class="programlisting">const <span class="returnvalue">char</span> *        nm_active_connection_get_service_name
-                                                        (<em class="parameter"><code><a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> *connection</code></em>);</pre>
-<p>
-Gets the service name of the active connection.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
-<td>a <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the service name. This is the internal string used by the
-connection, and must not be modified.
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_active_connection_get_scope ()">
-<a name="nm-active-connection-get-scope"></a><h3>nm_active_connection_get_scope ()</h3>
-<pre class="programlisting"><a href="http://projects.gnome.org/NetworkManager/developers/libnm-util/08/NMConnection.html#NMConnectionScope"><span class="returnvalue">NMConnectionScope</span></a>   nm_active_connection_get_scope      (<em class="parameter"><code><a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> *connection</code></em>);</pre>
-<p>
-Gets the scope of the active connection.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
-<td>a <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a>
-</td>
+<td>the DBus object path of the device</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the connection's scope
+<td>a new active connection. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_active_connection_get_connection ()">
+<div class="refsect2">
 <a name="nm-active-connection-get-connection"></a><h3>nm_active_connection_get_connection ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_active_connection_get_connection (<em class="parameter"><code><a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> *connection</code></em>);</pre>
 <p>
-Gets the <a href="http://projects.gnome.org/NetworkManager/developers/libnm-util/08/NMConnection.html"><span class="type">NMConnection</span></a>'s DBus object path.
+Gets the <span class="type">NMConnection</span>'s DBus object path.
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
@@ -266,15 +204,14 @@ Gets the <a href="http://projects.gnome.org/NetworkManager/developers/libnm-util
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the object path of the <a href="http://projects.gnome.org/NetworkManager/developers/libnm-util/08/NMConnection.html"><span class="type">NMConnection</span></a> inside of <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a>.
-This is the internal string used by the connection, and must not be modified.
-</td>
+<td>the object path of the <span class="type">NMConnection</span> inside of <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a>.
+This is the internal string used by the connection, and must not be modified.</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_active_connection_get_specific_object ()">
+<div class="refsect2">
 <a name="nm-active-connection-get-specific-object"></a><h3>nm_active_connection_get_specific_object ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_active_connection_get_specific_object
                                                         (<em class="parameter"><code><a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> *connection</code></em>);</pre>
@@ -291,15 +228,14 @@ Gets the "specific object" used at the activation.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the specific object's DBus path. This is the internal string used by the
-connection, and must not be modified.
-</td>
+<td>the specific object's DBus path. This is the internal string used by the
+connection, and must not be modified.</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_active_connection_get_devices ()">
+<div class="refsect2">
 <a name="nm-active-connection-get-devices"></a><h3>nm_active_connection_get_devices ()</h3>
 <pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="returnvalue">GPtrArray</span></a> *   nm_active_connection_get_devices    (<em class="parameter"><code><a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> *connection</code></em>);</pre>
 <p>
@@ -315,15 +251,15 @@ Gets the <a class="link" href="NMDevice.html" title="NMDevice"><span class="type
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> containing <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a>s.
-This is the internal copy used by the connection, and must not be modified.
+<td>the <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> containing <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a>s.
+This is the internal copy used by the connection, and must not be modified. <span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMClient.Device]</span>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_active_connection_get_state ()">
+<div class="refsect2">
 <a name="nm-active-connection-get-state"></a><h3>nm_active_connection_get_state ()</h3>
 <pre class="programlisting"><span class="returnvalue">NMActiveConnectionState</span>  nm_active_connection_get_state (<em class="parameter"><code><a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> *connection</code></em>);</pre>
 <p>
@@ -339,14 +275,13 @@ Gets the active connection's state.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the state
-</td>
+<td>the state</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_active_connection_get_default ()">
+<div class="refsect2">
 <a name="nm-active-connection-get-default"></a><h3>nm_active_connection_get_default ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_active_connection_get_default    (<em class="parameter"><code><a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> *connection</code></em>);</pre>
 <p>
@@ -363,14 +298,14 @@ the default IPv4 route and DNS information).
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the active connection is the default IPv4 connection
-</td>
+<td>
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the active connection is the default IPv4 connection</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_active_connection_get_default6 ()">
+<div class="refsect2">
 <a name="nm-active-connection-get-default6"></a><h3>nm_active_connection_get_default6 ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_active_connection_get_default6   (<em class="parameter"><code><a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> *connection</code></em>);</pre>
 <p>
@@ -387,16 +322,16 @@ the default IPv6 route and DNS information).
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the active connection is the default IPv6 connection
-</td>
+<td>
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the active connection is the default IPv6 connection</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 </div>
-<div class="refsect1" title="Property Details">
+<div class="refsect1">
 <a name="NMActiveConnection.property-details"></a><h2>Property Details</h2>
-<div class="refsect2" title='The "connection" property'>
+<div class="refsect2">
 <a name="NMActiveConnection--connection"></a><h3>The <code class="literal">"connection"</code> property</h3>
 <pre class="programlisting">  "connection"               <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read</pre>
 <p>
@@ -405,7 +340,7 @@ The connection's path of the active connection.
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "default" property'>
+<div class="refsect2">
 <a name="NMActiveConnection--default"></a><h3>The <code class="literal">"default"</code> property</h3>
 <pre class="programlisting">  "default"                  <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read</pre>
 <p>
@@ -414,7 +349,7 @@ Whether the active connection is the default IPv4 one.
 <p>Default value: FALSE</p>
 </div>
 <hr>
-<div class="refsect2" title='The "default6" property'>
+<div class="refsect2">
 <a name="NMActiveConnection--default6"></a><h3>The <code class="literal">"default6"</code> property</h3>
 <pre class="programlisting">  "default6"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read</pre>
 <p>
@@ -423,22 +358,13 @@ Whether the active connection is the default IPv6 one.
 <p>Default value: FALSE</p>
 </div>
 <hr>
-<div class="refsect2" title='The "devices" property'>
+<div class="refsect2">
 <a name="NMActiveConnection--devices"></a><h3>The <code class="literal">"devices"</code> property</h3>
-<pre class="programlisting">  "devices"                  <span class="type">nm-object-array*</span>      : Read</pre>
+<pre class="programlisting">  "devices"                  <span class="type">NMObjectArray</span>*        : Read</pre>
 <p>Devices.</p>
 </div>
 <hr>
-<div class="refsect2" title='The "service-name" property'>
-<a name="NMActiveConnection--service-name"></a><h3>The <code class="literal">"service-name"</code> property</h3>
-<pre class="programlisting">  "service-name"             <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read</pre>
-<p>
-The service name of the active connection.
-</p>
-<p>Default value: NULL</p>
-</div>
-<hr>
-<div class="refsect2" title='The "specific-object" property'>
+<div class="refsect2">
 <a name="NMActiveConnection--specific-object"></a><h3>The <code class="literal">"specific-object"</code> property</h3>
 <pre class="programlisting">  "specific-object"          <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read</pre>
 <p>
@@ -447,19 +373,19 @@ The specific object's path of the active connection.
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "state" property'>
+<div class="refsect2">
 <a name="NMActiveConnection--state"></a><h3>The <code class="literal">"state"</code> property</h3>
 <pre class="programlisting">  "state"                    <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read</pre>
 <p>
 The state of the active connection.
 </p>
-<p>Allowed values: &lt;= 2</p>
+<p>Allowed values: &lt;= 3</p>
 <p>Default value: 0</p>
 </div>
 </div>
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.15</div>
+          Generated by GTK-Doc V1.17</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMCdmaDevice.html b/docs/libnm-glib/html/NMCdmaDevice.html
deleted file mode 100644
index 3bea23975..000000000
--- a/docs/libnm-glib/html/NMCdmaDevice.html
+++ /dev/null
@@ -1,124 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>NMCdmaDevice</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
-<link rel="home" href="index.html" title="libnm-glib Reference Manual">
-<link rel="up" href="ch01.html" title="libnm-glib Objects">
-<link rel="prev" href="NMGsmDevice.html" title="NMGsmDevice">
-<link rel="next" href="NMDeviceBt.html" title="NMDeviceBt">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
-<link rel="stylesheet" href="style.css" type="text/css">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
-<tr valign="middle">
-<td><a accesskey="p" href="NMGsmDevice.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="ch01.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">libnm-glib Reference Manual</th>
-<td><a accesskey="n" href="NMDeviceBt.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
-</tr>
-<tr><td colspan="5" class="shortcuts">
-<a href="#NMCdmaDevice.synopsis" class="shortcut">Top</a>
-                   | 
-                  <a href="#NMCdmaDevice.description" class="shortcut">Description</a>
-                   | 
-                  <a href="#NMCdmaDevice.object-hierarchy" class="shortcut">Object Hierarchy</a>
-</td></tr>
-</table>
-<div class="refentry" title="NMCdmaDevice">
-<a name="NMCdmaDevice"></a><div class="titlepage"></div>
-<div class="refnamediv"><table width="100%"><tr>
-<td valign="top">
-<h2><span class="refentrytitle"><a name="NMCdmaDevice.top_of_page"></a>NMCdmaDevice</span></h2>
-<p>NMCdmaDevice</p>
-</td>
-<td valign="top" align="right"></td>
-</tr></table></div>
-<div class="refsynopsisdiv" title="Synopsis">
-<a name="NMCdmaDevice.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">                    <a class="link" href="NMCdmaDevice.html#NMCdmaDevice-struct" title="NMCdmaDevice">NMCdmaDevice</a>;
-                    <a class="link" href="NMCdmaDevice.html#NMCdmaDeviceClass" title="NMCdmaDeviceClass">NMCdmaDeviceClass</a>;
-<a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="returnvalue">GObject</span></a> *           <a class="link" href="NMCdmaDevice.html#nm-cdma-device-new" title="nm_cdma_device_new ()">nm_cdma_device_new</a>                  (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGConnection.html#DBusGConnection"><span class="type">DBusGConnection</span></a> *connection</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> *path</code></em>);
-</pre>
-</div>
-<div class="refsect1" title="Object Hierarchy">
-<a name="NMCdmaDevice.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="synopsis">
-  <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>
-   +----<a class="link" href="NMObject.html" title="NMObject">NMObject</a>
-         +----<a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
-               +----<a class="link" href="NMSerialDevice.html" title="NMSerialDevice">NMSerialDevice</a>
-                     +----NMCdmaDevice
-</pre>
-</div>
-<div class="refsect1" title="Description">
-<a name="NMCdmaDevice.description"></a><h2>Description</h2>
-<p>
-</p>
-</div>
-<div class="refsect1" title="Details">
-<a name="NMCdmaDevice.details"></a><h2>Details</h2>
-<div class="refsect2" title="NMCdmaDevice">
-<a name="NMCdmaDevice-struct"></a><h3>NMCdmaDevice</h3>
-<pre class="programlisting">typedef struct _NMCdmaDevice NMCdmaDevice;</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="NMCdmaDeviceClass">
-<a name="NMCdmaDeviceClass"></a><h3>NMCdmaDeviceClass</h3>
-<pre class="programlisting">typedef struct {
-	NMSerialDeviceClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-	void (*_reserved5) (void);
-	void (*_reserved6) (void);
-} NMCdmaDeviceClass;
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="nm_cdma_device_new ()">
-<a name="nm-cdma-device-new"></a><h3>nm_cdma_device_new ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="returnvalue">GObject</span></a> *           nm_cdma_device_new                  (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGConnection.html#DBusGConnection"><span class="type">DBusGConnection</span></a> *connection</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> *path</code></em>);</pre>
-<p>
-Creates a new <a class="link" href="NMCdmaDevice.html" title="NMCdmaDevice"><span class="type">NMCdmaDevice</span></a>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
-<td>the <a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGConnection.html#DBusGConnection"><span class="type">DBusGConnection</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>path</code></em> :</span></p></td>
-<td>the DBus object path of the device
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a new device
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-</div>
-</div>
-<div class="footer">
-<hr>
-          Generated by GTK-Doc V1.15</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMClient.html b/docs/libnm-glib/html/NMClient.html
index f2e61adb9..b8834f84e 100644
--- a/docs/libnm-glib/html/NMClient.html
+++ b/docs/libnm-glib/html/NMClient.html
@@ -3,19 +3,19 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>NMClient</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="libnm-glib Reference Manual">
-<link rel="up" href="ch01.html" title="libnm-glib Objects">
-<link rel="prev" href="ch01.html" title="libnm-glib Objects">
+<link rel="up" href="ch02.html" title="libnm-glib API Reference">
+<link rel="prev" href="ch02.html" title="libnm-glib API Reference">
 <link rel="next" href="NMActiveConnection.html" title="NMActiveConnection">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
 <tr valign="middle">
-<td><a accesskey="p" href="ch01.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="ch01.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="ch02.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
+<td><a accesskey="u" href="ch02.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
 <th width="100%" align="center">libnm-glib Reference Manual</th>
 <td><a accesskey="n" href="NMActiveConnection.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
@@ -32,7 +32,7 @@
                   <a href="#NMClient.signals" class="shortcut">Signals</a>
 </td></tr>
 </table>
-<div class="refentry" title="NMClient">
+<div class="refentry">
 <a name="NMClient"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
@@ -41,15 +41,18 @@
 </td>
 <td valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv" title="Synopsis">
+<div class="refsynopsisdiv">
 <a name="NMClient.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">#define             <a class="link" href="NMClient.html#NM-CLIENT-STATE:CAPS" title="NM_CLIENT_STATE">NM_CLIENT_STATE</a>
+<pre class="synopsis">#define             <a class="link" href="NMClient.html#NM-CLIENT-VERSION:CAPS" title="NM_CLIENT_VERSION">NM_CLIENT_VERSION</a>
+#define             <a class="link" href="NMClient.html#NM-CLIENT-STATE:CAPS" title="NM_CLIENT_STATE">NM_CLIENT_STATE</a>
 #define             <a class="link" href="NMClient.html#NM-CLIENT-MANAGER-RUNNING:CAPS" title="NM_CLIENT_MANAGER_RUNNING">NM_CLIENT_MANAGER_RUNNING</a>
 #define             <a class="link" href="NMClient.html#NM-CLIENT-NETWORKING-ENABLED:CAPS" title="NM_CLIENT_NETWORKING_ENABLED">NM_CLIENT_NETWORKING_ENABLED</a>
 #define             <a class="link" href="NMClient.html#NM-CLIENT-WIRELESS-ENABLED:CAPS" title="NM_CLIENT_WIRELESS_ENABLED">NM_CLIENT_WIRELESS_ENABLED</a>
 #define             <a class="link" href="NMClient.html#NM-CLIENT-WIRELESS-HARDWARE-ENABLED:CAPS" title="NM_CLIENT_WIRELESS_HARDWARE_ENABLED">NM_CLIENT_WIRELESS_HARDWARE_ENABLED</a>
 #define             <a class="link" href="NMClient.html#NM-CLIENT-WWAN-ENABLED:CAPS" title="NM_CLIENT_WWAN_ENABLED">NM_CLIENT_WWAN_ENABLED</a>
 #define             <a class="link" href="NMClient.html#NM-CLIENT-WWAN-HARDWARE-ENABLED:CAPS" title="NM_CLIENT_WWAN_HARDWARE_ENABLED">NM_CLIENT_WWAN_HARDWARE_ENABLED</a>
+#define             <a class="link" href="NMClient.html#NM-CLIENT-WIMAX-ENABLED:CAPS" title="NM_CLIENT_WIMAX_ENABLED">NM_CLIENT_WIMAX_ENABLED</a>
+#define             <a class="link" href="NMClient.html#NM-CLIENT-WIMAX-HARDWARE-ENABLED:CAPS" title="NM_CLIENT_WIMAX_HARDWARE_ENABLED">NM_CLIENT_WIMAX_HARDWARE_ENABLED</a>
 #define             <a class="link" href="NMClient.html#NM-CLIENT-ACTIVE-CONNECTIONS:CAPS" title="NM_CLIENT_ACTIVE_CONNECTIONS">NM_CLIENT_ACTIVE_CONNECTIONS</a>
 enum                <a class="link" href="NMClient.html#NMClientPermission" title="enum NMClientPermission">NMClientPermission</a>;
 enum                <a class="link" href="NMClient.html#NMClientPermissionResult" title="enum NMClientPermissionResult">NMClientPermissionResult</a>;
@@ -59,15 +62,27 @@ enum                <a class="link" href="NMClient.html#NMClientPermissionResult
 const <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="returnvalue">GPtrArray</span></a> *   <a class="link" href="NMClient.html#nm-client-get-devices" title="nm_client_get_devices ()">nm_client_get_devices</a>               (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>);
 <a class="link" href="NMDevice.html" title="NMDevice"><span class="returnvalue">NMDevice</span></a> *          <a class="link" href="NMClient.html#nm-client-get-device-by-path" title="nm_client_get_device_by_path ()">nm_client_get_device_by_path</a>        (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *object_path</code></em>);
-<span class="returnvalue">void</span>                (<a class="link" href="NMClient.html#NMClientActivateDeviceFn" title="NMClientActivateDeviceFn ()">*NMClientActivateDeviceFn</a>)         (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> *object_path</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>);
+<span class="returnvalue">void</span>                (<a class="link" href="NMClient.html#NMClientActivateFn" title="NMClientActivateFn ()">*NMClientActivateFn</a>)               (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> *active_connection</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="NMClient.html#nm-client-activate-connection" title="nm_client_activate_connection ()">nm_client_activate_connection</a>       (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> *service_name</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> *connection_path</code></em>,
+                                                         <em class="parameter"><code><span class="type">NMConnection</span> *connection</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *specific_object</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="NMClient.html#NMClientActivateFn" title="NMClientActivateFn ()"><span class="type">NMClientActivateFn</span></a> callback</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
+<span class="returnvalue">void</span>                (<a class="link" href="NMClient.html#NMClientAddActivateFn" title="NMClientAddActivateFn ()">*NMClientAddActivateFn</a>)            (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> *connection</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *new_connection_path</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="NMClient.html#nm-client-add-and-activate-connection" title="nm_client_add_and_activate_connection ()">nm_client_add_and_activate_connection</a>
+                                                        (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>,
+                                                         <em class="parameter"><code><span class="type">NMConnection</span> *partial</code></em>,
                                                          <em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *specific_object</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMClient.html#NMClientActivateDeviceFn" title="NMClientActivateDeviceFn ()"><span class="type">NMClientActivateDeviceFn</span></a> callback</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="NMClient.html#NMClientAddActivateFn" title="NMClientAddActivateFn ()"><span class="type">NMClientAddActivateFn</span></a> callback</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="NMClient.html#nm-client-deactivate-connection" title="nm_client_deactivate_connection ()">nm_client_deactivate_connection</a>     (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>,
                                                          <em class="parameter"><code><a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> *active</code></em>);
@@ -83,6 +98,12 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.
 <span class="returnvalue">void</span>                <a class="link" href="NMClient.html#nm-client-wwan-set-enabled" title="nm_client_wwan_set_enabled ()">nm_client_wwan_set_enabled</a>          (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> enabled</code></em>);
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMClient.html#nm-client-wwan-hardware-get-enabled" title="nm_client_wwan_hardware_get_enabled ()">nm_client_wwan_hardware_get_enabled</a> (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>);
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMClient.html#nm-client-wimax-get-enabled" title="nm_client_wimax_get_enabled ()">nm_client_wimax_get_enabled</a>         (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="NMClient.html#nm-client-wimax-set-enabled" title="nm_client_wimax_set_enabled ()">nm_client_wimax_set_enabled</a>         (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> enabled</code></em>);
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMClient.html#nm-client-wimax-hardware-get-enabled" title="nm_client_wimax_hardware_get_enabled ()">nm_client_wimax_hardware_get_enabled</a>
+                                                        (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>);
+const <span class="returnvalue">char</span> *        <a class="link" href="NMClient.html#nm-client-get-version" title="nm_client_get_version ()">nm_client_get_version</a>               (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>);
 <span class="returnvalue">NMState</span>             <a class="link" href="NMClient.html#nm-client-get-state" title="nm_client_get_state ()">nm_client_get_state</a>                 (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>);
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMClient.html#nm-client-get-manager-running" title="nm_client_get_manager_running ()">nm_client_get_manager_running</a>       (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>);
 const <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="returnvalue">GPtrArray</span></a> *   <a class="link" href="NMClient.html#nm-client-get-active-connections" title="nm_client_get_active_connections ()">nm_client_get_active_connections</a>    (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>);
@@ -93,7 +114,7 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.
                                                          <em class="parameter"><code><a class="link" href="NMClient.html#NMClientPermission" title="enum NMClientPermission"><span class="type">NMClientPermission</span></a> permission</code></em>);
 </pre>
 </div>
-<div class="refsect1" title="Object Hierarchy">
+<div class="refsect1">
 <a name="NMClient.object-hierarchy"></a><h2>Object Hierarchy</h2>
 <pre class="synopsis">
   <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>
@@ -101,35 +122,46 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.
          +----NMClient
 </pre>
 </div>
-<div class="refsect1" title="Properties">
+<div class="refsect1">
 <a name="NMClient.properties"></a><h2>Properties</h2>
 <pre class="synopsis">
-  "<a class="link" href="NMClient.html#NMClient--active-connections" title='The "active-connections" property'>active-connections</a>"       <span class="type">nm-object-array*</span>      : Read
+  "<a class="link" href="NMClient.html#NMClient--active-connections" title='The "active-connections" property'>active-connections</a>"       <span class="type">NMObjectArray</span>*        : Read
   "<a class="link" href="NMClient.html#NMClient--manager-running" title='The "manager-running" property'>manager-running</a>"          <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read
-  "<a class="link" href="NMClient.html#NMClient--networking-enabled" title='The "networking-enabled" property'>networking-enabled</a>"       <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read
+  "<a class="link" href="NMClient.html#NMClient--networking-enabled" title='The "networking-enabled" property'>networking-enabled</a>"       <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write
   "<a class="link" href="NMClient.html#NMClient--state" title='The "state" property'>state</a>"                    <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read
+  "<a class="link" href="NMClient.html#NMClient--version" title='The "version" property'>version</a>"                  <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read
+  "<a class="link" href="NMClient.html#NMClient--wimax-enabled" title='The "wimax-enabled" property'>wimax-enabled</a>"            <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write
+  "<a class="link" href="NMClient.html#NMClient--wimax-hardware-enabled" title='The "wimax-hardware-enabled" property'>wimax-hardware-enabled</a>"   <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read
   "<a class="link" href="NMClient.html#NMClient--wireless-enabled" title='The "wireless-enabled" property'>wireless-enabled</a>"         <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write
   "<a class="link" href="NMClient.html#NMClient--wireless-hardware-enabled" title='The "wireless-hardware-enabled" property'>wireless-hardware-enabled</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read
-  "<a class="link" href="NMClient.html#NMClient--wwan-enabled" title='The "wwan-enabled" property'>wwan-enabled</a>"             <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write / Construct
-  "<a class="link" href="NMClient.html#NMClient--wwan-hardware-enabled" title='The "wwan-hardware-enabled" property'>wwan-hardware-enabled</a>"    <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write / Construct Only
+  "<a class="link" href="NMClient.html#NMClient--wwan-enabled" title='The "wwan-enabled" property'>wwan-enabled</a>"             <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write
+  "<a class="link" href="NMClient.html#NMClient--wwan-hardware-enabled" title='The "wwan-hardware-enabled" property'>wwan-hardware-enabled</a>"    <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read
 </pre>
 </div>
-<div class="refsect1" title="Signals">
+<div class="refsect1">
 <a name="NMClient.signals"></a><h2>Signals</h2>
 <pre class="synopsis">
-  "<a class="link" href="NMClient.html#NMClient-device-added" title='The "device-added" signal'>device-added</a>"                                   : Run First
-  "<a class="link" href="NMClient.html#NMClient-device-removed" title='The "device-removed" signal'>device-removed</a>"                                 : Run First
-  "<a class="link" href="NMClient.html#NMClient-permission-changed" title='The "permission-changed" signal'>permission-changed</a>"                             : Run First
+  "<a class="link" href="NMClient.html#NMClient-device-added" title='The "device-added" signal'>device-added</a>"                                   : <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-FIRST:CAPS"><code class="literal">Run First</code></a>
+  "<a class="link" href="NMClient.html#NMClient-device-removed" title='The "device-removed" signal'>device-removed</a>"                                 : <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-FIRST:CAPS"><code class="literal">Run First</code></a>
+  "<a class="link" href="NMClient.html#NMClient-permission-changed" title='The "permission-changed" signal'>permission-changed</a>"                             : <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-FIRST:CAPS"><code class="literal">Run First</code></a>
 </pre>
 </div>
-<div class="refsect1" title="Description">
+<div class="refsect1">
 <a name="NMClient.description"></a><h2>Description</h2>
 <p>
 </p>
 </div>
-<div class="refsect1" title="Details">
+<div class="refsect1">
 <a name="NMClient.details"></a><h2>Details</h2>
-<div class="refsect2" title="NM_CLIENT_STATE">
+<div class="refsect2">
+<a name="NM-CLIENT-VERSION:CAPS"></a><h3>NM_CLIENT_VERSION</h3>
+<pre class="programlisting">#define NM_CLIENT_VERSION "version"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="NM-CLIENT-STATE:CAPS"></a><h3>NM_CLIENT_STATE</h3>
 <pre class="programlisting">#define NM_CLIENT_STATE "state"
 </pre>
@@ -137,7 +169,7 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_CLIENT_MANAGER_RUNNING">
+<div class="refsect2">
 <a name="NM-CLIENT-MANAGER-RUNNING:CAPS"></a><h3>NM_CLIENT_MANAGER_RUNNING</h3>
 <pre class="programlisting">#define NM_CLIENT_MANAGER_RUNNING "manager-running"
 </pre>
@@ -145,7 +177,7 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_CLIENT_NETWORKING_ENABLED">
+<div class="refsect2">
 <a name="NM-CLIENT-NETWORKING-ENABLED:CAPS"></a><h3>NM_CLIENT_NETWORKING_ENABLED</h3>
 <pre class="programlisting">#define NM_CLIENT_NETWORKING_ENABLED "networking-enabled"
 </pre>
@@ -153,7 +185,7 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_CLIENT_WIRELESS_ENABLED">
+<div class="refsect2">
 <a name="NM-CLIENT-WIRELESS-ENABLED:CAPS"></a><h3>NM_CLIENT_WIRELESS_ENABLED</h3>
 <pre class="programlisting">#define NM_CLIENT_WIRELESS_ENABLED "wireless-enabled"
 </pre>
@@ -161,7 +193,7 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_CLIENT_WIRELESS_HARDWARE_ENABLED">
+<div class="refsect2">
 <a name="NM-CLIENT-WIRELESS-HARDWARE-ENABLED:CAPS"></a><h3>NM_CLIENT_WIRELESS_HARDWARE_ENABLED</h3>
 <pre class="programlisting">#define NM_CLIENT_WIRELESS_HARDWARE_ENABLED "wireless-hardware-enabled"
 </pre>
@@ -169,7 +201,7 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_CLIENT_WWAN_ENABLED">
+<div class="refsect2">
 <a name="NM-CLIENT-WWAN-ENABLED:CAPS"></a><h3>NM_CLIENT_WWAN_ENABLED</h3>
 <pre class="programlisting">#define NM_CLIENT_WWAN_ENABLED "wwan-enabled"
 </pre>
@@ -177,7 +209,7 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_CLIENT_WWAN_HARDWARE_ENABLED">
+<div class="refsect2">
 <a name="NM-CLIENT-WWAN-HARDWARE-ENABLED:CAPS"></a><h3>NM_CLIENT_WWAN_HARDWARE_ENABLED</h3>
 <pre class="programlisting">#define NM_CLIENT_WWAN_HARDWARE_ENABLED "wwan-hardware-enabled"
 </pre>
@@ -185,7 +217,23 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_CLIENT_ACTIVE_CONNECTIONS">
+<div class="refsect2">
+<a name="NM-CLIENT-WIMAX-ENABLED:CAPS"></a><h3>NM_CLIENT_WIMAX_ENABLED</h3>
+<pre class="programlisting">#define NM_CLIENT_WIMAX_ENABLED "wimax-enabled"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-CLIENT-WIMAX-HARDWARE-ENABLED:CAPS"></a><h3>NM_CLIENT_WIMAX_HARDWARE_ENABLED</h3>
+<pre class="programlisting">#define NM_CLIENT_WIMAX_HARDWARE_ENABLED "wimax-hardware-enabled"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="NM-CLIENT-ACTIVE-CONNECTIONS:CAPS"></a><h3>NM_CLIENT_ACTIVE_CONNECTIONS</h3>
 <pre class="programlisting">#define NM_CLIENT_ACTIVE_CONNECTIONS "active-connections"
 </pre>
@@ -193,23 +241,30 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.
 </p>
 </div>
 <hr>
-<div class="refsect2" title="enum NMClientPermission">
+<div class="refsect2">
 <a name="NMClientPermission"></a><h3>enum NMClientPermission</h3>
 <pre class="programlisting">typedef enum {
 	NM_CLIENT_PERMISSION_NONE = 0,
 	NM_CLIENT_PERMISSION_ENABLE_DISABLE_NETWORK = 1,
 	NM_CLIENT_PERMISSION_ENABLE_DISABLE_WIFI = 2,
 	NM_CLIENT_PERMISSION_ENABLE_DISABLE_WWAN = 3,
-	NM_CLIENT_PERMISSION_USE_USER_CONNECTIONS = 4,
+	NM_CLIENT_PERMISSION_ENABLE_DISABLE_WIMAX = 4,
+	NM_CLIENT_PERMISSION_SLEEP_WAKE = 5,
+	NM_CLIENT_PERMISSION_NETWORK_CONTROL = 6,
+	NM_CLIENT_PERMISSION_WIFI_SHARE_PROTECTED = 7,
+	NM_CLIENT_PERMISSION_WIFI_SHARE_OPEN = 8,
+	NM_CLIENT_PERMISSION_SETTINGS_MODIFY_SYSTEM = 9,
+	NM_CLIENT_PERMISSION_SETTINGS_MODIFY_OWN = 10,
+	NM_CLIENT_PERMISSION_SETTINGS_MODIFY_HOSTNAME = 11,
 
-	NM_CLIENT_PERMISSION_LAST = NM_CLIENT_PERMISSION_USE_USER_CONNECTIONS
+	NM_CLIENT_PERMISSION_LAST = NM_CLIENT_PERMISSION_SETTINGS_MODIFY_HOSTNAME
 } NMClientPermission;
 </pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="enum NMClientPermissionResult">
+<div class="refsect2">
 <a name="NMClientPermissionResult"></a><h3>enum NMClientPermissionResult</h3>
 <pre class="programlisting">typedef enum {
 	NM_CLIENT_PERMISSION_RESULT_UNKNOWN = 0,
@@ -222,14 +277,14 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMClient">
+<div class="refsect2">
 <a name="NMClient-struct"></a><h3>NMClient</h3>
 <pre class="programlisting">typedef struct _NMClient NMClient;</pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMClientClass">
+<div class="refsect2">
 <a name="NMClientClass"></a><h3>NMClientClass</h3>
 <pre class="programlisting">typedef struct {
 	NMObjectClass parent;
@@ -237,6 +292,9 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.
 	/* Signals */
 	void (*device_added) (NMClient *client, NMDevice *device);
 	void (*device_removed) (NMClient *client, NMDevice *device);
+	void (*permission_changed) (NMClient *client,
+	                            NMClientPermission permission,
+	                            NMClientPermissionResult result);
 
 	/* Padding for future expansion */
 	void (*_reserved1) (void);
@@ -251,7 +309,7 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_client_new ()">
+<div class="refsect2">
 <a name="nm-client-new"></a><h3>nm_client_new ()</h3>
 <pre class="programlisting"><a class="link" href="NMClient.html" title="NMClient"><span class="returnvalue">NMClient</span></a> *          nm_client_new                       (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
@@ -261,13 +319,13 @@ Creates a new <a class="link" href="NMClient.html" title="NMClient"><span class=
 <col align="left" valign="top">
 <tbody><tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a new <a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a>
+<td>a new <a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a>
 </td>
 </tr></tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_client_get_devices ()">
+<div class="refsect2">
 <a name="nm-client-get-devices"></a><h3>nm_client_get_devices ()</h3>
 <pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="returnvalue">GPtrArray</span></a> *   nm_client_get_devices               (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>);</pre>
 <p>
@@ -283,15 +341,15 @@ Gets all the detected devices.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> containing all the <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a>s.
-The returned array is owned by the client and should not be modified.
+<td>a <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> containing all the <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a>s.
+The returned array is owned by the client and should not be modified. <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>][<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMClient.Device]</span>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_client_get_device_by_path ()">
+<div class="refsect2">
 <a name="nm-client-get-device-by-path"></a><h3>nm_client_get_device_by_path ()</h3>
 <pre class="programlisting"><a class="link" href="NMDevice.html" title="NMDevice"><span class="returnvalue">NMDevice</span></a> *          nm_client_get_device_by_path        (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *object_path</code></em>);</pre>
@@ -308,58 +366,112 @@ Gets a <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>object_path</code></em> :</span></p></td>
-<td>the object path to search for
-</td>
+<td>the object path to search for</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> for the given <em class="parameter"><code>object_path</code></em> or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if none is found.
+<td>the <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> for the given <em class="parameter"><code>object_path</code></em> or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if none is found. <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="NMClientActivateDeviceFn ()">
-<a name="NMClientActivateDeviceFn"></a><h3>NMClientActivateDeviceFn ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                (*NMClientActivateDeviceFn)         (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> *object_path</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>);</pre>
+<div class="refsect2">
+<a name="NMClientActivateFn"></a><h3>NMClientActivateFn ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                (*NMClientActivateFn)               (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> *active_connection</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-client-activate-connection"></a><h3>nm_client_activate_connection ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                nm_client_activate_connection       (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>,
+                                                         <em class="parameter"><code><span class="type">NMConnection</span> *connection</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *specific_object</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="NMClient.html#NMClientActivateFn" title="NMClientActivateFn ()"><span class="type">NMClientActivateFn</span></a> callback</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
 <p>
+Starts a connection to a particular network using the configuration settings
+from <em class="parameter"><code>connection</code></em> and the network device <em class="parameter"><code>device</code></em>.  Certain connection types
+also take a "specific object" which is the object path of a connection-
+specific object, like an <a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a> for WiFi connections, or an
+<a class="link" href="NMWimaxNsp.html" title="NMWimaxNsp"><span class="type">NMWimaxNsp</span></a> for WiMAX connections, to which you wish to connect.  If the
+specific object is not given, NetworkManager can, in some cases, automatically
+determine which network to connect to given the settings in <em class="parameter"><code>connection</code></em>.
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
-<td>
+<td><p><span class="term"><em class="parameter"><code>client</code></em> :</span></p></td>
+<td>a <a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a>
 </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>object_path</code></em> :</span></p></td>
-<td>
+<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
+<td>an <span class="type">NMConnection</span>
 </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>
+<td><p><span class="term"><em class="parameter"><code>device</code></em> :</span></p></td>
+<td>the <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a>. <span class="annotation">[<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>specific_object</code></em> :</span></p></td>
+<td>the object path of a connection-type-specific
+object this activation should use. This parameter is currently ignored for
+wired and mobile broadband connections, and the value of NULL should be used
+(ie, no specific object).  For WiFi or WiMAX connections, pass the object
+path of a <a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a> or <a class="link" href="NMWimaxNsp.html" title="NMWimaxNsp"><span class="type">NMWimaxNsp</span></a> owned by <em class="parameter"><code>device</code></em>, which you can
+get using <a class="link" href="NMObject.html#nm-object-get-path" title="nm_object_get_path ()"><code class="function">nm_object_get_path()</code></a>, and which will be used to complete the
+details of the newly added connection. <span class="annotation">[<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>callback</code></em> :</span></p></td>
+<td>the function to call when the call is done. <span class="annotation">[<acronym title="The callback is valid until first called."><span class="acronym">scope async</span></acronym>][<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
+<td>user data to pass to the callback function. <span class="annotation">[<acronym title="This parameter is a 'user_data', for callbacks; many bindings can pass NULL here."><span class="acronym">closure</span></acronym>]</span>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_client_activate_connection ()">
-<a name="nm-client-activate-connection"></a><h3>nm_client_activate_connection ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                nm_client_activate_connection       (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> *service_name</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> *connection_path</code></em>,
+<div class="refsect2">
+<a name="NMClientAddActivateFn"></a><h3>NMClientAddActivateFn ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                (*NMClientAddActivateFn)            (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> *connection</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *new_connection_path</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-client-add-and-activate-connection"></a><h3>nm_client_add_and_activate_connection ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                nm_client_add_and_activate_connection
+                                                        (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>,
+                                                         <em class="parameter"><code><span class="type">NMConnection</span> *partial</code></em>,
                                                          <em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *specific_object</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMClient.html#NMClientActivateDeviceFn" title="NMClientActivateDeviceFn ()"><span class="type">NMClientActivateDeviceFn</span></a> callback</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="NMClient.html#NMClientAddActivateFn" title="NMClientAddActivateFn ()"><span class="type">NMClientAddActivateFn</span></a> callback</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
 <p>
-Activates a connection with the given <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a>.
+Adds a new connection using the given details (if any) as a template,
+automatically filling in missing settings with the capabilities of the
+given device and specific object.  The new connection is then activated.
+Cannot be used for VPN connections at this time.
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
@@ -370,13 +482,10 @@ Activates a connection with the given <a class="link" href="NMDevice.html" title
 </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>service_name</code></em> :</span></p></td>
-<td>the connection's service name
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>connection_path</code></em> :</span></p></td>
-<td>the connection's DBus path
+<td><p><span class="term"><em class="parameter"><code>partial</code></em> :</span></p></td>
+<td>an <span class="type">NMConnection</span> to add; the connection may be
+partially filled (or even NULL) and will be completed by NetworkManager
+using the given <em class="parameter"><code>device</code></em> and <em class="parameter"><code>specific_object</code></em> before being added. <span class="annotation">[<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span>
 </td>
 </tr>
 <tr>
@@ -386,25 +495,30 @@ Activates a connection with the given <a class="link" href="NMDevice.html" title
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>specific_object</code></em> :</span></p></td>
-<td>the device specific object (currently used only for
-activating wireless devices and should be the <a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a>'s path.
+<td>the object path of a connection-type-specific
+object this activation should use. This parameter is currently ignored for
+wired and mobile broadband connections, and the value of NULL should be used
+(ie, no specific object).  For WiFi or WiMAX connections, pass the object
+path of a <a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a> or <a class="link" href="NMWimaxNsp.html" title="NMWimaxNsp"><span class="type">NMWimaxNsp</span></a> owned by <em class="parameter"><code>device</code></em>, which you can
+get using <a class="link" href="NMObject.html#nm-object-get-path" title="nm_object_get_path ()"><code class="function">nm_object_get_path()</code></a>, and which will be used to complete the
+details of the newly added connection. <span class="annotation">[<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>callback</code></em> :</span></p></td>
-<td>the function to call when the call is done
+<td>the function to call when the call is done. <span class="annotation">[<acronym title="The callback is valid until first called."><span class="acronym">scope async</span></acronym>][<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
-<td>user data to pass to the callback function
+<td>user data to pass to the callback function. <span class="annotation">[<acronym title="This parameter is a 'user_data', for callbacks; many bindings can pass NULL here."><span class="acronym">closure</span></acronym>]</span>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_client_deactivate_connection ()">
+<div class="refsect2">
 <a name="nm-client-deactivate-connection"></a><h3>nm_client_deactivate_connection ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_client_deactivate_connection     (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>,
                                                          <em class="parameter"><code><a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> *active</code></em>);</pre>
@@ -421,14 +535,13 @@ Deactivates an active <a class="link" href="NMActiveConnection.html" title="NMAc
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>active</code></em> :</span></p></td>
-<td>the <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> to deactivate
-</td>
+<td>the <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> to deactivate</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_client_networking_get_enabled ()">
+<div class="refsect2">
 <a name="nm-client-networking-get-enabled"></a><h3>nm_client_networking_get_enabled ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_client_networking_get_enabled    (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>);</pre>
 <p>
@@ -444,14 +557,14 @@ Whether networking is enabled or disabled.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if networking is enabled, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if networking is disabled
-</td>
+<td>
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if networking is enabled, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if networking is disabled</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_client_networking_set_enabled ()">
+<div class="refsect2">
 <a name="nm-client-networking-set-enabled"></a><h3>nm_client_networking_set_enabled ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_client_networking_set_enabled    (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> enabled</code></em>);</pre>
@@ -471,14 +584,13 @@ all controlled interfaces are available for activation.
 <tr>
 <td><p><span class="term"><em class="parameter"><code>enabled</code></em> :</span></p></td>
 <td>
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> to set networking enabled, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> to set networking disabled
-</td>
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> to set networking enabled, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> to set networking disabled</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_client_wireless_get_enabled ()">
+<div class="refsect2">
 <a name="nm-client-wireless-get-enabled"></a><h3>nm_client_wireless_get_enabled ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_client_wireless_get_enabled      (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>);</pre>
 <p>
@@ -494,14 +606,14 @@ Determines whether the wireless is enabled.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if wireless is enabled
-</td>
+<td>
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if wireless is enabled</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_client_wireless_set_enabled ()">
+<div class="refsect2">
 <a name="nm-client-wireless-set-enabled"></a><h3>nm_client_wireless_set_enabled ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_client_wireless_set_enabled      (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> enabled</code></em>);</pre>
@@ -519,14 +631,13 @@ Enables or disables wireless devices.
 <tr>
 <td><p><span class="term"><em class="parameter"><code>enabled</code></em> :</span></p></td>
 <td>
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> to enable wireless
-</td>
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> to enable wireless</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_client_wireless_hardware_get_enabled ()">
+<div class="refsect2">
 <a name="nm-client-wireless-hardware-get-enabled"></a><h3>nm_client_wireless_hardware_get_enabled ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_client_wireless_hardware_get_enabled
                                                         (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>);</pre>
@@ -543,14 +654,14 @@ Determines whether the wireless hardware is enabled.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the wireless hardware is enabled
-</td>
+<td>
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the wireless hardware is enabled</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_client_wwan_get_enabled ()">
+<div class="refsect2">
 <a name="nm-client-wwan-get-enabled"></a><h3>nm_client_wwan_get_enabled ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_client_wwan_get_enabled          (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>);</pre>
 <p>
@@ -566,14 +677,14 @@ Determines whether WWAN is enabled.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if WWAN is enabled
-</td>
+<td>
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if WWAN is enabled</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_client_wwan_set_enabled ()">
+<div class="refsect2">
 <a name="nm-client-wwan-set-enabled"></a><h3>nm_client_wwan_set_enabled ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_client_wwan_set_enabled          (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> enabled</code></em>);</pre>
@@ -591,14 +702,13 @@ Enables or disables WWAN devices.
 <tr>
 <td><p><span class="term"><em class="parameter"><code>enabled</code></em> :</span></p></td>
 <td>
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> to enable WWAN
-</td>
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> to enable WWAN</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_client_wwan_hardware_get_enabled ()">
+<div class="refsect2">
 <a name="nm-client-wwan-hardware-get-enabled"></a><h3>nm_client_wwan_hardware_get_enabled ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_client_wwan_hardware_get_enabled (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>);</pre>
 <p>
@@ -614,14 +724,107 @@ Determines whether the WWAN hardware is enabled.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the WWAN hardware is enabled
+<td>
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the WWAN hardware is enabled</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-client-wimax-get-enabled"></a><h3>nm_client_wimax_get_enabled ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_client_wimax_get_enabled         (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>);</pre>
+<p>
+Determines whether WiMAX is enabled.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>client</code></em> :</span></p></td>
+<td>a <a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if WiMAX is enabled</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-client-wimax-set-enabled"></a><h3>nm_client_wimax_set_enabled ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                nm_client_wimax_set_enabled         (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> enabled</code></em>);</pre>
+<p>
+Enables or disables WiMAX devices.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>client</code></em> :</span></p></td>
+<td>a <a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>enabled</code></em> :</span></p></td>
+<td>
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> to enable WiMAX</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-client-wimax-hardware-get-enabled"></a><h3>nm_client_wimax_hardware_get_enabled ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_client_wimax_hardware_get_enabled
+                                                        (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>);</pre>
+<p>
+Determines whether the WiMAX hardware is enabled.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>client</code></em> :</span></p></td>
+<td>a <a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the WiMAX hardware is enabled</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-client-get-version"></a><h3>nm_client_get_version ()</h3>
+<pre class="programlisting">const <span class="returnvalue">char</span> *        nm_client_get_version               (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>);</pre>
+<p>
+Gets NetworkManager version.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>client</code></em> :</span></p></td>
+<td>a <a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a>
 </td>
 </tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>string with the version</td>
+</tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_client_get_state ()">
+<div class="refsect2">
 <a name="nm-client-get-state"></a><h3>nm_client_get_state ()</h3>
 <pre class="programlisting"><span class="returnvalue">NMState</span>             nm_client_get_state                 (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>);</pre>
 <p>
@@ -637,14 +840,14 @@ Gets the current daemon state.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the current <code class="literal">NMState</code>
+<td>the current <code class="literal">NMState</code>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_client_get_manager_running ()">
+<div class="refsect2">
 <a name="nm-client-get-manager-running"></a><h3>nm_client_get_manager_running ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_client_get_manager_running       (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>);</pre>
 <p>
@@ -660,14 +863,14 @@ Determines whether the daemon is running.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the daemon is running
-</td>
+<td>
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the daemon is running</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_client_get_active_connections ()">
+<div class="refsect2">
 <a name="nm-client-get-active-connections"></a><h3>nm_client_get_active_connections ()</h3>
 <pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="returnvalue">GPtrArray</span></a> *   nm_client_get_active_connections    (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>);</pre>
 <p>
@@ -683,15 +886,16 @@ Gets the active connections.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> containing all the active <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a>s.
-The returned array is owned by the client and should not be modified.
+<td>a <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a>
+containing all the active <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a>s.
+The returned array is owned by the client and should not be modified. <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>][<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMClient.ActiveConnection]</span>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_client_sleep ()">
+<div class="refsect2">
 <a name="nm-client-sleep"></a><h3>nm_client_sleep ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_client_sleep                     (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> sleep</code></em>);</pre>
@@ -709,14 +913,13 @@ Deprecated; use <a class="link" href="NMClient.html#nm-client-networking-set-ena
 <tr>
 <td><p><span class="term"><em class="parameter"><code>sleep</code></em> :</span></p></td>
 <td>
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> to put the daemon to sleep
-</td>
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> to put the daemon to sleep</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_client_get_permission_result ()">
+<div class="refsect2">
 <a name="nm-client-get-permission-result"></a><h3>nm_client_get_permission_result ()</h3>
 <pre class="programlisting"><a class="link" href="NMClient.html#NMClientPermissionResult" title="enum NMClientPermissionResult"><span class="returnvalue">NMClientPermissionResult</span></a>  nm_client_get_permission_result
                                                         (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>,
@@ -740,80 +943,103 @@ client can or cannot perform the action the permission represents
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the permission's result, one of <a class="link" href="NMClient.html#NMClientPermissionResult" title="enum NMClientPermissionResult"><span class="type">NMClientPermissionResult</span></a>
+<td>the permission's result, one of <a class="link" href="NMClient.html#NMClientPermissionResult" title="enum NMClientPermissionResult"><span class="type">NMClientPermissionResult</span></a>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 </div>
-<div class="refsect1" title="Property Details">
+<div class="refsect1">
 <a name="NMClient.property-details"></a><h2>Property Details</h2>
-<div class="refsect2" title='The "active-connections" property'>
+<div class="refsect2">
 <a name="NMClient--active-connections"></a><h3>The <code class="literal">"active-connections"</code> property</h3>
-<pre class="programlisting">  "active-connections"       <span class="type">nm-object-array*</span>      : Read</pre>
+<pre class="programlisting">  "active-connections"       <span class="type">NMObjectArray</span>*        : Read</pre>
 <p>Active connections.</p>
 </div>
 <hr>
-<div class="refsect2" title='The "manager-running" property'>
+<div class="refsect2">
 <a name="NMClient--manager-running"></a><h3>The <code class="literal">"manager-running"</code> property</h3>
 <pre class="programlisting">  "manager-running"          <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read</pre>
 <p>Whether NetworkManager is running.</p>
 <p>Default value: FALSE</p>
 </div>
 <hr>
-<div class="refsect2" title='The "networking-enabled" property'>
+<div class="refsect2">
 <a name="NMClient--networking-enabled"></a><h3>The <code class="literal">"networking-enabled"</code> property</h3>
-<pre class="programlisting">  "networking-enabled"       <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read</pre>
+<pre class="programlisting">  "networking-enabled"       <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write</pre>
 <p>Is networking enabled.</p>
 <p>Default value: TRUE</p>
 </div>
 <hr>
-<div class="refsect2" title='The "state" property'>
+<div class="refsect2">
 <a name="NMClient--state"></a><h3>The <code class="literal">"state"</code> property</h3>
 <pre class="programlisting">  "state"                    <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read</pre>
 <p>
 The current daemon state.
 </p>
-<p>Allowed values: &lt;= 4</p>
+<p>Allowed values: &lt;= 70</p>
 <p>Default value: 0</p>
 </div>
 <hr>
-<div class="refsect2" title='The "wireless-enabled" property'>
+<div class="refsect2">
+<a name="NMClient--version"></a><h3>The <code class="literal">"version"</code> property</h3>
+<pre class="programlisting">  "version"                  <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read</pre>
+<p>
+The NetworkManager version.
+</p>
+<p>Default value: NULL</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMClient--wimax-enabled"></a><h3>The <code class="literal">"wimax-enabled"</code> property</h3>
+<pre class="programlisting">  "wimax-enabled"            <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write</pre>
+<p>Is WiMAX enabled.</p>
+<p>Default value: FALSE</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMClient--wimax-hardware-enabled"></a><h3>The <code class="literal">"wimax-hardware-enabled"</code> property</h3>
+<pre class="programlisting">  "wimax-hardware-enabled"   <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read</pre>
+<p>Is WiMAX hardware enabled.</p>
+<p>Default value: FALSE</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="NMClient--wireless-enabled"></a><h3>The <code class="literal">"wireless-enabled"</code> property</h3>
 <pre class="programlisting">  "wireless-enabled"         <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write</pre>
 <p>Is wireless enabled.</p>
-<p>Default value: TRUE</p>
+<p>Default value: FALSE</p>
 </div>
 <hr>
-<div class="refsect2" title='The "wireless-hardware-enabled" property'>
+<div class="refsect2">
 <a name="NMClient--wireless-hardware-enabled"></a><h3>The <code class="literal">"wireless-hardware-enabled"</code> property</h3>
 <pre class="programlisting">  "wireless-hardware-enabled" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read</pre>
 <p>Is wireless hardware enabled.</p>
 <p>Default value: TRUE</p>
 </div>
 <hr>
-<div class="refsect2" title='The "wwan-enabled" property'>
+<div class="refsect2">
 <a name="NMClient--wwan-enabled"></a><h3>The <code class="literal">"wwan-enabled"</code> property</h3>
-<pre class="programlisting">  "wwan-enabled"             <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write / Construct</pre>
+<pre class="programlisting">  "wwan-enabled"             <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write</pre>
 <p>Is WWAN enabled.</p>
-<p>Default value: TRUE</p>
+<p>Default value: FALSE</p>
 </div>
 <hr>
-<div class="refsect2" title='The "wwan-hardware-enabled" property'>
+<div class="refsect2">
 <a name="NMClient--wwan-hardware-enabled"></a><h3>The <code class="literal">"wwan-hardware-enabled"</code> property</h3>
-<pre class="programlisting">  "wwan-hardware-enabled"    <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write / Construct Only</pre>
+<pre class="programlisting">  "wwan-hardware-enabled"    <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read</pre>
 <p>Is WWAN hardware enabled.</p>
-<p>Default value: TRUE</p>
+<p>Default value: FALSE</p>
 </div>
 </div>
-<div class="refsect1" title="Signal Details">
+<div class="refsect1">
 <a name="NMClient.signal-details"></a><h2>Signal Details</h2>
-<div class="refsect2" title='The "device-added" signal'>
+<div class="refsect2">
 <a name="NMClient-device-added"></a><h3>The <code class="literal">"device-added"</code> signal</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                user_function                      (<a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client,
                                                         <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a>  *device,
-                                                        <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>  user_data)      : Run First</pre>
+                                                        <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>  user_data)      : <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-FIRST:CAPS"><code class="literal">Run First</code></a></pre>
 <p>
 Notifies that a <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> is added.
 </p>
@@ -822,12 +1048,11 @@ Notifies that a <a class="link" href="NMDevice.html" title="NMDevice"><span clas
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>client</code></em> :</span></p></td>
-<td>the client that received the signal
-</td>
+<td>the client that received the signal</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>device</code></em> :</span></p></td>
-<td>the new device
+<td>the new device. <span class="annotation">[<acronym title="Override the parsed C type with given type"><span class="acronym">type</span></acronym> NMClient.Device]</span>
 </td>
 </tr>
 <tr>
@@ -838,11 +1063,11 @@ Notifies that a <a class="link" href="NMDevice.html" title="NMDevice"><span clas
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title='The "device-removed" signal'>
+<div class="refsect2">
 <a name="NMClient-device-removed"></a><h3>The <code class="literal">"device-removed"</code> signal</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                user_function                      (<a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *widget,
                                                         <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a>  *device,
-                                                        <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>  user_data)      : Run First</pre>
+                                                        <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>  user_data)      : <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-FIRST:CAPS"><code class="literal">Run First</code></a></pre>
 <p>
 Notifies that a <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> is removed.
 </p>
@@ -851,12 +1076,11 @@ Notifies that a <a class="link" href="NMDevice.html" title="NMDevice"><span clas
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>widget</code></em> :</span></p></td>
-<td>the client that received the signal
-</td>
+<td>the client that received the signal</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>device</code></em> :</span></p></td>
-<td>the removed device
+<td>the removed device. <span class="annotation">[<acronym title="Override the parsed C type with given type"><span class="acronym">type</span></acronym> NMClient.Device]</span>
 </td>
 </tr>
 <tr>
@@ -867,12 +1091,12 @@ Notifies that a <a class="link" href="NMDevice.html" title="NMDevice"><span clas
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title='The "permission-changed" signal'>
+<div class="refsect2">
 <a name="NMClient-permission-changed"></a><h3>The <code class="literal">"permission-changed"</code> signal</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                user_function                      (<a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *widget,
                                                         <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>     permission,
                                                         <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>     result,
-                                                        <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>  user_data)       : Run First</pre>
+                                                        <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>  user_data)       : <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-FIRST:CAPS"><code class="literal">Run First</code></a></pre>
 <p>
 Notifies that a permission has changed
 </p>
@@ -881,8 +1105,7 @@ Notifies that a permission has changed
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>widget</code></em> :</span></p></td>
-<td>the client that received the signal
-</td>
+<td>the client that received the signal</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>permission</code></em> :</span></p></td>
@@ -905,6 +1128,6 @@ Notifies that a permission has changed
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.15</div>
+          Generated by GTK-Doc V1.17</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDHCP4Config.html b/docs/libnm-glib/html/NMDHCP4Config.html
index 233b1047c..49a48faf7 100644
--- a/docs/libnm-glib/html/NMDHCP4Config.html
+++ b/docs/libnm-glib/html/NMDHCP4Config.html
@@ -3,19 +3,19 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>NMDHCP4Config</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="libnm-glib Reference Manual">
-<link rel="up" href="ch01.html" title="libnm-glib Objects">
+<link rel="up" href="ch02.html" title="libnm-glib API Reference">
 <link rel="prev" href="NMIP6Config.html" title="NMIP6Config">
 <link rel="next" href="NMDHCP6Config.html" title="NMDHCP6Config">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
 <tr valign="middle">
 <td><a accesskey="p" href="NMIP6Config.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="ch01.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
+<td><a accesskey="u" href="ch02.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
 <th width="100%" align="center">libnm-glib Reference Manual</th>
 <td><a accesskey="n" href="NMDHCP6Config.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
@@ -30,7 +30,7 @@
                   <a href="#NMDHCP4Config.properties" class="shortcut">Properties</a>
 </td></tr>
 </table>
-<div class="refentry" title="NMDHCP4Config">
+<div class="refentry">
 <a name="NMDHCP4Config"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
@@ -39,7 +39,7 @@
 </td>
 <td valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv" title="Synopsis">
+<div class="refsynopsisdiv">
 <a name="NMDHCP4Config.synopsis"></a><h2>Synopsis</h2>
 <pre class="synopsis">                    <a class="link" href="NMDHCP4Config.html#NMDHCP4Config-struct" title="NMDHCP4Config">NMDHCP4Config</a>;
                     <a class="link" href="NMDHCP4Config.html#NMDHCP4ConfigClass" title="NMDHCP4ConfigClass">NMDHCP4ConfigClass</a>;
@@ -51,7 +51,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMDHC
                                                          <em class="parameter"><code>const <span class="type">char</span> *option</code></em>);
 </pre>
 </div>
-<div class="refsect1" title="Object Hierarchy">
+<div class="refsect1">
 <a name="NMDHCP4Config.object-hierarchy"></a><h2>Object Hierarchy</h2>
 <pre class="synopsis">
   <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>
@@ -59,27 +59,27 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMDHC
          +----NMDHCP4Config
 </pre>
 </div>
-<div class="refsect1" title="Properties">
+<div class="refsect1">
 <a name="NMDHCP4Config.properties"></a><h2>Properties</h2>
 <pre class="synopsis">
   "<a class="link" href="NMDHCP4Config.html#NMDHCP4Config--options" title='The "options" property'>options</a>"                  <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a>*           : Read
 </pre>
 </div>
-<div class="refsect1" title="Description">
+<div class="refsect1">
 <a name="NMDHCP4Config.description"></a><h2>Description</h2>
 <p>
 </p>
 </div>
-<div class="refsect1" title="Details">
+<div class="refsect1">
 <a name="NMDHCP4Config.details"></a><h2>Details</h2>
-<div class="refsect2" title="NMDHCP4Config">
+<div class="refsect2">
 <a name="NMDHCP4Config-struct"></a><h3>NMDHCP4Config</h3>
 <pre class="programlisting">typedef struct _NMDHCP4Config NMDHCP4Config;</pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMDHCP4ConfigClass">
+<div class="refsect2">
 <a name="NMDHCP4ConfigClass"></a><h3>NMDHCP4ConfigClass</h3>
 <pre class="programlisting">typedef struct {
 	NMObjectClass parent;
@@ -97,7 +97,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMDHC
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_DHCP4_CONFIG_OPTIONS">
+<div class="refsect2">
 <a name="NM-DHCP4-CONFIG-OPTIONS:CAPS"></a><h3>NM_DHCP4_CONFIG_OPTIONS</h3>
 <pre class="programlisting">#define NM_DHCP4_CONFIG_OPTIONS "options"
 </pre>
@@ -105,7 +105,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMDHC
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_dhcp4_config_new ()">
+<div class="refsect2">
 <a name="nm-dhcp4-config-new"></a><h3>nm_dhcp4_config_new ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="returnvalue">GObject</span></a> *           nm_dhcp4_config_new                 (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGConnection.html#DBusGConnection"><span class="type">DBusGConnection</span></a> *connection</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *object_path</code></em>);</pre>
@@ -122,19 +122,18 @@ Creates a new <a class="link" href="NMDHCP4Config.html" title="NMDHCP4Config"><s
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>object_path</code></em> :</span></p></td>
-<td>the DBus object path of the device
-</td>
+<td>the DBus object path of the device</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a new configuration
+<td>a new configuration. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_dhcp4_config_get_options ()">
+<div class="refsect2">
 <a name="nm-dhcp4-config-get-options"></a><h3>nm_dhcp4_config_get_options ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="returnvalue">GHashTable</span></a> *        nm_dhcp4_config_get_options         (<em class="parameter"><code><a class="link" href="NMDHCP4Config.html" title="NMDHCP4Config"><span class="type">NMDHCP4Config</span></a> *config</code></em>);</pre>
 <p>
@@ -150,15 +149,15 @@ Gets all the options contained in the configuration.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> containing strings for keys and values.
-This is the internal copy used by the configuration, and must not be modified.
+<td>the <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> containing strings for keys and values.
+This is the internal copy used by the configuration, and must not be modified. <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>][<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> utf8 GObject.Value]</span>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_dhcp4_config_get_one_option ()">
+<div class="refsect2">
 <a name="nm-dhcp4-config-get-one-option"></a><h3>nm_dhcp4_config_get_one_option ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_dhcp4_config_get_one_option      (<em class="parameter"><code><a class="link" href="NMDHCP4Config.html" title="NMDHCP4Config"><span class="type">NMDHCP4Config</span></a> *config</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *option</code></em>);</pre>
@@ -175,32 +174,34 @@ Gets one option by option name.
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>option</code></em> :</span></p></td>
-<td>the option to retrieve
-</td>
+<td>the option to retrieve</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the configuration option's value. This is the internal string used by the
-configuration, and must not be modified.
-</td>
+<td>the configuration option's value. This is the internal string used by the
+configuration, and must not be modified.</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 </div>
-<div class="refsect1" title="Property Details">
+<div class="refsect1">
 <a name="NMDHCP4Config.property-details"></a><h2>Property Details</h2>
-<div class="refsect2" title='The "options" property'>
+<div class="refsect2">
 <a name="NMDHCP4Config--options"></a><h3>The <code class="literal">"options"</code> property</h3>
 <pre class="programlisting">  "options"                  <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a>*           : Read</pre>
 <p>
 The <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> containing options of the configuration.
 </p>
+<p>
+Type: GLib.HashTable
+Element-Type: utf8,GObject.Value
+</p>
 </div>
 </div>
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.15</div>
+          Generated by GTK-Doc V1.17</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDHCP6Config.html b/docs/libnm-glib/html/NMDHCP6Config.html
index 4dd32c331..2b330a1b6 100644
--- a/docs/libnm-glib/html/NMDHCP6Config.html
+++ b/docs/libnm-glib/html/NMDHCP6Config.html
@@ -3,22 +3,22 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>NMDHCP6Config</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="libnm-glib Reference Manual">
-<link rel="up" href="ch01.html" title="libnm-glib Objects">
+<link rel="up" href="ch02.html" title="libnm-glib API Reference">
 <link rel="prev" href="NMDHCP4Config.html" title="NMDHCP4Config">
-<link rel="next" href="NMExportedConnection.html" title="NMExportedConnection">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
+<link rel="next" href="NMObject.html" title="NMObject">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
 <tr valign="middle">
 <td><a accesskey="p" href="NMDHCP4Config.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="ch01.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
+<td><a accesskey="u" href="ch02.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
 <th width="100%" align="center">libnm-glib Reference Manual</th>
-<td><a accesskey="n" href="NMExportedConnection.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+<td><a accesskey="n" href="NMObject.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
 </tr>
 <tr><td colspan="5" class="shortcuts">
 <a href="#NMDHCP6Config.synopsis" class="shortcut">Top</a>
@@ -30,7 +30,7 @@
                   <a href="#NMDHCP6Config.properties" class="shortcut">Properties</a>
 </td></tr>
 </table>
-<div class="refentry" title="NMDHCP6Config">
+<div class="refentry">
 <a name="NMDHCP6Config"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
@@ -39,7 +39,7 @@
 </td>
 <td valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv" title="Synopsis">
+<div class="refsynopsisdiv">
 <a name="NMDHCP6Config.synopsis"></a><h2>Synopsis</h2>
 <pre class="synopsis">                    <a class="link" href="NMDHCP6Config.html#NMDHCP6Config-struct" title="NMDHCP6Config">NMDHCP6Config</a>;
                     <a class="link" href="NMDHCP6Config.html#NMDHCP6ConfigClass" title="NMDHCP6ConfigClass">NMDHCP6ConfigClass</a>;
@@ -51,7 +51,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMDHC
                                                          <em class="parameter"><code>const <span class="type">char</span> *option</code></em>);
 </pre>
 </div>
-<div class="refsect1" title="Object Hierarchy">
+<div class="refsect1">
 <a name="NMDHCP6Config.object-hierarchy"></a><h2>Object Hierarchy</h2>
 <pre class="synopsis">
   <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>
@@ -59,27 +59,27 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMDHC
          +----NMDHCP6Config
 </pre>
 </div>
-<div class="refsect1" title="Properties">
+<div class="refsect1">
 <a name="NMDHCP6Config.properties"></a><h2>Properties</h2>
 <pre class="synopsis">
   "<a class="link" href="NMDHCP6Config.html#NMDHCP6Config--options" title='The "options" property'>options</a>"                  <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a>*           : Read
 </pre>
 </div>
-<div class="refsect1" title="Description">
+<div class="refsect1">
 <a name="NMDHCP6Config.description"></a><h2>Description</h2>
 <p>
 </p>
 </div>
-<div class="refsect1" title="Details">
+<div class="refsect1">
 <a name="NMDHCP6Config.details"></a><h2>Details</h2>
-<div class="refsect2" title="NMDHCP6Config">
+<div class="refsect2">
 <a name="NMDHCP6Config-struct"></a><h3>NMDHCP6Config</h3>
 <pre class="programlisting">typedef struct _NMDHCP6Config NMDHCP6Config;</pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMDHCP6ConfigClass">
+<div class="refsect2">
 <a name="NMDHCP6ConfigClass"></a><h3>NMDHCP6ConfigClass</h3>
 <pre class="programlisting">typedef struct {
 	NMObjectClass parent;
@@ -97,7 +97,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMDHC
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_DHCP6_CONFIG_OPTIONS">
+<div class="refsect2">
 <a name="NM-DHCP6-CONFIG-OPTIONS:CAPS"></a><h3>NM_DHCP6_CONFIG_OPTIONS</h3>
 <pre class="programlisting">#define NM_DHCP6_CONFIG_OPTIONS "options"
 </pre>
@@ -105,7 +105,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMDHC
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_dhcp6_config_new ()">
+<div class="refsect2">
 <a name="nm-dhcp6-config-new"></a><h3>nm_dhcp6_config_new ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="returnvalue">GObject</span></a> *           nm_dhcp6_config_new                 (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGConnection.html#DBusGConnection"><span class="type">DBusGConnection</span></a> *connection</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *object_path</code></em>);</pre>
@@ -122,19 +122,18 @@ Creates a new <a class="link" href="NMDHCP6Config.html" title="NMDHCP6Config"><s
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>object_path</code></em> :</span></p></td>
-<td>the DBus object path of the device
-</td>
+<td>the DBus object path of the device</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a new configuration
+<td>a new configuration. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_dhcp6_config_get_options ()">
+<div class="refsect2">
 <a name="nm-dhcp6-config-get-options"></a><h3>nm_dhcp6_config_get_options ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="returnvalue">GHashTable</span></a> *        nm_dhcp6_config_get_options         (<em class="parameter"><code><a class="link" href="NMDHCP6Config.html" title="NMDHCP6Config"><span class="type">NMDHCP6Config</span></a> *config</code></em>);</pre>
 <p>
@@ -150,15 +149,15 @@ Gets all the options contained in the configuration.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> containing strings for keys and values.
-This is the internal copy used by the configuration, and must not be modified.
+<td>the <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> containing strings for keys and values.
+This is the internal copy used by the configuration, and must not be modified. <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>][<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> utf8 GObject.Value]</span>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_dhcp6_config_get_one_option ()">
+<div class="refsect2">
 <a name="nm-dhcp6-config-get-one-option"></a><h3>nm_dhcp6_config_get_one_option ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_dhcp6_config_get_one_option      (<em class="parameter"><code><a class="link" href="NMDHCP6Config.html" title="NMDHCP6Config"><span class="type">NMDHCP6Config</span></a> *config</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *option</code></em>);</pre>
@@ -175,32 +174,34 @@ Gets one option by option name.
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>option</code></em> :</span></p></td>
-<td>the option to retrieve
-</td>
+<td>the option to retrieve</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the configuration option's value. This is the internal string used by the
-configuration, and must not be modified.
-</td>
+<td>the configuration option's value. This is the internal string used by the
+configuration, and must not be modified.</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 </div>
-<div class="refsect1" title="Property Details">
+<div class="refsect1">
 <a name="NMDHCP6Config.property-details"></a><h2>Property Details</h2>
-<div class="refsect2" title='The "options" property'>
+<div class="refsect2">
 <a name="NMDHCP6Config--options"></a><h3>The <code class="literal">"options"</code> property</h3>
 <pre class="programlisting">  "options"                  <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a>*           : Read</pre>
 <p>
 The <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> containing options of the configuration.
 </p>
+<p>
+Type: GLib.HashTable
+Element-Type: utf8,GObject.Value
+</p>
 </div>
 </div>
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.15</div>
+          Generated by GTK-Doc V1.17</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDevice.html b/docs/libnm-glib/html/NMDevice.html
index 31672ab6c..b19fba638 100644
--- a/docs/libnm-glib/html/NMDevice.html
+++ b/docs/libnm-glib/html/NMDevice.html
@@ -3,19 +3,19 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>NMDevice</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="libnm-glib Reference Manual">
-<link rel="up" href="ch01.html" title="libnm-glib Objects">
+<link rel="up" href="ch02.html" title="libnm-glib API Reference">
 <link rel="prev" href="NMActiveConnection.html" title="NMActiveConnection">
 <link rel="next" href="NMDeviceEthernet.html" title="NMDeviceEthernet">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
 <tr valign="middle">
 <td><a accesskey="p" href="NMActiveConnection.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="ch01.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
+<td><a accesskey="u" href="ch02.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
 <th width="100%" align="center">libnm-glib Reference Manual</th>
 <td><a accesskey="n" href="NMDeviceEthernet.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
@@ -32,7 +32,7 @@
                   <a href="#NMDevice.signals" class="shortcut">Signals</a>
 </td></tr>
 </table>
-<div class="refentry" title="NMDevice">
+<div class="refentry">
 <a name="NMDevice"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
@@ -41,9 +41,10 @@
 </td>
 <td valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv" title="Synopsis">
+<div class="refsynopsisdiv">
 <a name="NMDevice.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">#define             <a class="link" href="NMDevice.html#NM-DEVICE-UDI:CAPS" title="NM_DEVICE_UDI">NM_DEVICE_UDI</a>
+<pre class="synopsis">#define             <a class="link" href="NMDevice.html#NM-DEVICE-DEVICE-TYPE:CAPS" title="NM_DEVICE_DEVICE_TYPE">NM_DEVICE_DEVICE_TYPE</a>
+#define             <a class="link" href="NMDevice.html#NM-DEVICE-UDI:CAPS" title="NM_DEVICE_UDI">NM_DEVICE_UDI</a>
 #define             <a class="link" href="NMDevice.html#NM-DEVICE-INTERFACE:CAPS" title="NM_DEVICE_INTERFACE">NM_DEVICE_INTERFACE</a>
 #define             <a class="link" href="NMDevice.html#NM-DEVICE-IP-INTERFACE:CAPS" title="NM_DEVICE_IP_INTERFACE">NM_DEVICE_IP_INTERFACE</a>
 #define             <a class="link" href="NMDevice.html#NM-DEVICE-DRIVER:CAPS" title="NM_DEVICE_DRIVER">NM_DEVICE_DRIVER</a>
@@ -61,29 +62,32 @@
                     <a class="link" href="NMDevice.html#NMDeviceClass" title="NMDeviceClass">NMDeviceClass</a>;
 <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="returnvalue">GObject</span></a> *           <a class="link" href="NMDevice.html#nm-device-new" title="nm_device_new ()">nm_device_new</a>                       (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGConnection.html#DBusGConnection"><span class="type">DBusGConnection</span></a> *connection</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *path</code></em>);
-const <span class="returnvalue">char</span> *        <a class="link" href="NMDevice.html#nm-device-get-iface" title="nm_device_get_iface ()">nm_device_get_iface</a>                 (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);
-const <span class="returnvalue">char</span> *        <a class="link" href="NMDevice.html#nm-device-get-ip-iface" title="nm_device_get_ip_iface ()">nm_device_get_ip_iface</a>              (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);
-const <span class="returnvalue">char</span> *        <a class="link" href="NMDevice.html#nm-device-get-udi" title="nm_device_get_udi ()">nm_device_get_udi</a>                   (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);
-const <span class="returnvalue">char</span> *        <a class="link" href="NMDevice.html#nm-device-get-driver" title="nm_device_get_driver ()">nm_device_get_driver</a>                (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             <a class="link" href="NMDevice.html#nm-device-get-capabilities" title="nm_device_get_capabilities ()">nm_device_get_capabilities</a>          (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);
+const <span class="returnvalue">char</span> *          <a class="link" href="NMDevice.html#nm-device-get-iface" title="nm_device_get_iface ()">nm_device_get_iface</a>               (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);
+const <span class="returnvalue">char</span> *          <a class="link" href="NMDevice.html#nm-device-get-ip-iface" title="nm_device_get_ip_iface ()">nm_device_get_ip_iface</a>            (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);
+<span class="returnvalue">NMDeviceType</span>        <a class="link" href="NMDevice.html#nm-device-get-device-type" title="nm_device_get_device_type ()">nm_device_get_device_type</a>           (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);
+const <span class="returnvalue">char</span> *          <a class="link" href="NMDevice.html#nm-device-get-udi" title="nm_device_get_udi ()">nm_device_get_udi</a>                 (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);
+const <span class="returnvalue">char</span> *          <a class="link" href="NMDevice.html#nm-device-get-driver" title="nm_device_get_driver ()">nm_device_get_driver</a>              (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);
+<span class="returnvalue">NMDeviceCapabilities</span>  <a class="link" href="NMDevice.html#nm-device-get-capabilities" title="nm_device_get_capabilities ()">nm_device_get_capabilities</a>        (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMDevice.html#nm-device-get-managed" title="nm_device_get_managed ()">nm_device_get_managed</a>               (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMDevice.html#nm-device-get-firmware-missing" title="nm_device_get_firmware_missing ()">nm_device_get_firmware_missing</a>      (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);
-<a class="link" href="NMIP4Config.html" title="NMIP4Config"><span class="returnvalue">NMIP4Config</span></a> *       <a class="link" href="NMDevice.html#nm-device-get-ip4-config" title="nm_device_get_ip4_config ()">nm_device_get_ip4_config</a>            (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);
-<a class="link" href="NMDHCP4Config.html" title="NMDHCP4Config"><span class="returnvalue">NMDHCP4Config</span></a> *     <a class="link" href="NMDevice.html#nm-device-get-dhcp4-config" title="nm_device_get_dhcp4_config ()">nm_device_get_dhcp4_config</a>          (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);
-<a class="link" href="NMIP6Config.html" title="NMIP6Config"><span class="returnvalue">NMIP6Config</span></a> *       <a class="link" href="NMDevice.html#nm-device-get-ip6-config" title="nm_device_get_ip6_config ()">nm_device_get_ip6_config</a>            (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);
-<a class="link" href="NMDHCP6Config.html" title="NMDHCP6Config"><span class="returnvalue">NMDHCP6Config</span></a> *     <a class="link" href="NMDevice.html#nm-device-get-dhcp6-config" title="nm_device_get_dhcp6_config ()">nm_device_get_dhcp6_config</a>          (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);
+<a class="link" href="NMIP4Config.html" title="NMIP4Config"><span class="returnvalue">NMIP4Config</span></a> *         <a class="link" href="NMDevice.html#nm-device-get-ip4-config" title="nm_device_get_ip4_config ()">nm_device_get_ip4_config</a>          (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);
+<a class="link" href="NMDHCP4Config.html" title="NMDHCP4Config"><span class="returnvalue">NMDHCP4Config</span></a> *       <a class="link" href="NMDevice.html#nm-device-get-dhcp4-config" title="nm_device_get_dhcp4_config ()">nm_device_get_dhcp4_config</a>        (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);
+<a class="link" href="NMIP6Config.html" title="NMIP6Config"><span class="returnvalue">NMIP6Config</span></a> *         <a class="link" href="NMDevice.html#nm-device-get-ip6-config" title="nm_device_get_ip6_config ()">nm_device_get_ip6_config</a>          (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);
+<a class="link" href="NMDHCP6Config.html" title="NMDHCP6Config"><span class="returnvalue">NMDHCP6Config</span></a> *       <a class="link" href="NMDevice.html#nm-device-get-dhcp6-config" title="nm_device_get_dhcp6_config ()">nm_device_get_dhcp6_config</a>        (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);
 <span class="returnvalue">NMDeviceState</span>       <a class="link" href="NMDevice.html#nm-device-get-state" title="nm_device_get_state ()">nm_device_get_state</a>                 (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);
-const <span class="returnvalue">char</span> *        <a class="link" href="NMDevice.html#nm-device-get-product" title="nm_device_get_product ()">nm_device_get_product</a>               (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);
-const <span class="returnvalue">char</span> *        <a class="link" href="NMDevice.html#nm-device-get-vendor" title="nm_device_get_vendor ()">nm_device_get_vendor</a>                (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);
+const <span class="returnvalue">char</span> *          <a class="link" href="NMDevice.html#nm-device-get-product" title="nm_device_get_product ()">nm_device_get_product</a>             (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);
+const <span class="returnvalue">char</span> *          <a class="link" href="NMDevice.html#nm-device-get-vendor" title="nm_device_get_vendor ()">nm_device_get_vendor</a>              (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);
 <span class="returnvalue">void</span>                (<a class="link" href="NMDevice.html#NMDeviceDeactivateFn" title="NMDeviceDeactivateFn ()">*NMDeviceDeactivateFn</a>)             (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="NMDevice.html#nm-device-disconnect" title="nm_device_disconnect ()">nm_device_disconnect</a>                (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>,
                                                          <em class="parameter"><code><a class="link" href="NMDevice.html#NMDeviceDeactivateFn" title="NMDeviceDeactivateFn ()"><span class="type">NMDeviceDeactivateFn</span></a> callback</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="returnvalue">GSList</span></a> *              <a class="link" href="NMDevice.html#nm-device-filter-connections" title="nm_device_filter_connections ()">nm_device_filter_connections</a>      (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>,
+                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> *connections</code></em>);
 </pre>
 </div>
-<div class="refsect1" title="Object Hierarchy">
+<div class="refsect1">
 <a name="NMDevice.object-hierarchy"></a><h2>Object Hierarchy</h2>
 <pre class="synopsis">
   <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>
@@ -91,14 +95,16 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMDev
          +----NMDevice
                +----<a class="link" href="NMDeviceEthernet.html" title="NMDeviceEthernet">NMDeviceEthernet</a>
                +----<a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi">NMDeviceWifi</a>
-               +----<a class="link" href="NMSerialDevice.html" title="NMSerialDevice">NMSerialDevice</a>
+               +----<a class="link" href="NMDeviceModem.html" title="NMDeviceModem">NMDeviceModem</a>
                +----<a class="link" href="NMDeviceBt.html" title="NMDeviceBt">NMDeviceBt</a>
+               +----<a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax">NMDeviceWimax</a>
 </pre>
 </div>
-<div class="refsect1" title="Properties">
+<div class="refsect1">
 <a name="NMDevice.properties"></a><h2>Properties</h2>
 <pre class="synopsis">
   "<a class="link" href="NMDevice.html#NMDevice--capabilities" title='The "capabilities" property'>capabilities</a>"             <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read
+  "<a class="link" href="NMDevice.html#NMDevice--device-type" title='The "device-type" property'>device-type</a>"              <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write / Construct Only
   "<a class="link" href="NMDevice.html#NMDevice--dhcp4-config" title='The "dhcp4-config" property'>dhcp4-config</a>"             <a class="link" href="NMDHCP4Config.html" title="NMDHCP4Config"><span class="type">NMDHCP4Config</span></a>*        : Read
   "<a class="link" href="NMDevice.html#NMDevice--dhcp6-config" title='The "dhcp6-config" property'>dhcp6-config</a>"             <a class="link" href="NMDHCP6Config.html" title="NMDHCP6Config"><span class="type">NMDHCP6Config</span></a>*        : Read
   "<a class="link" href="NMDevice.html#NMDevice--driver" title='The "driver" property'>driver</a>"                   <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read
@@ -114,20 +120,28 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMDev
   "<a class="link" href="NMDevice.html#NMDevice--vendor" title='The "vendor" property'>vendor</a>"                   <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read
 </pre>
 </div>
-<div class="refsect1" title="Signals">
+<div class="refsect1">
 <a name="NMDevice.signals"></a><h2>Signals</h2>
 <pre class="synopsis">
-  "<a class="link" href="NMDevice.html#NMDevice-state-changed" title='The "state-changed" signal'>state-changed</a>"                                  : Run First
+  "<a class="link" href="NMDevice.html#NMDevice-state-changed" title='The "state-changed" signal'>state-changed</a>"                                  : <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-FIRST:CAPS"><code class="literal">Run First</code></a>
 </pre>
 </div>
-<div class="refsect1" title="Description">
+<div class="refsect1">
 <a name="NMDevice.description"></a><h2>Description</h2>
 <p>
 </p>
 </div>
-<div class="refsect1" title="Details">
+<div class="refsect1">
 <a name="NMDevice.details"></a><h2>Details</h2>
-<div class="refsect2" title="NM_DEVICE_UDI">
+<div class="refsect2">
+<a name="NM-DEVICE-DEVICE-TYPE:CAPS"></a><h3>NM_DEVICE_DEVICE_TYPE</h3>
+<pre class="programlisting">#define NM_DEVICE_DEVICE_TYPE "device-type"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="NM-DEVICE-UDI:CAPS"></a><h3>NM_DEVICE_UDI</h3>
 <pre class="programlisting">#define NM_DEVICE_UDI "udi"
 </pre>
@@ -135,7 +149,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMDev
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_DEVICE_INTERFACE">
+<div class="refsect2">
 <a name="NM-DEVICE-INTERFACE:CAPS"></a><h3>NM_DEVICE_INTERFACE</h3>
 <pre class="programlisting">#define NM_DEVICE_INTERFACE "interface"
 </pre>
@@ -143,7 +157,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMDev
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_DEVICE_IP_INTERFACE">
+<div class="refsect2">
 <a name="NM-DEVICE-IP-INTERFACE:CAPS"></a><h3>NM_DEVICE_IP_INTERFACE</h3>
 <pre class="programlisting">#define NM_DEVICE_IP_INTERFACE "ip-interface"
 </pre>
@@ -151,7 +165,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMDev
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_DEVICE_DRIVER">
+<div class="refsect2">
 <a name="NM-DEVICE-DRIVER:CAPS"></a><h3>NM_DEVICE_DRIVER</h3>
 <pre class="programlisting">#define NM_DEVICE_DRIVER "driver"
 </pre>
@@ -159,7 +173,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMDev
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_DEVICE_CAPABILITIES">
+<div class="refsect2">
 <a name="NM-DEVICE-CAPABILITIES:CAPS"></a><h3>NM_DEVICE_CAPABILITIES</h3>
 <pre class="programlisting">#define NM_DEVICE_CAPABILITIES "capabilities"
 </pre>
@@ -167,7 +181,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMDev
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_DEVICE_MANAGED">
+<div class="refsect2">
 <a name="NM-DEVICE-MANAGED:CAPS"></a><h3>NM_DEVICE_MANAGED</h3>
 <pre class="programlisting">#define NM_DEVICE_MANAGED "managed"
 </pre>
@@ -175,7 +189,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMDev
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_DEVICE_FIRMWARE_MISSING">
+<div class="refsect2">
 <a name="NM-DEVICE-FIRMWARE-MISSING:CAPS"></a><h3>NM_DEVICE_FIRMWARE_MISSING</h3>
 <pre class="programlisting">#define NM_DEVICE_FIRMWARE_MISSING "firmware-missing"
 </pre>
@@ -183,7 +197,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMDev
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_DEVICE_IP4_CONFIG">
+<div class="refsect2">
 <a name="NM-DEVICE-IP4-CONFIG:CAPS"></a><h3>NM_DEVICE_IP4_CONFIG</h3>
 <pre class="programlisting">#define NM_DEVICE_IP4_CONFIG "ip4-config"
 </pre>
@@ -191,7 +205,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMDev
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_DEVICE_DHCP4_CONFIG">
+<div class="refsect2">
 <a name="NM-DEVICE-DHCP4-CONFIG:CAPS"></a><h3>NM_DEVICE_DHCP4_CONFIG</h3>
 <pre class="programlisting">#define NM_DEVICE_DHCP4_CONFIG "dhcp4-config"
 </pre>
@@ -199,7 +213,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMDev
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_DEVICE_IP6_CONFIG">
+<div class="refsect2">
 <a name="NM-DEVICE-IP6-CONFIG:CAPS"></a><h3>NM_DEVICE_IP6_CONFIG</h3>
 <pre class="programlisting">#define NM_DEVICE_IP6_CONFIG "ip6-config"
 </pre>
@@ -207,7 +221,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMDev
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_DEVICE_DHCP6_CONFIG">
+<div class="refsect2">
 <a name="NM-DEVICE-DHCP6-CONFIG:CAPS"></a><h3>NM_DEVICE_DHCP6_CONFIG</h3>
 <pre class="programlisting">#define NM_DEVICE_DHCP6_CONFIG "dhcp6-config"
 </pre>
@@ -215,7 +229,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMDev
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_DEVICE_STATE">
+<div class="refsect2">
 <a name="NM-DEVICE-STATE:CAPS"></a><h3>NM_DEVICE_STATE</h3>
 <pre class="programlisting">#define NM_DEVICE_STATE "state"
 </pre>
@@ -223,7 +237,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMDev
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_DEVICE_VENDOR">
+<div class="refsect2">
 <a name="NM-DEVICE-VENDOR:CAPS"></a><h3>NM_DEVICE_VENDOR</h3>
 <pre class="programlisting">#define NM_DEVICE_VENDOR "vendor"
 </pre>
@@ -231,7 +245,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMDev
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_DEVICE_PRODUCT">
+<div class="refsect2">
 <a name="NM-DEVICE-PRODUCT:CAPS"></a><h3>NM_DEVICE_PRODUCT</h3>
 <pre class="programlisting">#define NM_DEVICE_PRODUCT "product"
 </pre>
@@ -239,14 +253,14 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMDev
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMDevice">
+<div class="refsect2">
 <a name="NMDevice-struct"></a><h3>NMDevice</h3>
 <pre class="programlisting">typedef struct _NMDevice NMDevice;</pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMDeviceClass">
+<div class="refsect2">
 <a name="NMDeviceClass"></a><h3>NMDeviceClass</h3>
 <pre class="programlisting">typedef struct {
 	NMObjectClass parent;
@@ -257,6 +271,9 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMDev
 	                       NMDeviceState old_state,
 	                       NMDeviceStateReason reason);
 
+	GSList * (*filter_connections) (NMDevice *device,
+	                                const GSList *connections);
+
 	/* Padding for future expansion */
 	void (*_reserved1) (void);
 	void (*_reserved2) (void);
@@ -270,7 +287,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMDev
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_device_new ()">
+<div class="refsect2">
 <a name="nm-device-new"></a><h3>nm_device_new ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="returnvalue">GObject</span></a> *           nm_device_new                       (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGConnection.html#DBusGConnection"><span class="type">DBusGConnection</span></a> *connection</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *path</code></em>);</pre>
@@ -287,21 +304,20 @@ Creates a new <a class="link" href="NMDevice.html" title="NMDevice"><span class=
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>path</code></em> :</span></p></td>
-<td>the DBus object path of the device
-</td>
+<td>the DBus object path of the device</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a new device
+<td>a new device. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_device_get_iface ()">
+<div class="refsect2">
 <a name="nm-device-get-iface"></a><h3>nm_device_get_iface ()</h3>
-<pre class="programlisting">const <span class="returnvalue">char</span> *        nm_device_get_iface                 (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);</pre>
+<pre class="programlisting">const <span class="returnvalue">char</span> *          nm_device_get_iface               (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);</pre>
 <p>
 Gets the interface name of the <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a>.
 </p>
@@ -315,17 +331,16 @@ Gets the interface name of the <a class="link" href="NMDevice.html" title="NMDev
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the interface of the device. This is the internal string used by the
-device, and must not be modified.
-</td>
+<td>the interface of the device. This is the internal string used by the
+device, and must not be modified.</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_device_get_ip_iface ()">
+<div class="refsect2">
 <a name="nm-device-get-ip-iface"></a><h3>nm_device_get_ip_iface ()</h3>
-<pre class="programlisting">const <span class="returnvalue">char</span> *        nm_device_get_ip_iface              (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);</pre>
+<pre class="programlisting">const <span class="returnvalue">char</span> *          nm_device_get_ip_iface            (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);</pre>
 <p>
 Gets the IP interface name of the <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> over which IP traffic flows
 when the device is in the ACTIVATED state.
@@ -340,17 +355,38 @@ when the device is in the ACTIVATED state.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the IP traffic interface of the device. This is the internal string
-used by the device, and must not be modified.
+<td>the IP traffic interface of the device. This is the internal string
+used by the device, and must not be modified.</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-device-get-device-type"></a><h3>nm_device_get_device_type ()</h3>
+<pre class="programlisting"><span class="returnvalue">NMDeviceType</span>        nm_device_get_device_type           (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);</pre>
+<p>
+Returns the numeric type of the <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a>, ie ethernet, wifi, etc.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>device</code></em> :</span></p></td>
+<td>a <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a>
 </td>
 </tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>the device type</td>
+</tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_device_get_udi ()">
+<div class="refsect2">
 <a name="nm-device-get-udi"></a><h3>nm_device_get_udi ()</h3>
-<pre class="programlisting">const <span class="returnvalue">char</span> *        nm_device_get_udi                   (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);</pre>
+<pre class="programlisting">const <span class="returnvalue">char</span> *          nm_device_get_udi                 (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);</pre>
 <p>
 Gets the Unique Device Identifier of the <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a>.
 </p>
@@ -364,18 +400,17 @@ Gets the Unique Device Identifier of the <a class="link" href="NMDevice.html" ti
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the Unique Device Identifier of the device.  This identifier may be
+<td>the Unique Device Identifier of the device.  This identifier may be
 used to gather more information about the device from various operating
-system services like udev or sysfs.
-</td>
+system services like udev or sysfs.</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_device_get_driver ()">
+<div class="refsect2">
 <a name="nm-device-get-driver"></a><h3>nm_device_get_driver ()</h3>
-<pre class="programlisting">const <span class="returnvalue">char</span> *        nm_device_get_driver                (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);</pre>
+<pre class="programlisting">const <span class="returnvalue">char</span> *          nm_device_get_driver              (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);</pre>
 <p>
 Gets the driver of the <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a>.
 </p>
@@ -389,17 +424,16 @@ Gets the driver of the <a class="link" href="NMDevice.html" title="NMDevice"><sp
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the driver of the device. This is the internal string used by the
-device, and must not be modified.
-</td>
+<td>the driver of the device. This is the internal string used by the
+device, and must not be modified.</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_device_get_capabilities ()">
+<div class="refsect2">
 <a name="nm-device-get-capabilities"></a><h3>nm_device_get_capabilities ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_device_get_capabilities          (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);</pre>
+<pre class="programlisting"><span class="returnvalue">NMDeviceCapabilities</span>  nm_device_get_capabilities        (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);</pre>
 <p>
 Gets the device' capabilities.
 </p>
@@ -413,14 +447,13 @@ Gets the device' capabilities.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the capabilities
-</td>
+<td>the capabilities</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_device_get_managed ()">
+<div class="refsect2">
 <a name="nm-device-get-managed"></a><h3>nm_device_get_managed ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_device_get_managed               (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);</pre>
 <p>
@@ -436,14 +469,14 @@ Whether the <a class="link" href="NMDevice.html" title="NMDevice"><span class="t
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the device is managed by NetworkManager
-</td>
+<td>
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the device is managed by NetworkManager</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_device_get_firmware_missing ()">
+<div class="refsect2">
 <a name="nm-device-get-firmware-missing"></a><h3>nm_device_get_firmware_missing ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_device_get_firmware_missing      (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);</pre>
 <p>
@@ -460,17 +493,17 @@ to be missing.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if firmware required for the device's operation is likely
-to be missing.
-</td>
+<td>
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if firmware required for the device's operation is likely
+to be missing.</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_device_get_ip4_config ()">
+<div class="refsect2">
 <a name="nm-device-get-ip4-config"></a><h3>nm_device_get_ip4_config ()</h3>
-<pre class="programlisting"><a class="link" href="NMIP4Config.html" title="NMIP4Config"><span class="returnvalue">NMIP4Config</span></a> *       nm_device_get_ip4_config            (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);</pre>
+<pre class="programlisting"><a class="link" href="NMIP4Config.html" title="NMIP4Config"><span class="returnvalue">NMIP4Config</span></a> *         nm_device_get_ip4_config          (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);</pre>
 <p>
 Gets the current <a class="link" href="NMIP4Config.html" title="NMIP4Config"><span class="type">NMIP4Config</span></a> associated with the <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a>.
 </p>
@@ -484,16 +517,16 @@ Gets the current <a class="link" href="NMIP4Config.html" title="NMIP4Config"><sp
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the <a class="link" href="NMIP4Config.html" title="NMIP4Config"><span class="type">NMIP4Config</span></a> or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if the device is not activated.
+<td>the <a class="link" href="NMIP4Config.html" title="NMIP4Config"><span class="type">NMIP4Config</span></a> or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if the device is not activated. <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_device_get_dhcp4_config ()">
+<div class="refsect2">
 <a name="nm-device-get-dhcp4-config"></a><h3>nm_device_get_dhcp4_config ()</h3>
-<pre class="programlisting"><a class="link" href="NMDHCP4Config.html" title="NMDHCP4Config"><span class="returnvalue">NMDHCP4Config</span></a> *     nm_device_get_dhcp4_config          (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);</pre>
+<pre class="programlisting"><a class="link" href="NMDHCP4Config.html" title="NMDHCP4Config"><span class="returnvalue">NMDHCP4Config</span></a> *       nm_device_get_dhcp4_config        (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);</pre>
 <p>
 Gets the current <a class="link" href="NMDHCP4Config.html" title="NMDHCP4Config"><span class="type">NMDHCP4Config</span></a> associated with the <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a>.
 </p>
@@ -507,17 +540,17 @@ Gets the current <a class="link" href="NMDHCP4Config.html" title="NMDHCP4Config"
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the <span class="type">NMDHCPConfig</span> or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if the device is not activated or not
-using DHCP.
+<td>the <span class="type">NMDHCPConfig</span> or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if the device is not activated or not
+using DHCP. <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_device_get_ip6_config ()">
+<div class="refsect2">
 <a name="nm-device-get-ip6-config"></a><h3>nm_device_get_ip6_config ()</h3>
-<pre class="programlisting"><a class="link" href="NMIP6Config.html" title="NMIP6Config"><span class="returnvalue">NMIP6Config</span></a> *       nm_device_get_ip6_config            (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);</pre>
+<pre class="programlisting"><a class="link" href="NMIP6Config.html" title="NMIP6Config"><span class="returnvalue">NMIP6Config</span></a> *         nm_device_get_ip6_config          (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);</pre>
 <p>
 Gets the current <a class="link" href="NMIP6Config.html" title="NMIP6Config"><span class="type">NMIP6Config</span></a> associated with the <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a>.
 </p>
@@ -531,16 +564,16 @@ Gets the current <a class="link" href="NMIP6Config.html" title="NMIP6Config"><sp
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the <a class="link" href="NMIP6Config.html" title="NMIP6Config"><span class="type">NMIP6Config</span></a> or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if the device is not activated.
+<td>the <a class="link" href="NMIP6Config.html" title="NMIP6Config"><span class="type">NMIP6Config</span></a> or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if the device is not activated. <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_device_get_dhcp6_config ()">
+<div class="refsect2">
 <a name="nm-device-get-dhcp6-config"></a><h3>nm_device_get_dhcp6_config ()</h3>
-<pre class="programlisting"><a class="link" href="NMDHCP6Config.html" title="NMDHCP6Config"><span class="returnvalue">NMDHCP6Config</span></a> *     nm_device_get_dhcp6_config          (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);</pre>
+<pre class="programlisting"><a class="link" href="NMDHCP6Config.html" title="NMDHCP6Config"><span class="returnvalue">NMDHCP6Config</span></a> *       nm_device_get_dhcp6_config        (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);</pre>
 <p>
 Gets the current <a class="link" href="NMDHCP6Config.html" title="NMDHCP6Config"><span class="type">NMDHCP6Config</span></a> associated with the <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a>.
 </p>
@@ -554,15 +587,15 @@ Gets the current <a class="link" href="NMDHCP6Config.html" title="NMDHCP6Config"
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the <span class="type">NMDHCPConfig</span> or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if the device is not activated or not
-using DHCP.
+<td>the <span class="type">NMDHCPConfig</span> or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if the device is not activated or not
+using DHCP. <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_device_get_state ()">
+<div class="refsect2">
 <a name="nm-device-get-state"></a><h3>nm_device_get_state ()</h3>
 <pre class="programlisting"><span class="returnvalue">NMDeviceState</span>       nm_device_get_state                 (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);</pre>
 <p>
@@ -578,16 +611,15 @@ Gets the current <a class="link" href="NMDevice.html" title="NMDevice"><span cla
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the current device state
-</td>
+<td>the current device state</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_device_get_product ()">
+<div class="refsect2">
 <a name="nm-device-get-product"></a><h3>nm_device_get_product ()</h3>
-<pre class="programlisting">const <span class="returnvalue">char</span> *        nm_device_get_product               (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);</pre>
+<pre class="programlisting">const <span class="returnvalue">char</span> *          nm_device_get_product             (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);</pre>
 <p>
 Gets the product string of the <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a>.
 </p>
@@ -601,17 +633,16 @@ Gets the product string of the <a class="link" href="NMDevice.html" title="NMDev
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the product name of the device. This is the internal string used by the
-device, and must not be modified.
-</td>
+<td>the product name of the device. This is the internal string used by the
+device, and must not be modified.</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_device_get_vendor ()">
+<div class="refsect2">
 <a name="nm-device-get-vendor"></a><h3>nm_device_get_vendor ()</h3>
-<pre class="programlisting">const <span class="returnvalue">char</span> *        nm_device_get_vendor                (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);</pre>
+<pre class="programlisting">const <span class="returnvalue">char</span> *          nm_device_get_vendor              (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);</pre>
 <p>
 Gets the vendor string of the <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a>.
 </p>
@@ -625,78 +656,94 @@ Gets the vendor string of the <a class="link" href="NMDevice.html" title="NMDevi
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the vendor name of the device. This is the internal string used by the
-device, and must not be modified.
-</td>
+<td>the vendor name of the device. This is the internal string used by the
+device, and must not be modified.</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="NMDeviceDeactivateFn ()">
+<div class="refsect2">
 <a name="NMDeviceDeactivateFn"></a><h3>NMDeviceDeactivateFn ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                (*NMDeviceDeactivateFn)             (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
 <p>
 </p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-device-disconnect"></a><h3>nm_device_disconnect ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                nm_device_disconnect                (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="NMDevice.html#NMDeviceDeactivateFn" title="NMDeviceDeactivateFn ()"><span class="type">NMDeviceDeactivateFn</span></a> callback</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
+<p>
+Disconnects the device if currently connected, and prevents the device from
+automatically connecting to networks until the next manual network connection
+request.
+</p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>device</code></em> :</span></p></td>
-<td>
+<td>a <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a>
 </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>
+<td><p><span class="term"><em class="parameter"><code>callback</code></em> :</span></p></td>
+<td>callback to be called when disconnect operation completes. <span class="annotation">[<acronym title="The callback is valid until first called."><span class="acronym">scope async</span></acronym>]</span>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
-<td>
+<td>caller-specific data passed to <em class="parameter"><code>callback</code></em>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_device_disconnect ()">
-<a name="nm-device-disconnect"></a><h3>nm_device_disconnect ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                nm_device_disconnect                (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMDevice.html#NMDeviceDeactivateFn" title="NMDeviceDeactivateFn ()"><span class="type">NMDeviceDeactivateFn</span></a> callback</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
+<div class="refsect2">
+<a name="nm-device-filter-connections"></a><h3>nm_device_filter_connections ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="returnvalue">GSList</span></a> *              nm_device_filter_connections      (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>,
+                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> *connections</code></em>);</pre>
 <p>
-Disconnects the device if currently connected, and prevents the device from
-automatically connecting to networks until the next manual network connection
-request.
+Filters a given list of connections for a given <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> object and return
+connections which may be activated with the device. For example if <em class="parameter"><code>device</code></em>
+is a WiFi device that supports only WEP encryption, the returned list will
+contain any WiFi connections in <em class="parameter"><code>connections</code></em> that allow connection to
+unencrypted or WEP-enabled SSIDs.  The returned list will not contain
+Ethernet, Bluetooth, WiFi WPA connections, or any other connection that is
+incompatible with the device.
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>device</code></em> :</span></p></td>
-<td>a <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a>
-</td>
+<td>an <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> to filter connections for</td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>callback</code></em> :</span></p></td>
-<td>callback to be called when disconnect operation completes
-</td>
+<td><p><span class="term"><em class="parameter"><code>connections</code></em> :</span></p></td>
+<td>a list of <span class="type">NMConnection</span> objects to filter</td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
-<td>caller-specific data passed to <em class="parameter"><code>callback</code></em>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>a
+list of <span class="type">NMConnection</span> objects that could be activated with the given <em class="parameter"><code>device</code></em>.
+The elements of the list are owned by their creator and should not be freed
+by the caller, but the returned list itself is owned by the caller and should
+be freed with <a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#g-slist-free"><code class="function">g_slist_free()</code></a> when it is no longer required. <span class="annotation">[<acronym title="Free data container after the code is done."><span class="acronym">transfer container</span></acronym>][<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NetworkManager.Connection]</span>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 </div>
-<div class="refsect1" title="Property Details">
+<div class="refsect1">
 <a name="NMDevice.property-details"></a><h2>Property Details</h2>
-<div class="refsect2" title='The "capabilities" property'>
+<div class="refsect2">
 <a name="NMDevice--capabilities"></a><h3>The <code class="literal">"capabilities"</code> property</h3>
 <pre class="programlisting">  "capabilities"             <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read</pre>
 <p>
@@ -705,7 +752,16 @@ The capabilities of the device.
 <p>Default value: 0</p>
 </div>
 <hr>
-<div class="refsect2" title='The "dhcp4-config" property'>
+<div class="refsect2">
+<a name="NMDevice--device-type"></a><h3>The <code class="literal">"device-type"</code> property</h3>
+<pre class="programlisting">  "device-type"              <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write / Construct Only</pre>
+<p>
+The numeric type of the device.
+</p>
+<p>Default value: 0</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="NMDevice--dhcp4-config"></a><h3>The <code class="literal">"dhcp4-config"</code> property</h3>
 <pre class="programlisting">  "dhcp4-config"             <a class="link" href="NMDHCP4Config.html" title="NMDHCP4Config"><span class="type">NMDHCP4Config</span></a>*        : Read</pre>
 <p>
@@ -713,7 +769,7 @@ The <a class="link" href="NMDHCP4Config.html" title="NMDHCP4Config"><span class=
 </p>
 </div>
 <hr>
-<div class="refsect2" title='The "dhcp6-config" property'>
+<div class="refsect2">
 <a name="NMDevice--dhcp6-config"></a><h3>The <code class="literal">"dhcp6-config"</code> property</h3>
 <pre class="programlisting">  "dhcp6-config"             <a class="link" href="NMDHCP6Config.html" title="NMDHCP6Config"><span class="type">NMDHCP6Config</span></a>*        : Read</pre>
 <p>
@@ -721,7 +777,7 @@ The <a class="link" href="NMDHCP6Config.html" title="NMDHCP6Config"><span class=
 </p>
 </div>
 <hr>
-<div class="refsect2" title='The "driver" property'>
+<div class="refsect2">
 <a name="NMDevice--driver"></a><h3>The <code class="literal">"driver"</code> property</h3>
 <pre class="programlisting">  "driver"                   <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read</pre>
 <p>
@@ -730,7 +786,7 @@ The driver of the device.
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "firmware-missing" property'>
+<div class="refsect2">
 <a name="NMDevice--firmware-missing"></a><h3>The <code class="literal">"firmware-missing"</code> property</h3>
 <pre class="programlisting">  "firmware-missing"         <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read</pre>
 <p>
@@ -740,7 +796,7 @@ for its operation.
 <p>Default value: FALSE</p>
 </div>
 <hr>
-<div class="refsect2" title='The "interface" property'>
+<div class="refsect2">
 <a name="NMDevice--interface"></a><h3>The <code class="literal">"interface"</code> property</h3>
 <pre class="programlisting">  "interface"                <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read</pre>
 <p>
@@ -749,7 +805,7 @@ The interface of the device.
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "ip-interface" property'>
+<div class="refsect2">
 <a name="NMDevice--ip-interface"></a><h3>The <code class="literal">"ip-interface"</code> property</h3>
 <pre class="programlisting">  "ip-interface"             <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read</pre>
 <p>
@@ -759,7 +815,7 @@ operations like addressing and routing.
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "ip4-config" property'>
+<div class="refsect2">
 <a name="NMDevice--ip4-config"></a><h3>The <code class="literal">"ip4-config"</code> property</h3>
 <pre class="programlisting">  "ip4-config"               <a class="link" href="NMIP4Config.html" title="NMIP4Config"><span class="type">NMIP4Config</span></a>*          : Read</pre>
 <p>
@@ -767,7 +823,7 @@ The <a class="link" href="NMIP4Config.html" title="NMIP4Config"><span class="typ
 </p>
 </div>
 <hr>
-<div class="refsect2" title='The "ip6-config" property'>
+<div class="refsect2">
 <a name="NMDevice--ip6-config"></a><h3>The <code class="literal">"ip6-config"</code> property</h3>
 <pre class="programlisting">  "ip6-config"               <a class="link" href="NMIP6Config.html" title="NMIP6Config"><span class="type">NMIP6Config</span></a>*          : Read</pre>
 <p>
@@ -775,7 +831,7 @@ The <a class="link" href="NMIP6Config.html" title="NMIP6Config"><span class="typ
 </p>
 </div>
 <hr>
-<div class="refsect2" title='The "managed" property'>
+<div class="refsect2">
 <a name="NMDevice--managed"></a><h3>The <code class="literal">"managed"</code> property</h3>
 <pre class="programlisting">  "managed"                  <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read</pre>
 <p>
@@ -784,7 +840,7 @@ Whether the device is managed by NetworkManager.
 <p>Default value: FALSE</p>
 </div>
 <hr>
-<div class="refsect2" title='The "product" property'>
+<div class="refsect2">
 <a name="NMDevice--product"></a><h3>The <code class="literal">"product"</code> property</h3>
 <pre class="programlisting">  "product"                  <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read</pre>
 <p>
@@ -793,7 +849,7 @@ The product string of the device.
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "state" property'>
+<div class="refsect2">
 <a name="NMDevice--state"></a><h3>The <code class="literal">"state"</code> property</h3>
 <pre class="programlisting">  "state"                    <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read</pre>
 <p>
@@ -802,16 +858,21 @@ The state of the device.
 <p>Default value: 0</p>
 </div>
 <hr>
-<div class="refsect2" title='The "udi" property'>
+<div class="refsect2">
 <a name="NMDevice--udi"></a><h3>The <code class="literal">"udi"</code> property</h3>
 <pre class="programlisting">  "udi"                      <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read</pre>
 <p>
-The Unique Device Identifier of the device.
+An operating-system specific device hardware identifier; this is not
+unique to a specific hardware device across reboots or hotplugs.  It
+is an opaque string which for some device types (Bluetooth, Modem)
+contains an identifier provided by the underlying hardware service daemon
+such as Bluez or ModemManager, and clients can use this property to
+request more information about the device from those services.
 </p>
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "vendor" property'>
+<div class="refsect2">
 <a name="NMDevice--vendor"></a><h3>The <code class="literal">"vendor"</code> property</h3>
 <pre class="programlisting">  "vendor"                   <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read</pre>
 <p>
@@ -820,15 +881,15 @@ The vendor string of the device.
 <p>Default value: NULL</p>
 </div>
 </div>
-<div class="refsect1" title="Signal Details">
+<div class="refsect1">
 <a name="NMDevice.signal-details"></a><h2>Signal Details</h2>
-<div class="refsect2" title='The "state-changed" signal'>
+<div class="refsect2">
 <a name="NMDevice-state-changed"></a><h3>The <code class="literal">"state-changed"</code> signal</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                user_function                      (<a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device,
                                                         <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>     state,
                                                         <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>     arg2,
                                                         <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>     arg3,
-                                                        <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>  user_data)      : Run First</pre>
+                                                        <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>  user_data)      : <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-FIRST:CAPS"><code class="literal">Run First</code></a></pre>
 <p>
 Notifies the state change of a <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a>.
 </p>
@@ -837,13 +898,11 @@ Notifies the state change of a <a class="link" href="NMDevice.html" title="NMDev
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>device</code></em> :</span></p></td>
-<td>the client that received the signal
-</td>
+<td>the client that received the signal</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>state</code></em> :</span></p></td>
-<td>the new state of the device
-</td>
+<td>the new state of the device</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
@@ -856,6 +915,6 @@ Notifies the state change of a <a class="link" href="NMDevice.html" title="NMDev
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.15</div>
+          Generated by GTK-Doc V1.17</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceBt.html b/docs/libnm-glib/html/NMDeviceBt.html
index 3893c3673..6618973fb 100644
--- a/docs/libnm-glib/html/NMDeviceBt.html
+++ b/docs/libnm-glib/html/NMDeviceBt.html
@@ -3,22 +3,22 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>NMDeviceBt</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="libnm-glib Reference Manual">
-<link rel="up" href="ch01.html" title="libnm-glib Objects">
-<link rel="prev" href="NMCdmaDevice.html" title="NMCdmaDevice">
-<link rel="next" href="NMAccessPoint.html" title="NMAccessPoint">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
+<link rel="up" href="ch02.html" title="libnm-glib API Reference">
+<link rel="prev" href="NMDeviceModem.html" title="NMDeviceModem">
+<link rel="next" href="NMDeviceWimax.html" title="NMDeviceWimax">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
 <tr valign="middle">
-<td><a accesskey="p" href="NMCdmaDevice.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="ch01.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="NMDeviceModem.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
+<td><a accesskey="u" href="ch02.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
 <th width="100%" align="center">libnm-glib Reference Manual</th>
-<td><a accesskey="n" href="NMAccessPoint.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+<td><a accesskey="n" href="NMDeviceWimax.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
 </tr>
 <tr><td colspan="5" class="shortcuts">
 <a href="#NMDeviceBt.synopsis" class="shortcut">Top</a>
@@ -30,7 +30,7 @@
                   <a href="#NMDeviceBt.properties" class="shortcut">Properties</a>
 </td></tr>
 </table>
-<div class="refentry" title="NMDeviceBt">
+<div class="refentry">
 <a name="NMDeviceBt"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
@@ -39,7 +39,7 @@
 </td>
 <td valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv" title="Synopsis">
+<div class="refsynopsisdiv">
 <a name="NMDeviceBt.synopsis"></a><h2>Synopsis</h2>
 <pre class="synopsis">#define             <a class="link" href="NMDeviceBt.html#NM-DEVICE-BT-HW-ADDRESS:CAPS" title="NM_DEVICE_BT_HW_ADDRESS">NM_DEVICE_BT_HW_ADDRESS</a>
 #define             <a class="link" href="NMDeviceBt.html#NM-DEVICE-BT-NAME:CAPS" title="NM_DEVICE_BT_NAME">NM_DEVICE_BT_NAME</a>
@@ -53,7 +53,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMDev
 <span class="returnvalue">NMBluetoothCapabilities</span>  <a class="link" href="NMDeviceBt.html#nm-device-bt-get-capabilities" title="nm_device_bt_get_capabilities ()">nm_device_bt_get_capabilities</a>  (<em class="parameter"><code><a class="link" href="NMDeviceBt.html" title="NMDeviceBt"><span class="type">NMDeviceBt</span></a> *device</code></em>);
 </pre>
 </div>
-<div class="refsect1" title="Object Hierarchy">
+<div class="refsect1">
 <a name="NMDeviceBt.object-hierarchy"></a><h2>Object Hierarchy</h2>
 <pre class="synopsis">
   <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>
@@ -62,7 +62,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMDev
                +----NMDeviceBt
 </pre>
 </div>
-<div class="refsect1" title="Properties">
+<div class="refsect1">
 <a name="NMDeviceBt.properties"></a><h2>Properties</h2>
 <pre class="synopsis">
   "<a class="link" href="NMDeviceBt.html#NMDeviceBt--bt-capabilities" title='The "bt-capabilities" property'>bt-capabilities</a>"          <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read
@@ -70,14 +70,14 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMDev
   "<a class="link" href="NMDeviceBt.html#NMDeviceBt--name" title='The "name" property'>name</a>"                     <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read
 </pre>
 </div>
-<div class="refsect1" title="Description">
+<div class="refsect1">
 <a name="NMDeviceBt.description"></a><h2>Description</h2>
 <p>
 </p>
 </div>
-<div class="refsect1" title="Details">
+<div class="refsect1">
 <a name="NMDeviceBt.details"></a><h2>Details</h2>
-<div class="refsect2" title="NM_DEVICE_BT_HW_ADDRESS">
+<div class="refsect2">
 <a name="NM-DEVICE-BT-HW-ADDRESS:CAPS"></a><h3>NM_DEVICE_BT_HW_ADDRESS</h3>
 <pre class="programlisting">#define NM_DEVICE_BT_HW_ADDRESS   "hw-address"
 </pre>
@@ -85,7 +85,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMDev
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_DEVICE_BT_NAME">
+<div class="refsect2">
 <a name="NM-DEVICE-BT-NAME:CAPS"></a><h3>NM_DEVICE_BT_NAME</h3>
 <pre class="programlisting">#define NM_DEVICE_BT_NAME         "name"
 </pre>
@@ -93,7 +93,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMDev
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_DEVICE_BT_CAPABILITIES">
+<div class="refsect2">
 <a name="NM-DEVICE-BT-CAPABILITIES:CAPS"></a><h3>NM_DEVICE_BT_CAPABILITIES</h3>
 <pre class="programlisting">#define NM_DEVICE_BT_CAPABILITIES "bt-capabilities"
 </pre>
@@ -101,14 +101,14 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMDev
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMDeviceBt">
+<div class="refsect2">
 <a name="NMDeviceBt-struct"></a><h3>NMDeviceBt</h3>
 <pre class="programlisting">typedef struct _NMDeviceBt NMDeviceBt;</pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMDeviceBtClass">
+<div class="refsect2">
 <a name="NMDeviceBtClass"></a><h3>NMDeviceBtClass</h3>
 <pre class="programlisting">typedef struct {
 	NMDeviceClass parent;
@@ -126,7 +126,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMDev
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_device_bt_new ()">
+<div class="refsect2">
 <a name="nm-device-bt-new"></a><h3>nm_device_bt_new ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="returnvalue">GObject</span></a> *           nm_device_bt_new                    (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGConnection.html#DBusGConnection"><span class="type">DBusGConnection</span></a> *connection</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *path</code></em>);</pre>
@@ -143,19 +143,18 @@ Creates a new <a class="link" href="NMDeviceBt.html" title="NMDeviceBt"><span cl
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>path</code></em> :</span></p></td>
-<td>the DBus object path of the device
-</td>
+<td>the DBus object path of the device</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a new device
+<td>a new device. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_device_bt_get_hw_address ()">
+<div class="refsect2">
 <a name="nm-device-bt-get-hw-address"></a><h3>nm_device_bt_get_hw_address ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_device_bt_get_hw_address         (<em class="parameter"><code><a class="link" href="NMDeviceBt.html" title="NMDeviceBt"><span class="type">NMDeviceBt</span></a> *device</code></em>);</pre>
 <p>
@@ -171,15 +170,14 @@ Gets the hardware (MAC) address of the <a class="link" href="NMDeviceBt.html" ti
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the hardware address. This is the internal string used by the
-device, and must not be modified.
-</td>
+<td>the hardware address. This is the internal string used by the
+device, and must not be modified.</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_device_bt_get_name ()">
+<div class="refsect2">
 <a name="nm-device-bt-get-name"></a><h3>nm_device_bt_get_name ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_device_bt_get_name               (<em class="parameter"><code><a class="link" href="NMDeviceBt.html" title="NMDeviceBt"><span class="type">NMDeviceBt</span></a> *device</code></em>);</pre>
 <p>
@@ -195,14 +193,13 @@ Gets the name of the <a class="link" href="NMDeviceBt.html" title="NMDeviceBt"><
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the name of the device
-</td>
+<td>the name of the device</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_device_bt_get_capabilities ()">
+<div class="refsect2">
 <a name="nm-device-bt-get-capabilities"></a><h3>nm_device_bt_get_capabilities ()</h3>
 <pre class="programlisting"><span class="returnvalue">NMBluetoothCapabilities</span>  nm_device_bt_get_capabilities  (<em class="parameter"><code><a class="link" href="NMDeviceBt.html" title="NMDeviceBt"><span class="type">NMDeviceBt</span></a> *device</code></em>);</pre>
 <p>
@@ -218,16 +215,16 @@ Returns the Bluetooth device's usable capabilities.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a combination of <span class="type">NMBluetoothCapabilities</span>
+<td>a combination of <span class="type">NMBluetoothCapabilities</span>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 </div>
-<div class="refsect1" title="Property Details">
+<div class="refsect1">
 <a name="NMDeviceBt.property-details"></a><h2>Property Details</h2>
-<div class="refsect2" title='The "bt-capabilities" property'>
+<div class="refsect2">
 <a name="NMDeviceBt--bt-capabilities"></a><h3>The <code class="literal">"bt-capabilities"</code> property</h3>
 <pre class="programlisting">  "bt-capabilities"          <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read</pre>
 <p>
@@ -236,7 +233,7 @@ The device's bluetooth capabilities, a combination of <span class="type">NMBluet
 <p>Default value: 0</p>
 </div>
 <hr>
-<div class="refsect2" title='The "hw-address" property'>
+<div class="refsect2">
 <a name="NMDeviceBt--hw-address"></a><h3>The <code class="literal">"hw-address"</code> property</h3>
 <pre class="programlisting">  "hw-address"               <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read</pre>
 <p>
@@ -245,7 +242,7 @@ The hardware (MAC) address of the device.
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "name" property'>
+<div class="refsect2">
 <a name="NMDeviceBt--name"></a><h3>The <code class="literal">"name"</code> property</h3>
 <pre class="programlisting">  "name"                     <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read</pre>
 <p>
@@ -257,6 +254,6 @@ The name of the bluetooth device.
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.15</div>
+          Generated by GTK-Doc V1.17</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceEthernet.html b/docs/libnm-glib/html/NMDeviceEthernet.html
index ff7251166..8dd994795 100644
--- a/docs/libnm-glib/html/NMDeviceEthernet.html
+++ b/docs/libnm-glib/html/NMDeviceEthernet.html
@@ -3,19 +3,19 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>NMDeviceEthernet</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="libnm-glib Reference Manual">
-<link rel="up" href="ch01.html" title="libnm-glib Objects">
+<link rel="up" href="ch02.html" title="libnm-glib API Reference">
 <link rel="prev" href="NMDevice.html" title="NMDevice">
 <link rel="next" href="NMDeviceWifi.html" title="NMDeviceWifi">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
 <tr valign="middle">
 <td><a accesskey="p" href="NMDevice.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="ch01.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
+<td><a accesskey="u" href="ch02.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
 <th width="100%" align="center">libnm-glib Reference Manual</th>
 <td><a accesskey="n" href="NMDeviceWifi.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
@@ -30,7 +30,7 @@
                   <a href="#NMDeviceEthernet.properties" class="shortcut">Properties</a>
 </td></tr>
 </table>
-<div class="refentry" title="NMDeviceEthernet">
+<div class="refentry">
 <a name="NMDeviceEthernet"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
@@ -39,7 +39,7 @@
 </td>
 <td valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv" title="Synopsis">
+<div class="refsynopsisdiv">
 <a name="NMDeviceEthernet.synopsis"></a><h2>Synopsis</h2>
 <pre class="synopsis">#define             <a class="link" href="NMDeviceEthernet.html#NM-DEVICE-ETHERNET-HW-ADDRESS:CAPS" title="NM_DEVICE_ETHERNET_HW_ADDRESS">NM_DEVICE_ETHERNET_HW_ADDRESS</a>
 #define             <a class="link" href="NMDeviceEthernet.html#NM-DEVICE-ETHERNET-PERMANENT-HW-ADDRESS:CAPS" title="NM_DEVICE_ETHERNET_PERMANENT_HW_ADDRESS">NM_DEVICE_ETHERNET_PERMANENT_HW_ADDRESS</a>
@@ -56,7 +56,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMDev
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMDeviceEthernet.html#nm-device-ethernet-get-carrier" title="nm_device_ethernet_get_carrier ()">nm_device_ethernet_get_carrier</a>      (<em class="parameter"><code><a class="link" href="NMDeviceEthernet.html" title="NMDeviceEthernet"><span class="type">NMDeviceEthernet</span></a> *device</code></em>);
 </pre>
 </div>
-<div class="refsect1" title="Object Hierarchy">
+<div class="refsect1">
 <a name="NMDeviceEthernet.object-hierarchy"></a><h2>Object Hierarchy</h2>
 <pre class="synopsis">
   <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>
@@ -65,7 +65,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMDev
                +----NMDeviceEthernet
 </pre>
 </div>
-<div class="refsect1" title="Properties">
+<div class="refsect1">
 <a name="NMDeviceEthernet.properties"></a><h2>Properties</h2>
 <pre class="synopsis">
   "<a class="link" href="NMDeviceEthernet.html#NMDeviceEthernet--carrier" title='The "carrier" property'>carrier</a>"                  <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read
@@ -74,14 +74,14 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMDev
   "<a class="link" href="NMDeviceEthernet.html#NMDeviceEthernet--speed" title='The "speed" property'>speed</a>"                    <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read
 </pre>
 </div>
-<div class="refsect1" title="Description">
+<div class="refsect1">
 <a name="NMDeviceEthernet.description"></a><h2>Description</h2>
 <p>
 </p>
 </div>
-<div class="refsect1" title="Details">
+<div class="refsect1">
 <a name="NMDeviceEthernet.details"></a><h2>Details</h2>
-<div class="refsect2" title="NM_DEVICE_ETHERNET_HW_ADDRESS">
+<div class="refsect2">
 <a name="NM-DEVICE-ETHERNET-HW-ADDRESS:CAPS"></a><h3>NM_DEVICE_ETHERNET_HW_ADDRESS</h3>
 <pre class="programlisting">#define NM_DEVICE_ETHERNET_HW_ADDRESS  "hw-address"
 </pre>
@@ -89,7 +89,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMDev
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_DEVICE_ETHERNET_PERMANENT_HW_ADDRESS">
+<div class="refsect2">
 <a name="NM-DEVICE-ETHERNET-PERMANENT-HW-ADDRESS:CAPS"></a><h3>NM_DEVICE_ETHERNET_PERMANENT_HW_ADDRESS</h3>
 <pre class="programlisting">#define NM_DEVICE_ETHERNET_PERMANENT_HW_ADDRESS "perm-hw-address"
 </pre>
@@ -97,7 +97,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMDev
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_DEVICE_ETHERNET_SPEED">
+<div class="refsect2">
 <a name="NM-DEVICE-ETHERNET-SPEED:CAPS"></a><h3>NM_DEVICE_ETHERNET_SPEED</h3>
 <pre class="programlisting">#define NM_DEVICE_ETHERNET_SPEED       "speed"
 </pre>
@@ -105,7 +105,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMDev
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_DEVICE_ETHERNET_CARRIER">
+<div class="refsect2">
 <a name="NM-DEVICE-ETHERNET-CARRIER:CAPS"></a><h3>NM_DEVICE_ETHERNET_CARRIER</h3>
 <pre class="programlisting">#define NM_DEVICE_ETHERNET_CARRIER     "carrier"
 </pre>
@@ -113,14 +113,14 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMDev
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMDeviceEthernet">
+<div class="refsect2">
 <a name="NMDeviceEthernet-struct"></a><h3>NMDeviceEthernet</h3>
 <pre class="programlisting">typedef struct _NMDeviceEthernet NMDeviceEthernet;</pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMDeviceEthernetClass">
+<div class="refsect2">
 <a name="NMDeviceEthernetClass"></a><h3>NMDeviceEthernetClass</h3>
 <pre class="programlisting">typedef struct {
 	NMDeviceClass parent;
@@ -138,7 +138,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMDev
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_device_ethernet_new ()">
+<div class="refsect2">
 <a name="nm-device-ethernet-new"></a><h3>nm_device_ethernet_new ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="returnvalue">GObject</span></a> *           nm_device_ethernet_new              (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGConnection.html#DBusGConnection"><span class="type">DBusGConnection</span></a> *connection</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *path</code></em>);</pre>
@@ -155,19 +155,18 @@ Creates a new <a class="link" href="NMDeviceEthernet.html" title="NMDeviceEthern
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>path</code></em> :</span></p></td>
-<td>the DBus object path of the device
-</td>
+<td>the DBus object path of the device</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a new device
+<td>a new device. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_device_ethernet_get_hw_address ()">
+<div class="refsect2">
 <a name="nm-device-ethernet-get-hw-address"></a><h3>nm_device_ethernet_get_hw_address ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_device_ethernet_get_hw_address   (<em class="parameter"><code><a class="link" href="NMDeviceEthernet.html" title="NMDeviceEthernet"><span class="type">NMDeviceEthernet</span></a> *device</code></em>);</pre>
 <p>
@@ -183,15 +182,14 @@ Gets the active hardware (MAC) address of the <a class="link" href="NMDeviceEthe
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the active hardware address. This is the internal string used by the
-device, and must not be modified.
-</td>
+<td>the active hardware address. This is the internal string used by the
+device, and must not be modified.</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_device_ethernet_get_permanent_hw_address ()">
+<div class="refsect2">
 <a name="nm-device-ethernet-get-permanent-hw-address"></a><h3>nm_device_ethernet_get_permanent_hw_address ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_device_ethernet_get_permanent_hw_address
                                                         (<em class="parameter"><code><a class="link" href="NMDeviceEthernet.html" title="NMDeviceEthernet"><span class="type">NMDeviceEthernet</span></a> *device</code></em>);</pre>
@@ -208,15 +206,14 @@ Gets the permanent hardware (MAC) address of the <a class="link" href="NMDeviceE
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the permanent hardware address. This is the internal string used by the
-device, and must not be modified.
-</td>
+<td>the permanent hardware address. This is the internal string used by the
+device, and must not be modified.</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_device_ethernet_get_speed ()">
+<div class="refsect2">
 <a name="nm-device-ethernet-get-speed"></a><h3>nm_device_ethernet_get_speed ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_device_ethernet_get_speed        (<em class="parameter"><code><a class="link" href="NMDeviceEthernet.html" title="NMDeviceEthernet"><span class="type">NMDeviceEthernet</span></a> *device</code></em>);</pre>
 <p>
@@ -232,14 +229,13 @@ Gets the speed of the <a class="link" href="NMDeviceEthernet.html" title="NMDevi
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the speed of the device
-</td>
+<td>the speed of the device</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_device_ethernet_get_carrier ()">
+<div class="refsect2">
 <a name="nm-device-ethernet-get-carrier"></a><h3>nm_device_ethernet_get_carrier ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_device_ethernet_get_carrier      (<em class="parameter"><code><a class="link" href="NMDeviceEthernet.html" title="NMDeviceEthernet"><span class="type">NMDeviceEthernet</span></a> *device</code></em>);</pre>
 <p>
@@ -255,16 +251,16 @@ Whether the device has carrier.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the device has carrier
-</td>
+<td>
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the device has carrier</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 </div>
-<div class="refsect1" title="Property Details">
+<div class="refsect1">
 <a name="NMDeviceEthernet.property-details"></a><h2>Property Details</h2>
-<div class="refsect2" title='The "carrier" property'>
+<div class="refsect2">
 <a name="NMDeviceEthernet--carrier"></a><h3>The <code class="literal">"carrier"</code> property</h3>
 <pre class="programlisting">  "carrier"                  <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read</pre>
 <p>
@@ -273,7 +269,7 @@ Whether the device has carrier.
 <p>Default value: FALSE</p>
 </div>
 <hr>
-<div class="refsect2" title='The "hw-address" property'>
+<div class="refsect2">
 <a name="NMDeviceEthernet--hw-address"></a><h3>The <code class="literal">"hw-address"</code> property</h3>
 <pre class="programlisting">  "hw-address"               <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read</pre>
 <p>
@@ -282,7 +278,7 @@ The active hardware (MAC) address of the device.
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "perm-hw-address" property'>
+<div class="refsect2">
 <a name="NMDeviceEthernet--perm-hw-address"></a><h3>The <code class="literal">"perm-hw-address"</code> property</h3>
 <pre class="programlisting">  "perm-hw-address"          <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read</pre>
 <p>
@@ -291,7 +287,7 @@ The permanent hardware (MAC) address of the device.
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "speed" property'>
+<div class="refsect2">
 <a name="NMDeviceEthernet--speed"></a><h3>The <code class="literal">"speed"</code> property</h3>
 <pre class="programlisting">  "speed"                    <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read</pre>
 <p>
@@ -303,6 +299,6 @@ The speed of the device.
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.15</div>
+          Generated by GTK-Doc V1.17</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceModem.html b/docs/libnm-glib/html/NMDeviceModem.html
new file mode 100644
index 000000000..79db5c9d6
--- /dev/null
+++ b/docs/libnm-glib/html/NMDeviceModem.html
@@ -0,0 +1,198 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>NMDeviceModem</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<link rel="home" href="index.html" title="libnm-glib Reference Manual">
+<link rel="up" href="ch02.html" title="libnm-glib API Reference">
+<link rel="prev" href="NMDeviceWifi.html" title="NMDeviceWifi">
+<link rel="next" href="NMDeviceBt.html" title="NMDeviceBt">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
+<tr valign="middle">
+<td><a accesskey="p" href="NMDeviceWifi.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
+<td><a accesskey="u" href="ch02.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
+<th width="100%" align="center">libnm-glib Reference Manual</th>
+<td><a accesskey="n" href="NMDeviceBt.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+</tr>
+<tr><td colspan="5" class="shortcuts">
+<a href="#NMDeviceModem.synopsis" class="shortcut">Top</a>
+                   | 
+                  <a href="#NMDeviceModem.description" class="shortcut">Description</a>
+                   | 
+                  <a href="#NMDeviceModem.object-hierarchy" class="shortcut">Object Hierarchy</a>
+                   | 
+                  <a href="#NMDeviceModem.properties" class="shortcut">Properties</a>
+</td></tr>
+</table>
+<div class="refentry">
+<a name="NMDeviceModem"></a><div class="titlepage"></div>
+<div class="refnamediv"><table width="100%"><tr>
+<td valign="top">
+<h2><span class="refentrytitle"><a name="NMDeviceModem.top_of_page"></a>NMDeviceModem</span></h2>
+<p>NMDeviceModem</p>
+</td>
+<td valign="top" align="right"></td>
+</tr></table></div>
+<div class="refsynopsisdiv">
+<a name="NMDeviceModem.synopsis"></a><h2>Synopsis</h2>
+<pre class="synopsis">#define             <a class="link" href="NMDeviceModem.html#NM-DEVICE-MODEM-MODEM-CAPABILITIES:CAPS" title="NM_DEVICE_MODEM_MODEM_CAPABILITIES">NM_DEVICE_MODEM_MODEM_CAPABILITIES</a>
+#define             <a class="link" href="NMDeviceModem.html#NM-DEVICE-MODEM-CURRENT-CAPABILITIES:CAPS" title="NM_DEVICE_MODEM_CURRENT_CAPABILITIES">NM_DEVICE_MODEM_CURRENT_CAPABILITIES</a>
+                    <a class="link" href="NMDeviceModem.html#NMDeviceModem-struct" title="NMDeviceModem">NMDeviceModem</a>;
+                    <a class="link" href="NMDeviceModem.html#NMDeviceModemClass" title="NMDeviceModemClass">NMDeviceModemClass</a>;
+<span class="returnvalue">NMDeviceModemCapabilities</span>  <a class="link" href="NMDeviceModem.html#nm-device-modem-get-modem-capabilities" title="nm_device_modem_get_modem_capabilities ()">nm_device_modem_get_modem_capabilities</a>
+                                                        (<em class="parameter"><code><a class="link" href="NMDeviceModem.html" title="NMDeviceModem"><span class="type">NMDeviceModem</span></a> *self</code></em>);
+<span class="returnvalue">NMDeviceModemCapabilities</span>  <a class="link" href="NMDeviceModem.html#nm-device-modem-get-current-capabilities" title="nm_device_modem_get_current_capabilities ()">nm_device_modem_get_current_capabilities</a>
+                                                        (<em class="parameter"><code><a class="link" href="NMDeviceModem.html" title="NMDeviceModem"><span class="type">NMDeviceModem</span></a> *self</code></em>);
+</pre>
+</div>
+<div class="refsect1">
+<a name="NMDeviceModem.object-hierarchy"></a><h2>Object Hierarchy</h2>
+<pre class="synopsis">
+  <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>
+   +----<a class="link" href="NMObject.html" title="NMObject">NMObject</a>
+         +----<a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+               +----NMDeviceModem
+</pre>
+</div>
+<div class="refsect1">
+<a name="NMDeviceModem.properties"></a><h2>Properties</h2>
+<pre class="synopsis">
+  "<a class="link" href="NMDeviceModem.html#NMDeviceModem--current-capabilities" title='The "current-capabilities" property'>current-capabilities</a>"     <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read
+  "<a class="link" href="NMDeviceModem.html#NMDeviceModem--modem-capabilities" title='The "modem-capabilities" property'>modem-capabilities</a>"       <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read
+</pre>
+</div>
+<div class="refsect1">
+<a name="NMDeviceModem.description"></a><h2>Description</h2>
+<p>
+</p>
+</div>
+<div class="refsect1">
+<a name="NMDeviceModem.details"></a><h2>Details</h2>
+<div class="refsect2">
+<a name="NM-DEVICE-MODEM-MODEM-CAPABILITIES:CAPS"></a><h3>NM_DEVICE_MODEM_MODEM_CAPABILITIES</h3>
+<pre class="programlisting">#define NM_DEVICE_MODEM_MODEM_CAPABILITIES   "modem-capabilities"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-DEVICE-MODEM-CURRENT-CAPABILITIES:CAPS"></a><h3>NM_DEVICE_MODEM_CURRENT_CAPABILITIES</h3>
+<pre class="programlisting">#define NM_DEVICE_MODEM_CURRENT_CAPABILITIES "current-capabilities"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMDeviceModem-struct"></a><h3>NMDeviceModem</h3>
+<pre class="programlisting">typedef struct _NMDeviceModem NMDeviceModem;</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMDeviceModemClass"></a><h3>NMDeviceModemClass</h3>
+<pre class="programlisting">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);
+} NMDeviceModemClass;
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-device-modem-get-modem-capabilities"></a><h3>nm_device_modem_get_modem_capabilities ()</h3>
+<pre class="programlisting"><span class="returnvalue">NMDeviceModemCapabilities</span>  nm_device_modem_get_modem_capabilities
+                                                        (<em class="parameter"><code><a class="link" href="NMDeviceModem.html" title="NMDeviceModem"><span class="type">NMDeviceModem</span></a> *self</code></em>);</pre>
+<p>
+Returns a bitfield of the generic access technology families the modem
+supports.  Not all capabilities are available concurrently however; some
+may require a firmware reload or reinitialization.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>self</code></em> :</span></p></td>
+<td>a <a class="link" href="NMDeviceModem.html" title="NMDeviceModem"><span class="type">NMDeviceModem</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>the generic access technology families the modem supports</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-device-modem-get-current-capabilities"></a><h3>nm_device_modem_get_current_capabilities ()</h3>
+<pre class="programlisting"><span class="returnvalue">NMDeviceModemCapabilities</span>  nm_device_modem_get_current_capabilities
+                                                        (<em class="parameter"><code><a class="link" href="NMDeviceModem.html" title="NMDeviceModem"><span class="type">NMDeviceModem</span></a> *self</code></em>);</pre>
+<p>
+Returns a bitfield of the generic access technology families the modem
+supports without a firmware reload or reinitialization.  This value
+represents the network types the modem can immediately connect to.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>self</code></em> :</span></p></td>
+<td>a <a class="link" href="NMDeviceModem.html" title="NMDeviceModem"><span class="type">NMDeviceModem</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>the generic access technology families the modem supports without
+a firmware reload or other reinitialization</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<div class="refsect1">
+<a name="NMDeviceModem.property-details"></a><h2>Property Details</h2>
+<div class="refsect2">
+<a name="NMDeviceModem--current-capabilities"></a><h3>The <code class="literal">"current-capabilities"</code> property</h3>
+<pre class="programlisting">  "current-capabilities"     <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read</pre>
+<p>
+The generic family of access technologies the modem currently supports
+without a firmware reload or reinitialization.
+</p>
+<p>Default value: 0</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMDeviceModem--modem-capabilities"></a><h3>The <code class="literal">"modem-capabilities"</code> property</h3>
+<pre class="programlisting">  "modem-capabilities"       <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read</pre>
+<p>
+The generic family of access technologies the modem supports.  Not all
+capabilities are available at the same time however; some modems require
+a firmware reload or other reinitialization to switch between eg
+CDMA/EVDO and GSM/UMTS.
+</p>
+<p>Default value: 0</p>
+</div>
+</div>
+</div>
+<div class="footer">
+<hr>
+          Generated by GTK-Doc V1.17</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceWifi.html b/docs/libnm-glib/html/NMDeviceWifi.html
index c08e9cd1e..e7ddf0a94 100644
--- a/docs/libnm-glib/html/NMDeviceWifi.html
+++ b/docs/libnm-glib/html/NMDeviceWifi.html
@@ -3,22 +3,22 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>NMDeviceWifi</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="libnm-glib Reference Manual">
-<link rel="up" href="ch01.html" title="libnm-glib Objects">
+<link rel="up" href="ch02.html" title="libnm-glib API Reference">
 <link rel="prev" href="NMDeviceEthernet.html" title="NMDeviceEthernet">
-<link rel="next" href="NMSerialDevice.html" title="NMSerialDevice">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
+<link rel="next" href="NMDeviceModem.html" title="NMDeviceModem">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
 <tr valign="middle">
 <td><a accesskey="p" href="NMDeviceEthernet.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="ch01.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
+<td><a accesskey="u" href="ch02.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
 <th width="100%" align="center">libnm-glib Reference Manual</th>
-<td><a accesskey="n" href="NMSerialDevice.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+<td><a accesskey="n" href="NMDeviceModem.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
 </tr>
 <tr><td colspan="5" class="shortcuts">
 <a href="#NMDeviceWifi.synopsis" class="shortcut">Top</a>
@@ -32,7 +32,7 @@
                   <a href="#NMDeviceWifi.signals" class="shortcut">Signals</a>
 </td></tr>
 </table>
-<div class="refentry" title="NMDeviceWifi">
+<div class="refentry">
 <a name="NMDeviceWifi"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
@@ -41,7 +41,7 @@
 </td>
 <td valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv" title="Synopsis">
+<div class="refsynopsisdiv">
 <a name="NMDeviceWifi.synopsis"></a><h2>Synopsis</h2>
 <pre class="synopsis">#define             <a class="link" href="NMDeviceWifi.html#NM-DEVICE-WIFI-HW-ADDRESS:CAPS" title="NM_DEVICE_WIFI_HW_ADDRESS">NM_DEVICE_WIFI_HW_ADDRESS</a>
 #define             <a class="link" href="NMDeviceWifi.html#NM-DEVICE-WIFI-PERMANENT-HW-ADDRESS:CAPS" title="NM_DEVICE_WIFI_PERMANENT_HW_ADDRESS">NM_DEVICE_WIFI_PERMANENT_HW_ADDRESS</a>
@@ -53,21 +53,23 @@
                     <a class="link" href="NMDeviceWifi.html#NMDeviceWifiClass" title="NMDeviceWifiClass">NMDeviceWifiClass</a>;
 <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="returnvalue">GObject</span></a> *           <a class="link" href="NMDeviceWifi.html#nm-device-wifi-new" title="nm_device_wifi_new ()">nm_device_wifi_new</a>                  (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGConnection.html#DBusGConnection"><span class="type">DBusGConnection</span></a> *connection</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *path</code></em>);
-const <span class="returnvalue">char</span> *        <a class="link" href="NMDeviceWifi.html#nm-device-wifi-get-hw-address" title="nm_device_wifi_get_hw_address ()">nm_device_wifi_get_hw_address</a>       (<em class="parameter"><code><a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi"><span class="type">NMDeviceWifi</span></a> *device</code></em>);
-const <span class="returnvalue">char</span> *        <a class="link" href="NMDeviceWifi.html#nm-device-wifi-get-permanent-hw-address" title="nm_device_wifi_get_permanent_hw_address ()">nm_device_wifi_get_permanent_hw_address</a>
+const <span class="returnvalue">char</span> *              <a class="link" href="NMDeviceWifi.html#nm-device-wifi-get-hw-address" title="nm_device_wifi_get_hw_address ()">nm_device_wifi_get_hw_address</a> (<em class="parameter"><code><a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi"><span class="type">NMDeviceWifi</span></a> *device</code></em>);
+const <span class="returnvalue">char</span> *              <a class="link" href="NMDeviceWifi.html#nm-device-wifi-get-permanent-hw-address" title="nm_device_wifi_get_permanent_hw_address ()">nm_device_wifi_get_permanent_hw_address</a>
                                                         (<em class="parameter"><code><a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi"><span class="type">NMDeviceWifi</span></a> *device</code></em>);
 <span class="returnvalue">NM80211Mode</span>         <a class="link" href="NMDeviceWifi.html#nm-device-wifi-get-mode" title="nm_device_wifi_get_mode ()">nm_device_wifi_get_mode</a>             (<em class="parameter"><code><a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi"><span class="type">NMDeviceWifi</span></a> *device</code></em>);
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             <a class="link" href="NMDeviceWifi.html#nm-device-wifi-get-bitrate" title="nm_device_wifi_get_bitrate ()">nm_device_wifi_get_bitrate</a>          (<em class="parameter"><code><a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi"><span class="type">NMDeviceWifi</span></a> *device</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             <a class="link" href="NMDeviceWifi.html#nm-device-wifi-get-capabilities" title="nm_device_wifi_get_capabilities ()">nm_device_wifi_get_capabilities</a>     (<em class="parameter"><code><a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi"><span class="type">NMDeviceWifi</span></a> *device</code></em>);
-<a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="returnvalue">NMAccessPoint</span></a> *     <a class="link" href="NMDeviceWifi.html#nm-device-wifi-get-active-access-point" title="nm_device_wifi_get_active_access_point ()">nm_device_wifi_get_active_access_point</a>
+<span class="returnvalue">NMDeviceWifiCapabilities</span>  <a class="link" href="NMDeviceWifi.html#nm-device-wifi-get-capabilities" title="nm_device_wifi_get_capabilities ()">nm_device_wifi_get_capabilities</a>
                                                         (<em class="parameter"><code><a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi"><span class="type">NMDeviceWifi</span></a> *device</code></em>);
-<a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="returnvalue">NMAccessPoint</span></a> *     <a class="link" href="NMDeviceWifi.html#nm-device-wifi-get-access-point-by-path" title="nm_device_wifi_get_access_point_by_path ()">nm_device_wifi_get_access_point_by_path</a>
+<a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="returnvalue">NMAccessPoint</span></a> *           <a class="link" href="NMDeviceWifi.html#nm-device-wifi-get-active-access-point" title="nm_device_wifi_get_active_access_point ()">nm_device_wifi_get_active_access_point</a>
+                                                        (<em class="parameter"><code><a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi"><span class="type">NMDeviceWifi</span></a> *device</code></em>);
+<a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="returnvalue">NMAccessPoint</span></a> *           <a class="link" href="NMDeviceWifi.html#nm-device-wifi-get-access-point-by-path" title="nm_device_wifi_get_access_point_by_path ()">nm_device_wifi_get_access_point_by_path</a>
                                                         (<em class="parameter"><code><a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi"><span class="type">NMDeviceWifi</span></a> *device</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *path</code></em>);
-const <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="returnvalue">GPtrArray</span></a> *   <a class="link" href="NMDeviceWifi.html#nm-device-wifi-get-access-points" title="nm_device_wifi_get_access_points ()">nm_device_wifi_get_access_points</a>    (<em class="parameter"><code><a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi"><span class="type">NMDeviceWifi</span></a> *device</code></em>);
+const <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="returnvalue">GPtrArray</span></a> *         <a class="link" href="NMDeviceWifi.html#nm-device-wifi-get-access-points" title="nm_device_wifi_get_access_points ()">nm_device_wifi_get_access_points</a>
+                                                        (<em class="parameter"><code><a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi"><span class="type">NMDeviceWifi</span></a> *device</code></em>);
 </pre>
 </div>
-<div class="refsect1" title="Object Hierarchy">
+<div class="refsect1">
 <a name="NMDeviceWifi.object-hierarchy"></a><h2>Object Hierarchy</h2>
 <pre class="synopsis">
   <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>
@@ -76,7 +78,7 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.
                +----NMDeviceWifi
 </pre>
 </div>
-<div class="refsect1" title="Properties">
+<div class="refsect1">
 <a name="NMDeviceWifi.properties"></a><h2>Properties</h2>
 <pre class="synopsis">
   "<a class="link" href="NMDeviceWifi.html#NMDeviceWifi--active-access-point" title='The "active-access-point" property'>active-access-point</a>"      <a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a>*        : Read
@@ -87,21 +89,21 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.
   "<a class="link" href="NMDeviceWifi.html#NMDeviceWifi--wireless-capabilities" title='The "wireless-capabilities" property'>wireless-capabilities</a>"    <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read
 </pre>
 </div>
-<div class="refsect1" title="Signals">
+<div class="refsect1">
 <a name="NMDeviceWifi.signals"></a><h2>Signals</h2>
 <pre class="synopsis">
-  "<a class="link" href="NMDeviceWifi.html#NMDeviceWifi-access-point-added" title='The "access-point-added" signal'>access-point-added</a>"                             : Run First
-  "<a class="link" href="NMDeviceWifi.html#NMDeviceWifi-access-point-removed" title='The "access-point-removed" signal'>access-point-removed</a>"                           : Run First
+  "<a class="link" href="NMDeviceWifi.html#NMDeviceWifi-access-point-added" title='The "access-point-added" signal'>access-point-added</a>"                             : <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-FIRST:CAPS"><code class="literal">Run First</code></a>
+  "<a class="link" href="NMDeviceWifi.html#NMDeviceWifi-access-point-removed" title='The "access-point-removed" signal'>access-point-removed</a>"                           : <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-FIRST:CAPS"><code class="literal">Run First</code></a>
 </pre>
 </div>
-<div class="refsect1" title="Description">
+<div class="refsect1">
 <a name="NMDeviceWifi.description"></a><h2>Description</h2>
 <p>
 </p>
 </div>
-<div class="refsect1" title="Details">
+<div class="refsect1">
 <a name="NMDeviceWifi.details"></a><h2>Details</h2>
-<div class="refsect2" title="NM_DEVICE_WIFI_HW_ADDRESS">
+<div class="refsect2">
 <a name="NM-DEVICE-WIFI-HW-ADDRESS:CAPS"></a><h3>NM_DEVICE_WIFI_HW_ADDRESS</h3>
 <pre class="programlisting">#define NM_DEVICE_WIFI_HW_ADDRESS          "hw-address"
 </pre>
@@ -109,7 +111,7 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_DEVICE_WIFI_PERMANENT_HW_ADDRESS">
+<div class="refsect2">
 <a name="NM-DEVICE-WIFI-PERMANENT-HW-ADDRESS:CAPS"></a><h3>NM_DEVICE_WIFI_PERMANENT_HW_ADDRESS</h3>
 <pre class="programlisting">#define NM_DEVICE_WIFI_PERMANENT_HW_ADDRESS "perm-hw-address"
 </pre>
@@ -117,7 +119,7 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_DEVICE_WIFI_MODE">
+<div class="refsect2">
 <a name="NM-DEVICE-WIFI-MODE:CAPS"></a><h3>NM_DEVICE_WIFI_MODE</h3>
 <pre class="programlisting">#define NM_DEVICE_WIFI_MODE                "mode"
 </pre>
@@ -125,7 +127,7 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_DEVICE_WIFI_BITRATE">
+<div class="refsect2">
 <a name="NM-DEVICE-WIFI-BITRATE:CAPS"></a><h3>NM_DEVICE_WIFI_BITRATE</h3>
 <pre class="programlisting">#define NM_DEVICE_WIFI_BITRATE             "bitrate"
 </pre>
@@ -133,7 +135,7 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT">
+<div class="refsect2">
 <a name="NM-DEVICE-WIFI-ACTIVE-ACCESS-POINT:CAPS"></a><h3>NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT</h3>
 <pre class="programlisting">#define NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT "active-access-point"
 </pre>
@@ -141,7 +143,7 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_DEVICE_WIFI_CAPABILITIES">
+<div class="refsect2">
 <a name="NM-DEVICE-WIFI-CAPABILITIES:CAPS"></a><h3>NM_DEVICE_WIFI_CAPABILITIES</h3>
 <pre class="programlisting">#define NM_DEVICE_WIFI_CAPABILITIES        "wireless-capabilities"
 </pre>
@@ -149,14 +151,14 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMDeviceWifi">
+<div class="refsect2">
 <a name="NMDeviceWifi-struct"></a><h3>NMDeviceWifi</h3>
 <pre class="programlisting">typedef struct _NMDeviceWifi NMDeviceWifi;</pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMDeviceWifiClass">
+<div class="refsect2">
 <a name="NMDeviceWifiClass"></a><h3>NMDeviceWifiClass</h3>
 <pre class="programlisting">typedef struct {
 	NMDeviceClass parent;
@@ -178,7 +180,7 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_device_wifi_new ()">
+<div class="refsect2">
 <a name="nm-device-wifi-new"></a><h3>nm_device_wifi_new ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="returnvalue">GObject</span></a> *           nm_device_wifi_new                  (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGConnection.html#DBusGConnection"><span class="type">DBusGConnection</span></a> *connection</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *path</code></em>);</pre>
@@ -195,21 +197,20 @@ Creates a new <a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi"><spa
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>path</code></em> :</span></p></td>
-<td>the DBus object path of the device
-</td>
+<td>the DBus object path of the device</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a new device
+<td>a new WiFi device. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_device_wifi_get_hw_address ()">
+<div class="refsect2">
 <a name="nm-device-wifi-get-hw-address"></a><h3>nm_device_wifi_get_hw_address ()</h3>
-<pre class="programlisting">const <span class="returnvalue">char</span> *        nm_device_wifi_get_hw_address       (<em class="parameter"><code><a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi"><span class="type">NMDeviceWifi</span></a> *device</code></em>);</pre>
+<pre class="programlisting">const <span class="returnvalue">char</span> *              nm_device_wifi_get_hw_address (<em class="parameter"><code><a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi"><span class="type">NMDeviceWifi</span></a> *device</code></em>);</pre>
 <p>
 Gets the actual hardware (MAC) address of the <a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi"><span class="type">NMDeviceWifi</span></a>
 </p>
@@ -223,17 +224,16 @@ Gets the actual hardware (MAC) address of the <a class="link" href="NMDeviceWifi
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the actual hardware address. This is the internal string used by the
-device, and must not be modified.
-</td>
+<td>the actual hardware address. This is the internal string used by the
+device, and must not be modified.</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_device_wifi_get_permanent_hw_address ()">
+<div class="refsect2">
 <a name="nm-device-wifi-get-permanent-hw-address"></a><h3>nm_device_wifi_get_permanent_hw_address ()</h3>
-<pre class="programlisting">const <span class="returnvalue">char</span> *        nm_device_wifi_get_permanent_hw_address
+<pre class="programlisting">const <span class="returnvalue">char</span> *              nm_device_wifi_get_permanent_hw_address
                                                         (<em class="parameter"><code><a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi"><span class="type">NMDeviceWifi</span></a> *device</code></em>);</pre>
 <p>
 Gets the permanent hardware (MAC) address of the <a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi"><span class="type">NMDeviceWifi</span></a>
@@ -248,15 +248,14 @@ Gets the permanent hardware (MAC) address of the <a class="link" href="NMDeviceW
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the permanent hardware address. This is the internal string used by the
-device, and must not be modified.
-</td>
+<td>the permanent hardware address. This is the internal string used by the
+device, and must not be modified.</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_device_wifi_get_mode ()">
+<div class="refsect2">
 <a name="nm-device-wifi-get-mode"></a><h3>nm_device_wifi_get_mode ()</h3>
 <pre class="programlisting"><span class="returnvalue">NM80211Mode</span>         nm_device_wifi_get_mode             (<em class="parameter"><code><a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi"><span class="type">NMDeviceWifi</span></a> *device</code></em>);</pre>
 <p>
@@ -272,14 +271,13 @@ Gets the <a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi"><span cla
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the mode
-</td>
+<td>the mode</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_device_wifi_get_bitrate ()">
+<div class="refsect2">
 <a name="nm-device-wifi-get-bitrate"></a><h3>nm_device_wifi_get_bitrate ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_device_wifi_get_bitrate          (<em class="parameter"><code><a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi"><span class="type">NMDeviceWifi</span></a> *device</code></em>);</pre>
 <p>
@@ -295,16 +293,16 @@ Gets the bit rate of the <a class="link" href="NMDeviceWifi.html" title="NMDevic
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the bit rate
-</td>
+<td>the bit rate</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_device_wifi_get_capabilities ()">
+<div class="refsect2">
 <a name="nm-device-wifi-get-capabilities"></a><h3>nm_device_wifi_get_capabilities ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_device_wifi_get_capabilities     (<em class="parameter"><code><a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi"><span class="type">NMDeviceWifi</span></a> *device</code></em>);</pre>
+<pre class="programlisting"><span class="returnvalue">NMDeviceWifiCapabilities</span>  nm_device_wifi_get_capabilities
+                                                        (<em class="parameter"><code><a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi"><span class="type">NMDeviceWifi</span></a> *device</code></em>);</pre>
 <p>
 Gets the WIFI capabilities of the <a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi"><span class="type">NMDeviceWifi</span></a>.
 </p>
@@ -318,16 +316,15 @@ Gets the WIFI capabilities of the <a class="link" href="NMDeviceWifi.html" title
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the capabilities
-</td>
+<td>the capabilities</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_device_wifi_get_active_access_point ()">
+<div class="refsect2">
 <a name="nm-device-wifi-get-active-access-point"></a><h3>nm_device_wifi_get_active_access_point ()</h3>
-<pre class="programlisting"><a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="returnvalue">NMAccessPoint</span></a> *     nm_device_wifi_get_active_access_point
+<pre class="programlisting"><a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="returnvalue">NMAccessPoint</span></a> *           nm_device_wifi_get_active_access_point
                                                         (<em class="parameter"><code><a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi"><span class="type">NMDeviceWifi</span></a> *device</code></em>);</pre>
 <p>
 Gets the active <a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a>.
@@ -342,16 +339,16 @@ Gets the active <a class="link" href="NMAccessPoint.html" title="NMAccessPoint">
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the access point or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if none is active
+<td>the access point or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if none is active. <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_device_wifi_get_access_point_by_path ()">
+<div class="refsect2">
 <a name="nm-device-wifi-get-access-point-by-path"></a><h3>nm_device_wifi_get_access_point_by_path ()</h3>
-<pre class="programlisting"><a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="returnvalue">NMAccessPoint</span></a> *     nm_device_wifi_get_access_point_by_path
+<pre class="programlisting"><a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="returnvalue">NMAccessPoint</span></a> *           nm_device_wifi_get_access_point_by_path
                                                         (<em class="parameter"><code><a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi"><span class="type">NMDeviceWifi</span></a> *device</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *path</code></em>);</pre>
 <p>
@@ -367,21 +364,21 @@ Gets a <a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span cla
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>path</code></em> :</span></p></td>
-<td>the object path of the access point
-</td>
+<td>the object path of the access point</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the access point or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if none is found.
+<td>the access point or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if none is found. <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_device_wifi_get_access_points ()">
+<div class="refsect2">
 <a name="nm-device-wifi-get-access-points"></a><h3>nm_device_wifi_get_access_points ()</h3>
-<pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="returnvalue">GPtrArray</span></a> *   nm_device_wifi_get_access_points    (<em class="parameter"><code><a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi"><span class="type">NMDeviceWifi</span></a> *device</code></em>);</pre>
+<pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="returnvalue">GPtrArray</span></a> *         nm_device_wifi_get_access_points
+                                                        (<em class="parameter"><code><a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi"><span class="type">NMDeviceWifi</span></a> *device</code></em>);</pre>
 <p>
 Gets all the scanned access points of the <a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi"><span class="type">NMDeviceWifi</span></a>.
 </p>
@@ -395,17 +392,18 @@ Gets all the scanned access points of the <a class="link" href="NMDeviceWifi.htm
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> containing all the scanned <a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a>s.
-The returned array is owned by the client and should not be modified.
+<td>a <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> containing all the
+scanned <a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a>s.
+The returned array is owned by the client and should not be modified. <span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMClient.AccessPoint]</span>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 </div>
-<div class="refsect1" title="Property Details">
+<div class="refsect1">
 <a name="NMDeviceWifi.property-details"></a><h2>Property Details</h2>
-<div class="refsect2" title='The "active-access-point" property'>
+<div class="refsect2">
 <a name="NMDeviceWifi--active-access-point"></a><h3>The <code class="literal">"active-access-point"</code> property</h3>
 <pre class="programlisting">  "active-access-point"      <a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a>*        : Read</pre>
 <p>
@@ -413,7 +411,7 @@ The active <a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span
 </p>
 </div>
 <hr>
-<div class="refsect2" title='The "bitrate" property'>
+<div class="refsect2">
 <a name="NMDeviceWifi--bitrate"></a><h3>The <code class="literal">"bitrate"</code> property</h3>
 <pre class="programlisting">  "bitrate"                  <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read</pre>
 <p>
@@ -422,7 +420,7 @@ The bit rate of the device.
 <p>Default value: 0</p>
 </div>
 <hr>
-<div class="refsect2" title='The "hw-address" property'>
+<div class="refsect2">
 <a name="NMDeviceWifi--hw-address"></a><h3>The <code class="literal">"hw-address"</code> property</h3>
 <pre class="programlisting">  "hw-address"               <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read</pre>
 <p>
@@ -431,7 +429,7 @@ The hardware (MAC) address of the device.
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "mode" property'>
+<div class="refsect2">
 <a name="NMDeviceWifi--mode"></a><h3>The <code class="literal">"mode"</code> property</h3>
 <pre class="programlisting">  "mode"                     <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read</pre>
 <p>
@@ -441,7 +439,7 @@ The mode of the device.
 <p>Default value: 2</p>
 </div>
 <hr>
-<div class="refsect2" title='The "perm-hw-address" property'>
+<div class="refsect2">
 <a name="NMDeviceWifi--perm-hw-address"></a><h3>The <code class="literal">"perm-hw-address"</code> property</h3>
 <pre class="programlisting">  "perm-hw-address"          <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read</pre>
 <p>
@@ -450,7 +448,7 @@ The hardware (MAC) address of the device.
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "wireless-capabilities" property'>
+<div class="refsect2">
 <a name="NMDeviceWifi--wireless-capabilities"></a><h3>The <code class="literal">"wireless-capabilities"</code> property</h3>
 <pre class="programlisting">  "wireless-capabilities"    <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read</pre>
 <p>
@@ -459,13 +457,13 @@ The wireless capabilities of the device.
 <p>Default value: 0</p>
 </div>
 </div>
-<div class="refsect1" title="Signal Details">
+<div class="refsect1">
 <a name="NMDeviceWifi.signal-details"></a><h2>Signal Details</h2>
-<div class="refsect2" title='The "access-point-added" signal'>
+<div class="refsect2">
 <a name="NMDeviceWifi-access-point-added"></a><h3>The <code class="literal">"access-point-added"</code> signal</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                user_function                      (<a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi"><span class="type">NMDeviceWifi</span></a> *device,
                                                         <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a>      *ap,
-                                                        <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>      user_data)      : Run First</pre>
+                                                        <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>      user_data)      : <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-FIRST:CAPS"><code class="literal">Run First</code></a></pre>
 <p>
 Notifies that a <a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a> is added to the wifi device.
 </p>
@@ -474,13 +472,11 @@ Notifies that a <a class="link" href="NMAccessPoint.html" title="NMAccessPoint">
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>device</code></em> :</span></p></td>
-<td>the wifi device that received the signal
-</td>
+<td>the wifi device that received the signal</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>ap</code></em> :</span></p></td>
-<td>the new access point
-</td>
+<td>the new access point</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
@@ -490,11 +486,11 @@ Notifies that a <a class="link" href="NMAccessPoint.html" title="NMAccessPoint">
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title='The "access-point-removed" signal'>
+<div class="refsect2">
 <a name="NMDeviceWifi-access-point-removed"></a><h3>The <code class="literal">"access-point-removed"</code> signal</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                user_function                      (<a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi"><span class="type">NMDeviceWifi</span></a> *device,
                                                         <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a>      *ap,
-                                                        <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>      user_data)      : Run First</pre>
+                                                        <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>      user_data)      : <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-FIRST:CAPS"><code class="literal">Run First</code></a></pre>
 <p>
 Notifies that a <a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a> is removed from the wifi device.
 </p>
@@ -503,13 +499,11 @@ Notifies that a <a class="link" href="NMAccessPoint.html" title="NMAccessPoint">
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>device</code></em> :</span></p></td>
-<td>the wifi device that received the signal
-</td>
+<td>the wifi device that received the signal</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>ap</code></em> :</span></p></td>
-<td>the removed access point
-</td>
+<td>the removed access point</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
@@ -522,6 +516,6 @@ Notifies that a <a class="link" href="NMAccessPoint.html" title="NMAccessPoint">
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.15</div>
+          Generated by GTK-Doc V1.17</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceWimax.html b/docs/libnm-glib/html/NMDeviceWimax.html
new file mode 100644
index 000000000..a9b65251a
--- /dev/null
+++ b/docs/libnm-glib/html/NMDeviceWimax.html
@@ -0,0 +1,564 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>NMDeviceWimax</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<link rel="home" href="index.html" title="libnm-glib Reference Manual">
+<link rel="up" href="ch02.html" title="libnm-glib API Reference">
+<link rel="prev" href="NMDeviceBt.html" title="NMDeviceBt">
+<link rel="next" href="NMWimaxNsp.html" title="NMWimaxNsp">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
+<tr valign="middle">
+<td><a accesskey="p" href="NMDeviceBt.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
+<td><a accesskey="u" href="ch02.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
+<th width="100%" align="center">libnm-glib Reference Manual</th>
+<td><a accesskey="n" href="NMWimaxNsp.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+</tr>
+<tr><td colspan="5" class="shortcuts">
+<a href="#NMDeviceWimax.synopsis" class="shortcut">Top</a>
+                   | 
+                  <a href="#NMDeviceWimax.description" class="shortcut">Description</a>
+                   | 
+                  <a href="#NMDeviceWimax.object-hierarchy" class="shortcut">Object Hierarchy</a>
+                   | 
+                  <a href="#NMDeviceWimax.properties" class="shortcut">Properties</a>
+                   | 
+                  <a href="#NMDeviceWimax.signals" class="shortcut">Signals</a>
+</td></tr>
+</table>
+<div class="refentry">
+<a name="NMDeviceWimax"></a><div class="titlepage"></div>
+<div class="refnamediv"><table width="100%"><tr>
+<td valign="top">
+<h2><span class="refentrytitle"><a name="NMDeviceWimax.top_of_page"></a>NMDeviceWimax</span></h2>
+<p>NMDeviceWimax</p>
+</td>
+<td valign="top" align="right"></td>
+</tr></table></div>
+<div class="refsynopsisdiv">
+<a name="NMDeviceWimax.synopsis"></a><h2>Synopsis</h2>
+<pre class="synopsis">#define             <a class="link" href="NMDeviceWimax.html#NM-DEVICE-WIMAX-HW-ADDRESS:CAPS" title="NM_DEVICE_WIMAX_HW_ADDRESS">NM_DEVICE_WIMAX_HW_ADDRESS</a>
+#define             <a class="link" href="NMDeviceWimax.html#NM-DEVICE-WIMAX-ACTIVE-NSP:CAPS" title="NM_DEVICE_WIMAX_ACTIVE_NSP">NM_DEVICE_WIMAX_ACTIVE_NSP</a>
+#define             <a class="link" href="NMDeviceWimax.html#NM-DEVICE-WIMAX-CENTER-FREQUENCY:CAPS" title="NM_DEVICE_WIMAX_CENTER_FREQUENCY">NM_DEVICE_WIMAX_CENTER_FREQUENCY</a>
+#define             <a class="link" href="NMDeviceWimax.html#NM-DEVICE-WIMAX-RSSI:CAPS" title="NM_DEVICE_WIMAX_RSSI">NM_DEVICE_WIMAX_RSSI</a>
+#define             <a class="link" href="NMDeviceWimax.html#NM-DEVICE-WIMAX-CINR:CAPS" title="NM_DEVICE_WIMAX_CINR">NM_DEVICE_WIMAX_CINR</a>
+#define             <a class="link" href="NMDeviceWimax.html#NM-DEVICE-WIMAX-TX-POWER:CAPS" title="NM_DEVICE_WIMAX_TX_POWER">NM_DEVICE_WIMAX_TX_POWER</a>
+#define             <a class="link" href="NMDeviceWimax.html#NM-DEVICE-WIMAX-BSID:CAPS" title="NM_DEVICE_WIMAX_BSID">NM_DEVICE_WIMAX_BSID</a>
+                    <a class="link" href="NMDeviceWimax.html#NMDeviceWimax-struct" title="NMDeviceWimax">NMDeviceWimax</a>;
+                    <a class="link" href="NMDeviceWimax.html#NMDeviceWimaxClass" title="NMDeviceWimaxClass">NMDeviceWimaxClass</a>;
+<a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="returnvalue">GObject</span></a> *           <a class="link" href="NMDeviceWimax.html#nm-device-wimax-new" title="nm_device_wimax_new ()">nm_device_wimax_new</a>                 (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGConnection.html#DBusGConnection"><span class="type">DBusGConnection</span></a> *connection</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *path</code></em>);
+const <span class="returnvalue">char</span> *        <a class="link" href="NMDeviceWimax.html#nm-device-wimax-get-hw-address" title="nm_device_wimax_get_hw_address ()">nm_device_wimax_get_hw_address</a>      (<em class="parameter"><code><a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax"><span class="type">NMDeviceWimax</span></a> *wimax</code></em>);
+<a class="link" href="NMWimaxNsp.html" title="NMWimaxNsp"><span class="returnvalue">NMWimaxNsp</span></a> *        <a class="link" href="NMDeviceWimax.html#nm-device-wimax-get-active-nsp" title="nm_device_wimax_get_active_nsp ()">nm_device_wimax_get_active_nsp</a>      (<em class="parameter"><code><a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax"><span class="type">NMDeviceWimax</span></a> *wimax</code></em>);
+<a class="link" href="NMWimaxNsp.html" title="NMWimaxNsp"><span class="returnvalue">NMWimaxNsp</span></a> *        <a class="link" href="NMDeviceWimax.html#nm-device-wimax-get-nsp-by-path" title="nm_device_wimax_get_nsp_by_path ()">nm_device_wimax_get_nsp_by_path</a>     (<em class="parameter"><code><a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax"><span class="type">NMDeviceWimax</span></a> *wimax</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *path</code></em>);
+const <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="returnvalue">GPtrArray</span></a> *   <a class="link" href="NMDeviceWimax.html#nm-device-wimax-get-nsps" title="nm_device_wimax_get_nsps ()">nm_device_wimax_get_nsps</a>            (<em class="parameter"><code><a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax"><span class="type">NMDeviceWimax</span></a> *wimax</code></em>);
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>               <a class="link" href="NMDeviceWimax.html#nm-device-wimax-get-center-frequency" title="nm_device_wimax_get_center_frequency ()">nm_device_wimax_get_center_frequency</a>
+                                                        (<em class="parameter"><code><a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax"><span class="type">NMDeviceWimax</span></a> *self</code></em>);
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>                <a class="link" href="NMDeviceWimax.html#nm-device-wimax-get-rssi" title="nm_device_wimax_get_rssi ()">nm_device_wimax_get_rssi</a>            (<em class="parameter"><code><a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax"><span class="type">NMDeviceWimax</span></a> *self</code></em>);
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>                <a class="link" href="NMDeviceWimax.html#nm-device-wimax-get-cinr" title="nm_device_wimax_get_cinr ()">nm_device_wimax_get_cinr</a>            (<em class="parameter"><code><a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax"><span class="type">NMDeviceWimax</span></a> *self</code></em>);
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>                <a class="link" href="NMDeviceWimax.html#nm-device-wimax-get-tx-power" title="nm_device_wimax_get_tx_power ()">nm_device_wimax_get_tx_power</a>        (<em class="parameter"><code><a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax"><span class="type">NMDeviceWimax</span></a> *self</code></em>);
+const <span class="returnvalue">char</span> *        <a class="link" href="NMDeviceWimax.html#nm-device-wimax-get-bsid" title="nm_device_wimax_get_bsid ()">nm_device_wimax_get_bsid</a>            (<em class="parameter"><code><a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax"><span class="type">NMDeviceWimax</span></a> *self</code></em>);
+</pre>
+</div>
+<div class="refsect1">
+<a name="NMDeviceWimax.object-hierarchy"></a><h2>Object Hierarchy</h2>
+<pre class="synopsis">
+  <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>
+   +----<a class="link" href="NMObject.html" title="NMObject">NMObject</a>
+         +----<a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+               +----NMDeviceWimax
+</pre>
+</div>
+<div class="refsect1">
+<a name="NMDeviceWimax.properties"></a><h2>Properties</h2>
+<pre class="synopsis">
+  "<a class="link" href="NMDeviceWimax.html#NMDeviceWimax--active-nsp" title='The "active-nsp" property'>active-nsp</a>"               <a class="link" href="NMWimaxNsp.html" title="NMWimaxNsp"><span class="type">NMWimaxNsp</span></a>*           : Read
+  "<a class="link" href="NMDeviceWimax.html#NMDeviceWimax--bsid" title='The "bsid" property'>bsid</a>"                     <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read
+  "<a class="link" href="NMDeviceWimax.html#NMDeviceWimax--center-frequency" title='The "center-frequency" property'>center-frequency</a>"         <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read
+  "<a class="link" href="NMDeviceWimax.html#NMDeviceWimax--cinr" title='The "cinr" property'>cinr</a>"                     <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a>                  : Read
+  "<a class="link" href="NMDeviceWimax.html#NMDeviceWimax--hw-address" title='The "hw-address" property'>hw-address</a>"               <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read
+  "<a class="link" href="NMDeviceWimax.html#NMDeviceWimax--rssi" title='The "rssi" property'>rssi</a>"                     <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a>                  : Read
+  "<a class="link" href="NMDeviceWimax.html#NMDeviceWimax--tx-power" title='The "tx-power" property'>tx-power</a>"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a>                  : Read
+</pre>
+</div>
+<div class="refsect1">
+<a name="NMDeviceWimax.signals"></a><h2>Signals</h2>
+<pre class="synopsis">
+  "<a class="link" href="NMDeviceWimax.html#NMDeviceWimax-nsp-added" title='The "nsp-added" signal'>nsp-added</a>"                                      : <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-FIRST:CAPS"><code class="literal">Run First</code></a>
+  "<a class="link" href="NMDeviceWimax.html#NMDeviceWimax-nsp-removed" title='The "nsp-removed" signal'>nsp-removed</a>"                                    : <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-FIRST:CAPS"><code class="literal">Run First</code></a>
+</pre>
+</div>
+<div class="refsect1">
+<a name="NMDeviceWimax.description"></a><h2>Description</h2>
+<p>
+</p>
+</div>
+<div class="refsect1">
+<a name="NMDeviceWimax.details"></a><h2>Details</h2>
+<div class="refsect2">
+<a name="NM-DEVICE-WIMAX-HW-ADDRESS:CAPS"></a><h3>NM_DEVICE_WIMAX_HW_ADDRESS</h3>
+<pre class="programlisting">#define NM_DEVICE_WIMAX_HW_ADDRESS       "hw-address"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-DEVICE-WIMAX-ACTIVE-NSP:CAPS"></a><h3>NM_DEVICE_WIMAX_ACTIVE_NSP</h3>
+<pre class="programlisting">#define NM_DEVICE_WIMAX_ACTIVE_NSP       "active-nsp"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-DEVICE-WIMAX-CENTER-FREQUENCY:CAPS"></a><h3>NM_DEVICE_WIMAX_CENTER_FREQUENCY</h3>
+<pre class="programlisting">#define NM_DEVICE_WIMAX_CENTER_FREQUENCY "center-frequency"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-DEVICE-WIMAX-RSSI:CAPS"></a><h3>NM_DEVICE_WIMAX_RSSI</h3>
+<pre class="programlisting">#define NM_DEVICE_WIMAX_RSSI             "rssi"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-DEVICE-WIMAX-CINR:CAPS"></a><h3>NM_DEVICE_WIMAX_CINR</h3>
+<pre class="programlisting">#define NM_DEVICE_WIMAX_CINR             "cinr"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-DEVICE-WIMAX-TX-POWER:CAPS"></a><h3>NM_DEVICE_WIMAX_TX_POWER</h3>
+<pre class="programlisting">#define NM_DEVICE_WIMAX_TX_POWER         "tx-power"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-DEVICE-WIMAX-BSID:CAPS"></a><h3>NM_DEVICE_WIMAX_BSID</h3>
+<pre class="programlisting">#define NM_DEVICE_WIMAX_BSID             "bsid"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMDeviceWimax-struct"></a><h3>NMDeviceWimax</h3>
+<pre class="programlisting">typedef struct _NMDeviceWimax NMDeviceWimax;</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMDeviceWimaxClass"></a><h3>NMDeviceWimaxClass</h3>
+<pre class="programlisting">typedef struct {
+	NMDeviceClass parent;
+
+	/* Signals */
+	void (*nsp_added)   (NMDeviceWimax *self, NMWimaxNsp *nsp);
+	void (*nsp_removed) (NMDeviceWimax *self, NMWimaxNsp *nsp);
+} NMDeviceWimaxClass;
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-device-wimax-new"></a><h3>nm_device_wimax_new ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="returnvalue">GObject</span></a> *           nm_device_wimax_new                 (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGConnection.html#DBusGConnection"><span class="type">DBusGConnection</span></a> *connection</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *path</code></em>);</pre>
+<p>
+Creates a new <a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax"><span class="type">NMDeviceWimax</span></a>.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
+<td>the <a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGConnection.html#DBusGConnection"><span class="type">DBusGConnection</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>path</code></em> :</span></p></td>
+<td>the D-Bus object path of the WiMAX device</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>a new WiMAX device. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-device-wimax-get-hw-address"></a><h3>nm_device_wimax_get_hw_address ()</h3>
+<pre class="programlisting">const <span class="returnvalue">char</span> *        nm_device_wimax_get_hw_address      (<em class="parameter"><code><a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax"><span class="type">NMDeviceWimax</span></a> *wimax</code></em>);</pre>
+<p>
+Gets the hardware (MAC) address of the <a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax"><span class="type">NMDeviceWimax</span></a>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>wimax</code></em> :</span></p></td>
+<td>a <a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax"><span class="type">NMDeviceWimax</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>the hardware address. This is the internal string used by the
+device, and must not be modified.</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-device-wimax-get-active-nsp"></a><h3>nm_device_wimax_get_active_nsp ()</h3>
+<pre class="programlisting"><a class="link" href="NMWimaxNsp.html" title="NMWimaxNsp"><span class="returnvalue">NMWimaxNsp</span></a> *        nm_device_wimax_get_active_nsp      (<em class="parameter"><code><a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax"><span class="type">NMDeviceWimax</span></a> *wimax</code></em>);</pre>
+<p>
+Gets the active <a class="link" href="NMWimaxNsp.html" title="NMWimaxNsp"><span class="type">NMWimaxNsp</span></a>.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>wimax</code></em> :</span></p></td>
+<td>a <a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax"><span class="type">NMDeviceWimax</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>the access point or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if none is active. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-device-wimax-get-nsp-by-path"></a><h3>nm_device_wimax_get_nsp_by_path ()</h3>
+<pre class="programlisting"><a class="link" href="NMWimaxNsp.html" title="NMWimaxNsp"><span class="returnvalue">NMWimaxNsp</span></a> *        nm_device_wimax_get_nsp_by_path     (<em class="parameter"><code><a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax"><span class="type">NMDeviceWimax</span></a> *wimax</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *path</code></em>);</pre>
+<p>
+Gets a <a class="link" href="NMWimaxNsp.html" title="NMWimaxNsp"><span class="type">NMWimaxNsp</span></a> by path.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>wimax</code></em> :</span></p></td>
+<td>a <a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax"><span class="type">NMDeviceWimax</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>path</code></em> :</span></p></td>
+<td>the object path of the NSP</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>the access point or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if none is found. <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-device-wimax-get-nsps"></a><h3>nm_device_wimax_get_nsps ()</h3>
+<pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="returnvalue">GPtrArray</span></a> *   nm_device_wimax_get_nsps            (<em class="parameter"><code><a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax"><span class="type">NMDeviceWimax</span></a> *wimax</code></em>);</pre>
+<p>
+Gets all the scanned NSPs of the <a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax"><span class="type">NMDeviceWimax</span></a>.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>wimax</code></em> :</span></p></td>
+<td>a <a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax"><span class="type">NMDeviceWimax</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>a <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> containing
+all the scanned <a class="link" href="NMWimaxNsp.html" title="NMWimaxNsp"><span class="type">NMWimaxNsp</span></a>s.
+The returned array is owned by the client and should not be modified. <span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMClient.WimaxNsp]</span>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-device-wimax-get-center-frequency"></a><h3>nm_device_wimax_get_center_frequency ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>               nm_device_wimax_get_center_frequency
+                                                        (<em class="parameter"><code><a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax"><span class="type">NMDeviceWimax</span></a> *self</code></em>);</pre>
+<p>
+Gets the center frequency (in KHz) of the radio channel the device is using
+to communicate with the network when connected.  Has no meaning when the
+device is not connected.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>self</code></em> :</span></p></td>
+<td>a <a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax"><span class="type">NMDeviceWimax</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>the center frequency in KHz, or 0</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-device-wimax-get-rssi"></a><h3>nm_device_wimax_get_rssi ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>                nm_device_wimax_get_rssi            (<em class="parameter"><code><a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax"><span class="type">NMDeviceWimax</span></a> *self</code></em>);</pre>
+<p>
+Gets the RSSI of the current radio link in dBm.  This value indicates how
+strong the raw received RF signal from the base station is, but does not
+indicate the overall quality of the radio link.  Has no meaning when the
+device is not connected.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>self</code></em> :</span></p></td>
+<td>a <a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax"><span class="type">NMDeviceWimax</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>the RSSI in dBm, or 0</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-device-wimax-get-cinr"></a><h3>nm_device_wimax_get_cinr ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>                nm_device_wimax_get_cinr            (<em class="parameter"><code><a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax"><span class="type">NMDeviceWimax</span></a> *self</code></em>);</pre>
+<p>
+Gets the CINR (Carrier to Interference + Noise Ratio) of the current radio
+link in dB.  CINR is a more accurate measure of radio link quality.  Has no
+meaning when the device is not connected.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>self</code></em> :</span></p></td>
+<td>a <a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax"><span class="type">NMDeviceWimax</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>the CINR in dB, or 0</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-device-wimax-get-tx-power"></a><h3>nm_device_wimax_get_tx_power ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>                nm_device_wimax_get_tx_power        (<em class="parameter"><code><a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax"><span class="type">NMDeviceWimax</span></a> *self</code></em>);</pre>
+<p>
+Average power of the last burst transmitted by the device, in units of
+0.5 dBm.  i.e. a TxPower of -11 represents an actual device TX power of
+-5.5 dBm.  Has no meaning when the device is not connected.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>self</code></em> :</span></p></td>
+<td>a <a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax"><span class="type">NMDeviceWimax</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>the TX power in dBm, or 0</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-device-wimax-get-bsid"></a><h3>nm_device_wimax_get_bsid ()</h3>
+<pre class="programlisting">const <span class="returnvalue">char</span> *        nm_device_wimax_get_bsid            (<em class="parameter"><code><a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax"><span class="type">NMDeviceWimax</span></a> *self</code></em>);</pre>
+<p>
+Gets the ID of the serving Base Station when the device is connected.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>self</code></em> :</span></p></td>
+<td>a <a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax"><span class="type">NMDeviceWimax</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>the ID of the serving Base Station, or NULL</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<div class="refsect1">
+<a name="NMDeviceWimax.property-details"></a><h2>Property Details</h2>
+<div class="refsect2">
+<a name="NMDeviceWimax--active-nsp"></a><h3>The <code class="literal">"active-nsp"</code> property</h3>
+<pre class="programlisting">  "active-nsp"               <a class="link" href="NMWimaxNsp.html" title="NMWimaxNsp"><span class="type">NMWimaxNsp</span></a>*           : Read</pre>
+<p>
+The active <a class="link" href="NMWimaxNsp.html" title="NMWimaxNsp"><span class="type">NMWimaxNsp</span></a> of the device.
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMDeviceWimax--bsid"></a><h3>The <code class="literal">"bsid"</code> property</h3>
+<pre class="programlisting">  "bsid"                     <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read</pre>
+<p>
+The ID of the serving base station as received from the network.  Has
+no meaning when the device is not connected.
+</p>
+<p>Default value: NULL</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMDeviceWimax--center-frequency"></a><h3>The <code class="literal">"center-frequency"</code> property</h3>
+<pre class="programlisting">  "center-frequency"         <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read</pre>
+<p>
+The center frequency (in KHz) of the radio channel the device is using to
+communicate with the network when connected.  Has no meaning when the
+device is not connected.
+</p>
+<p>Default value: 0</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMDeviceWimax--cinr"></a><h3>The <code class="literal">"cinr"</code> property</h3>
+<pre class="programlisting">  "cinr"                     <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a>                  : Read</pre>
+<p>
+CINR (Carrier to Interference + Noise Ratio) of the current radio link
+in dB.  CINR is a more accurate measure of radio link quality.  Has no
+meaning when the device is not connected.
+</p>
+<p>Default value: 0</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMDeviceWimax--hw-address"></a><h3>The <code class="literal">"hw-address"</code> property</h3>
+<pre class="programlisting">  "hw-address"               <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read</pre>
+<p>
+The hardware (MAC) address of the device.
+</p>
+<p>Default value: NULL</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMDeviceWimax--rssi"></a><h3>The <code class="literal">"rssi"</code> property</h3>
+<pre class="programlisting">  "rssi"                     <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a>                  : Read</pre>
+<p>
+RSSI of the current radio link in dBm.  This value indicates how strong
+the raw received RF signal from the base station is, but does not
+indicate the overall quality of the radio link.  Has no meaning when the
+device is not connected.
+</p>
+<p>Default value: 0</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMDeviceWimax--tx-power"></a><h3>The <code class="literal">"tx-power"</code> property</h3>
+<pre class="programlisting">  "tx-power"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a>                  : Read</pre>
+<p>
+Average power of the last burst transmitted by the device, in units of
+0.5 dBm.  i.e. a TxPower of -11 represents an actual device TX power of
+-5.5 dBm.  Has no meaning when the device is not connected.
+</p>
+<p>Default value: 0</p>
+</div>
+</div>
+<div class="refsect1">
+<a name="NMDeviceWimax.signal-details"></a><h2>Signal Details</h2>
+<div class="refsect2">
+<a name="NMDeviceWimax-nsp-added"></a><h3>The <code class="literal">"nsp-added"</code> signal</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                user_function                      (<a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax"><span class="type">NMDeviceWimax</span></a> *self,
+                                                        <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a>       *nsp,
+                                                        <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>       user_data)      : <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-FIRST:CAPS"><code class="literal">Run First</code></a></pre>
+<p>
+Notifies that a <a class="link" href="NMWimaxNsp.html" title="NMWimaxNsp"><span class="type">NMWimaxNsp</span></a> is added to the wimax device.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>self</code></em> :</span></p></td>
+<td>the wimax device that received the signal</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>nsp</code></em> :</span></p></td>
+<td>the new NSP</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
+<td>user data set when the signal handler was connected.</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMDeviceWimax-nsp-removed"></a><h3>The <code class="literal">"nsp-removed"</code> signal</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                user_function                      (<a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax"><span class="type">NMDeviceWimax</span></a> *self,
+                                                        <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a>       *nsp,
+                                                        <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>       user_data)      : <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-FIRST:CAPS"><code class="literal">Run First</code></a></pre>
+<p>
+Notifies that a <a class="link" href="NMWimaxNsp.html" title="NMWimaxNsp"><span class="type">NMWimaxNsp</span></a> is removed from the wimax device.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>self</code></em> :</span></p></td>
+<td>the wimax device that received the signal</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>nsp</code></em> :</span></p></td>
+<td>the removed NSP</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
+<td>user data set when the signal handler was connected.</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+</div>
+<div class="footer">
+<hr>
+          Generated by GTK-Doc V1.17</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMExportedConnection.html b/docs/libnm-glib/html/NMExportedConnection.html
deleted file mode 100644
index 9cd9ee734..000000000
--- a/docs/libnm-glib/html/NMExportedConnection.html
+++ /dev/null
@@ -1,139 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>NMExportedConnection</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
-<link rel="home" href="index.html" title="libnm-glib Reference Manual">
-<link rel="up" href="ch01.html" title="libnm-glib Objects">
-<link rel="prev" href="NMDHCP6Config.html" title="NMDHCP6Config">
-<link rel="next" href="NMObject.html" title="NMObject">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
-<link rel="stylesheet" href="style.css" type="text/css">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
-<tr valign="middle">
-<td><a accesskey="p" href="NMDHCP6Config.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="ch01.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">libnm-glib Reference Manual</th>
-<td><a accesskey="n" href="NMObject.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
-</tr>
-<tr><td colspan="5" class="shortcuts">
-<a href="#NMExportedConnection.synopsis" class="shortcut">Top</a>
-                   | 
-                  <a href="#NMExportedConnection.description" class="shortcut">Description</a>
-                   | 
-                  <a href="#NMExportedConnection.object-hierarchy" class="shortcut">Object Hierarchy</a>
-                   | 
-                  <a href="#NMExportedConnection.implemented-interfaces" class="shortcut">Implemented Interfaces</a>
-</td></tr>
-</table>
-<div class="refentry" title="NMExportedConnection">
-<a name="NMExportedConnection"></a><div class="titlepage"></div>
-<div class="refnamediv"><table width="100%"><tr>
-<td valign="top">
-<h2><span class="refentrytitle"><a name="NMExportedConnection.top_of_page"></a>NMExportedConnection</span></h2>
-<p>NMExportedConnection</p>
-</td>
-<td valign="top" align="right"></td>
-</tr></table></div>
-<div class="refsynopsisdiv" title="Synopsis">
-<a name="NMExportedConnection.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">                    <a class="link" href="NMExportedConnection.html#NMExportedConnection-struct" title="NMExportedConnection">NMExportedConnection</a>;
-                    <a class="link" href="NMExportedConnection.html#NMExportedConnectionClass" title="NMExportedConnectionClass">NMExportedConnectionClass</a>;
-<a class="link" href="NMExportedConnection.html" title="NMExportedConnection"><span class="returnvalue">NMExportedConnection</span></a> * <a class="link" href="NMExportedConnection.html#nm-exported-connection-new" title="nm_exported_connection_new ()">nm_exported_connection_new</a>       (<em class="parameter"><code><a href="http://projects.gnome.org/NetworkManager/developers/libnm-util/08/NMConnection.html#NMConnectionScope"><span class="type">NMConnectionScope</span></a> scope</code></em>);
-</pre>
-</div>
-<div class="refsect1" title="Object Hierarchy">
-<a name="NMExportedConnection.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="synopsis">
-  <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>
-   +----<a href="http://projects.gnome.org/NetworkManager/developers/libnm-util/08/NMConnection.html">NMConnection</a>
-         +----NMExportedConnection
-</pre>
-</div>
-<div class="refsect1" title="Implemented Interfaces">
-<a name="NMExportedConnection.implemented-interfaces"></a><h2>Implemented Interfaces</h2>
-<p>
-NMExportedConnection implements
- <a class="link" href="libnm-glib-NMSettingsConnection.html#NMSettingsConnectionInterface">NMSettingsConnectionInterface</a>.</p>
-</div>
-<div class="refsect1" title="Description">
-<a name="NMExportedConnection.description"></a><h2>Description</h2>
-<p>
-</p>
-</div>
-<div class="refsect1" title="Details">
-<a name="NMExportedConnection.details"></a><h2>Details</h2>
-<div class="refsect2" title="NMExportedConnection">
-<a name="NMExportedConnection-struct"></a><h3>NMExportedConnection</h3>
-<pre class="programlisting">typedef struct _NMExportedConnection NMExportedConnection;</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="NMExportedConnectionClass">
-<a name="NMExportedConnectionClass"></a><h3>NMExportedConnectionClass</h3>
-<pre class="programlisting">typedef struct {
-	NMConnectionClass parent;
-
-	GHashTable * (*get_settings) (NMExportedConnection *self,
-	                              GError **error);
-
-	void (*update) (NMExportedConnection *self,
-	                GHashTable *new_settings,
-	                DBusGMethodInvocation *context);
-
-	void (*delete) (NMExportedConnection *self,
-	                DBusGMethodInvocation *context);
-
-	void (*get_secrets) (NMExportedConnection *self,
-	                     const gchar *setting_name,
-	                     const gchar **hints,
-	                     gboolean request_new,
-	                     DBusGMethodInvocation *context);
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-	void (*_reserved5) (void);
-	void (*_reserved6) (void);
-} NMExportedConnectionClass;
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="nm_exported_connection_new ()">
-<a name="nm-exported-connection-new"></a><h3>nm_exported_connection_new ()</h3>
-<pre class="programlisting"><a class="link" href="NMExportedConnection.html" title="NMExportedConnection"><span class="returnvalue">NMExportedConnection</span></a> * nm_exported_connection_new       (<em class="parameter"><code><a href="http://projects.gnome.org/NetworkManager/developers/libnm-util/08/NMConnection.html#NMConnectionScope"><span class="type">NMConnectionScope</span></a> scope</code></em>);</pre>
-<p>
-Creates a new object representing the remote connection.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>scope</code></em> :</span></p></td>
-<td>the Connection scope (either user or system)
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the new exported connection object on success, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> on failure
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-</div>
-</div>
-<div class="footer">
-<hr>
-          Generated by GTK-Doc V1.15</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMGsmDevice.html b/docs/libnm-glib/html/NMGsmDevice.html
deleted file mode 100644
index bad58c507..000000000
--- a/docs/libnm-glib/html/NMGsmDevice.html
+++ /dev/null
@@ -1,124 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>NMGsmDevice</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
-<link rel="home" href="index.html" title="libnm-glib Reference Manual">
-<link rel="up" href="ch01.html" title="libnm-glib Objects">
-<link rel="prev" href="NMSerialDevice.html" title="NMSerialDevice">
-<link rel="next" href="NMCdmaDevice.html" title="NMCdmaDevice">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
-<link rel="stylesheet" href="style.css" type="text/css">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
-<tr valign="middle">
-<td><a accesskey="p" href="NMSerialDevice.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="ch01.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">libnm-glib Reference Manual</th>
-<td><a accesskey="n" href="NMCdmaDevice.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
-</tr>
-<tr><td colspan="5" class="shortcuts">
-<a href="#NMGsmDevice.synopsis" class="shortcut">Top</a>
-                   | 
-                  <a href="#NMGsmDevice.description" class="shortcut">Description</a>
-                   | 
-                  <a href="#NMGsmDevice.object-hierarchy" class="shortcut">Object Hierarchy</a>
-</td></tr>
-</table>
-<div class="refentry" title="NMGsmDevice">
-<a name="NMGsmDevice"></a><div class="titlepage"></div>
-<div class="refnamediv"><table width="100%"><tr>
-<td valign="top">
-<h2><span class="refentrytitle"><a name="NMGsmDevice.top_of_page"></a>NMGsmDevice</span></h2>
-<p>NMGsmDevice</p>
-</td>
-<td valign="top" align="right"></td>
-</tr></table></div>
-<div class="refsynopsisdiv" title="Synopsis">
-<a name="NMGsmDevice.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">                    <a class="link" href="NMGsmDevice.html#NMGsmDevice-struct" title="NMGsmDevice">NMGsmDevice</a>;
-                    <a class="link" href="NMGsmDevice.html#NMGsmDeviceClass" title="NMGsmDeviceClass">NMGsmDeviceClass</a>;
-<a class="link" href="NMGsmDevice.html" title="NMGsmDevice"><span class="returnvalue">NMGsmDevice</span></a> *       <a class="link" href="NMGsmDevice.html#nm-gsm-device-new" title="nm_gsm_device_new ()">nm_gsm_device_new</a>                   (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGConnection.html#DBusGConnection"><span class="type">DBusGConnection</span></a> *connection</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> *path</code></em>);
-</pre>
-</div>
-<div class="refsect1" title="Object Hierarchy">
-<a name="NMGsmDevice.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="synopsis">
-  <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>
-   +----<a class="link" href="NMObject.html" title="NMObject">NMObject</a>
-         +----<a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
-               +----<a class="link" href="NMSerialDevice.html" title="NMSerialDevice">NMSerialDevice</a>
-                     +----NMGsmDevice
-</pre>
-</div>
-<div class="refsect1" title="Description">
-<a name="NMGsmDevice.description"></a><h2>Description</h2>
-<p>
-</p>
-</div>
-<div class="refsect1" title="Details">
-<a name="NMGsmDevice.details"></a><h2>Details</h2>
-<div class="refsect2" title="NMGsmDevice">
-<a name="NMGsmDevice-struct"></a><h3>NMGsmDevice</h3>
-<pre class="programlisting">typedef struct _NMGsmDevice NMGsmDevice;</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="NMGsmDeviceClass">
-<a name="NMGsmDeviceClass"></a><h3>NMGsmDeviceClass</h3>
-<pre class="programlisting">typedef struct {
-	NMSerialDeviceClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-	void (*_reserved5) (void);
-	void (*_reserved6) (void);
-} NMGsmDeviceClass;
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="nm_gsm_device_new ()">
-<a name="nm-gsm-device-new"></a><h3>nm_gsm_device_new ()</h3>
-<pre class="programlisting"><a class="link" href="NMGsmDevice.html" title="NMGsmDevice"><span class="returnvalue">NMGsmDevice</span></a> *       nm_gsm_device_new                   (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGConnection.html#DBusGConnection"><span class="type">DBusGConnection</span></a> *connection</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> *path</code></em>);</pre>
-<p>
-Creates a new <a class="link" href="NMGsmDevice.html" title="NMGsmDevice"><span class="type">NMGsmDevice</span></a>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
-<td>the <a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGConnection.html#DBusGConnection"><span class="type">DBusGConnection</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>path</code></em> :</span></p></td>
-<td>the DBus object path of the device
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a new device
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-</div>
-</div>
-<div class="footer">
-<hr>
-          Generated by GTK-Doc V1.15</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMIP4Config.html b/docs/libnm-glib/html/NMIP4Config.html
index 63f441c31..1990b6cb4 100644
--- a/docs/libnm-glib/html/NMIP4Config.html
+++ b/docs/libnm-glib/html/NMIP4Config.html
@@ -3,19 +3,19 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>NMIP4Config</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="libnm-glib Reference Manual">
-<link rel="up" href="ch01.html" title="libnm-glib Objects">
+<link rel="up" href="ch02.html" title="libnm-glib API Reference">
 <link rel="prev" href="NMAccessPoint.html" title="NMAccessPoint">
 <link rel="next" href="NMIP6Config.html" title="NMIP6Config">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
 <tr valign="middle">
 <td><a accesskey="p" href="NMAccessPoint.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="ch01.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
+<td><a accesskey="u" href="ch02.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
 <th width="100%" align="center">libnm-glib Reference Manual</th>
 <td><a accesskey="n" href="NMIP6Config.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
@@ -30,7 +30,7 @@
                   <a href="#NMIP4Config.properties" class="shortcut">Properties</a>
 </td></tr>
 </table>
-<div class="refentry" title="NMIP4Config">
+<div class="refentry">
 <a name="NMIP4Config"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
@@ -39,12 +39,11 @@
 </td>
 <td valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv" title="Synopsis">
+<div class="refsynopsisdiv">
 <a name="NMIP4Config.synopsis"></a><h2>Synopsis</h2>
 <pre class="synopsis">                    <a class="link" href="NMIP4Config.html#NMIP4Config-struct" title="NMIP4Config">NMIP4Config</a>;
                     <a class="link" href="NMIP4Config.html#NMIP4ConfigClass" title="NMIP4ConfigClass">NMIP4ConfigClass</a>;
 #define             <a class="link" href="NMIP4Config.html#NM-IP4-CONFIG-ADDRESSES:CAPS" title="NM_IP4_CONFIG_ADDRESSES">NM_IP4_CONFIG_ADDRESSES</a>
-#define             <a class="link" href="NMIP4Config.html#NM-IP4-CONFIG-HOSTNAME:CAPS" title="NM_IP4_CONFIG_HOSTNAME">NM_IP4_CONFIG_HOSTNAME</a>
 #define             <a class="link" href="NMIP4Config.html#NM-IP4-CONFIG-NAMESERVERS:CAPS" title="NM_IP4_CONFIG_NAMESERVERS">NM_IP4_CONFIG_NAMESERVERS</a>
 #define             <a class="link" href="NMIP4Config.html#NM-IP4-CONFIG-DOMAINS:CAPS" title="NM_IP4_CONFIG_DOMAINS">NM_IP4_CONFIG_DOMAINS</a>
 #define             <a class="link" href="NMIP4Config.html#NM-IP4-CONFIG-ROUTES:CAPS" title="NM_IP4_CONFIG_ROUTES">NM_IP4_CONFIG_ROUTES</a>
@@ -52,14 +51,13 @@
 <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="returnvalue">GObject</span></a> *           <a class="link" href="NMIP4Config.html#nm-ip4-config-new" title="nm_ip4_config_new ()">nm_ip4_config_new</a>                   (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGConnection.html#DBusGConnection"><span class="type">DBusGConnection</span></a> *connection</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *object_path</code></em>);
 const <a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="returnvalue">GSList</span></a> *      <a class="link" href="NMIP4Config.html#nm-ip4-config-get-addresses" title="nm_ip4_config_get_addresses ()">nm_ip4_config_get_addresses</a>         (<em class="parameter"><code><a class="link" href="NMIP4Config.html" title="NMIP4Config"><span class="type">NMIP4Config</span></a> *config</code></em>);
-const <span class="returnvalue">char</span> *        <a class="link" href="NMIP4Config.html#nm-ip4-config-get-hostname" title="nm_ip4_config_get_hostname ()">nm_ip4_config_get_hostname</a>          (<em class="parameter"><code><a class="link" href="NMIP4Config.html" title="NMIP4Config"><span class="type">NMIP4Config</span></a> *config</code></em>);
 const <a href="http://library.gnome.org/devel/glib/unstable/glib-Arrays.html#GArray"><span class="returnvalue">GArray</span></a> *      <a class="link" href="NMIP4Config.html#nm-ip4-config-get-nameservers" title="nm_ip4_config_get_nameservers ()">nm_ip4_config_get_nameservers</a>       (<em class="parameter"><code><a class="link" href="NMIP4Config.html" title="NMIP4Config"><span class="type">NMIP4Config</span></a> *config</code></em>);
 const <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="returnvalue">GPtrArray</span></a> *   <a class="link" href="NMIP4Config.html#nm-ip4-config-get-domains" title="nm_ip4_config_get_domains ()">nm_ip4_config_get_domains</a>           (<em class="parameter"><code><a class="link" href="NMIP4Config.html" title="NMIP4Config"><span class="type">NMIP4Config</span></a> *config</code></em>);
 const <a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="returnvalue">GSList</span></a> *      <a class="link" href="NMIP4Config.html#nm-ip4-config-get-routes" title="nm_ip4_config_get_routes ()">nm_ip4_config_get_routes</a>            (<em class="parameter"><code><a class="link" href="NMIP4Config.html" title="NMIP4Config"><span class="type">NMIP4Config</span></a> *config</code></em>);
 const <a href="http://library.gnome.org/devel/glib/unstable/glib-Arrays.html#GArray"><span class="returnvalue">GArray</span></a> *      <a class="link" href="NMIP4Config.html#nm-ip4-config-get-wins-servers" title="nm_ip4_config_get_wins_servers ()">nm_ip4_config_get_wins_servers</a>      (<em class="parameter"><code><a class="link" href="NMIP4Config.html" title="NMIP4Config"><span class="type">NMIP4Config</span></a> *config</code></em>);
 </pre>
 </div>
-<div class="refsect1" title="Object Hierarchy">
+<div class="refsect1">
 <a name="NMIP4Config.object-hierarchy"></a><h2>Object Hierarchy</h2>
 <pre class="synopsis">
   <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>
@@ -67,32 +65,31 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Arrays.html#GAr
          +----NMIP4Config
 </pre>
 </div>
-<div class="refsect1" title="Properties">
+<div class="refsect1">
 <a name="NMIP4Config.properties"></a><h2>Properties</h2>
 <pre class="synopsis">
   "<a class="link" href="NMIP4Config.html#NMIP4Config--addresses" title='The "addresses" property'>addresses</a>"                <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>              : Read
-  "<a class="link" href="NMIP4Config.html#NMIP4Config--domains" title='The "domains" property'>domains</a>"                  <span class="type">nm-string-array*</span>      : Read
-  "<a class="link" href="NMIP4Config.html#NMIP4Config--hostname" title='The "hostname" property'>hostname</a>"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read
-  "<a class="link" href="NMIP4Config.html#NMIP4Config--nameservers" title='The "nameservers" property'>nameservers</a>"              <span class="type">nm-uint-array*</span>        : Read
+  "<a class="link" href="NMIP4Config.html#NMIP4Config--domains" title='The "domains" property'>domains</a>"                  <span class="type">NMStringArray</span>*        : Read
+  "<a class="link" href="NMIP4Config.html#NMIP4Config--nameservers" title='The "nameservers" property'>nameservers</a>"              <span class="type">NMUintArray</span>*          : Read
   "<a class="link" href="NMIP4Config.html#NMIP4Config--routes" title='The "routes" property'>routes</a>"                   <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>              : Read
-  "<a class="link" href="NMIP4Config.html#NMIP4Config--wins-servers" title='The "wins-servers" property'>wins-servers</a>"             <span class="type">nm-uint-array*</span>        : Read
+  "<a class="link" href="NMIP4Config.html#NMIP4Config--wins-servers" title='The "wins-servers" property'>wins-servers</a>"             <span class="type">NMUintArray</span>*          : Read
 </pre>
 </div>
-<div class="refsect1" title="Description">
+<div class="refsect1">
 <a name="NMIP4Config.description"></a><h2>Description</h2>
 <p>
 </p>
 </div>
-<div class="refsect1" title="Details">
+<div class="refsect1">
 <a name="NMIP4Config.details"></a><h2>Details</h2>
-<div class="refsect2" title="NMIP4Config">
+<div class="refsect2">
 <a name="NMIP4Config-struct"></a><h3>NMIP4Config</h3>
 <pre class="programlisting">typedef struct _NMIP4Config NMIP4Config;</pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMIP4ConfigClass">
+<div class="refsect2">
 <a name="NMIP4ConfigClass"></a><h3>NMIP4ConfigClass</h3>
 <pre class="programlisting">typedef struct {
 	NMObjectClass parent;
@@ -110,7 +107,7 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Arrays.html#GAr
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_IP4_CONFIG_ADDRESSES">
+<div class="refsect2">
 <a name="NM-IP4-CONFIG-ADDRESSES:CAPS"></a><h3>NM_IP4_CONFIG_ADDRESSES</h3>
 <pre class="programlisting">#define NM_IP4_CONFIG_ADDRESSES "addresses"
 </pre>
@@ -118,15 +115,7 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Arrays.html#GAr
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_IP4_CONFIG_HOSTNAME">
-<a name="NM-IP4-CONFIG-HOSTNAME:CAPS"></a><h3>NM_IP4_CONFIG_HOSTNAME</h3>
-<pre class="programlisting">#define NM_IP4_CONFIG_HOSTNAME "hostname" /* DEPRECATED */
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="NM_IP4_CONFIG_NAMESERVERS">
+<div class="refsect2">
 <a name="NM-IP4-CONFIG-NAMESERVERS:CAPS"></a><h3>NM_IP4_CONFIG_NAMESERVERS</h3>
 <pre class="programlisting">#define NM_IP4_CONFIG_NAMESERVERS "nameservers"
 </pre>
@@ -134,7 +123,7 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Arrays.html#GAr
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_IP4_CONFIG_DOMAINS">
+<div class="refsect2">
 <a name="NM-IP4-CONFIG-DOMAINS:CAPS"></a><h3>NM_IP4_CONFIG_DOMAINS</h3>
 <pre class="programlisting">#define NM_IP4_CONFIG_DOMAINS "domains"
 </pre>
@@ -142,7 +131,7 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Arrays.html#GAr
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_IP4_CONFIG_ROUTES">
+<div class="refsect2">
 <a name="NM-IP4-CONFIG-ROUTES:CAPS"></a><h3>NM_IP4_CONFIG_ROUTES</h3>
 <pre class="programlisting">#define NM_IP4_CONFIG_ROUTES "routes"
 </pre>
@@ -150,7 +139,7 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Arrays.html#GAr
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_IP4_CONFIG_WINS_SERVERS">
+<div class="refsect2">
 <a name="NM-IP4-CONFIG-WINS-SERVERS:CAPS"></a><h3>NM_IP4_CONFIG_WINS_SERVERS</h3>
 <pre class="programlisting">#define NM_IP4_CONFIG_WINS_SERVERS "wins-servers"
 </pre>
@@ -158,7 +147,7 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Arrays.html#GAr
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip4_config_new ()">
+<div class="refsect2">
 <a name="nm-ip4-config-new"></a><h3>nm_ip4_config_new ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="returnvalue">GObject</span></a> *           nm_ip4_config_new                   (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGConnection.html#DBusGConnection"><span class="type">DBusGConnection</span></a> *connection</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *object_path</code></em>);</pre>
@@ -175,19 +164,18 @@ Creates a new <a class="link" href="NMIP4Config.html" title="NMIP4Config"><span
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>object_path</code></em> :</span></p></td>
-<td>the DBus object path of the device
-</td>
+<td>the DBus object path of the device</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a new IP4 configuration
+<td>a new IP4 configuration. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip4_config_get_addresses ()">
+<div class="refsect2">
 <a name="nm-ip4-config-get-addresses"></a><h3>nm_ip4_config_get_addresses ()</h3>
 <pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="returnvalue">GSList</span></a> *      nm_ip4_config_get_addresses         (<em class="parameter"><code><a class="link" href="NMIP4Config.html" title="NMIP4Config"><span class="type">NMIP4Config</span></a> *config</code></em>);</pre>
 <p>
@@ -203,38 +191,15 @@ Gets the IP4 addresses (containing the address, prefix, and gateway).
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the <a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> containing <span class="type">NMSettingIP4Address</span>es. This is the internal copy
-used by the configuration and must not be modified.
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_ip4_config_get_hostname ()">
-<a name="nm-ip4-config-get-hostname"></a><h3>nm_ip4_config_get_hostname ()</h3>
-<pre class="programlisting">const <span class="returnvalue">char</span> *        nm_ip4_config_get_hostname          (<em class="parameter"><code><a class="link" href="NMIP4Config.html" title="NMIP4Config"><span class="type">NMIP4Config</span></a> *config</code></em>);</pre>
-<p>
-DEPRECATED.  Don't use.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>config</code></em> :</span></p></td>
-<td>a <a class="link" href="NMIP4Config.html" title="NMIP4Config"><span class="type">NMIP4Config</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> NULL
+<td>the <a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> containing <a href="http://projects.gnome.org/NetworkManager/developers/libnm-util/09/NMSettingIP4Config.html#NMIP4Address"><span class="type">NMIP4Address</span></a>es.
+This is the internal copy used by the configuration and must not be modified. <span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NetworkManager.IP4Address]</span>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip4_config_get_nameservers ()">
+<div class="refsect2">
 <a name="nm-ip4-config-get-nameservers"></a><h3>nm_ip4_config_get_nameservers ()</h3>
 <pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Arrays.html#GArray"><span class="returnvalue">GArray</span></a> *      nm_ip4_config_get_nameservers       (<em class="parameter"><code><a class="link" href="NMIP4Config.html" title="NMIP4Config"><span class="type">NMIP4Config</span></a> *config</code></em>);</pre>
 <p>
@@ -250,15 +215,15 @@ Gets the domain name servers (DNS).
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the <a href="http://library.gnome.org/devel/glib/unstable/glib-Arrays.html#GArray"><span class="type">GArray</span></a> containing <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><code class="literal">guint32</code></a>s. This is the internal copy used by the
-configuration and must not be modified.
+<td>the <a href="http://library.gnome.org/devel/glib/unstable/glib-Arrays.html#GArray"><span class="type">GArray</span></a> containing <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><code class="literal">guint32</code></a>s. This is the internal copy used by the
+configuration and must not be modified. <span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> guint32]</span>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip4_config_get_domains ()">
+<div class="refsect2">
 <a name="nm-ip4-config-get-domains"></a><h3>nm_ip4_config_get_domains ()</h3>
 <pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="returnvalue">GPtrArray</span></a> *   nm_ip4_config_get_domains           (<em class="parameter"><code><a class="link" href="NMIP4Config.html" title="NMIP4Config"><span class="type">NMIP4Config</span></a> *config</code></em>);</pre>
 <p>
@@ -274,15 +239,15 @@ Gets the domain names.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> containing domains as strings. This is the 
-internal copy used by the configuration, and must not be modified.
+<td>the <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> containing domains as strings. This is the
+internal copy used by the configuration, and must not be modified. <span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> utf8]</span>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip4_config_get_routes ()">
+<div class="refsect2">
 <a name="nm-ip4-config-get-routes"></a><h3>nm_ip4_config_get_routes ()</h3>
 <pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="returnvalue">GSList</span></a> *      nm_ip4_config_get_routes            (<em class="parameter"><code><a class="link" href="NMIP4Config.html" title="NMIP4Config"><span class="type">NMIP4Config</span></a> *config</code></em>);</pre>
 <p>
@@ -298,15 +263,16 @@ Gets the routes.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the <a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> containing <span class="type">NMSettingIP4Route</span>s. This is the 
-internal copy used by the configuration, and must not be modified.
+<td>the <a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> containing
+<a href="http://projects.gnome.org/NetworkManager/developers/libnm-util/09/NMSettingIP4Config.html#NMIP4Route"><span class="type">NMIP4Route</span></a>s. This is the internal copy used by the configuration,
+and must not be modified. <span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NetworkManager.IP4Route]</span>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip4_config_get_wins_servers ()">
+<div class="refsect2">
 <a name="nm-ip4-config-get-wins-servers"></a><h3>nm_ip4_config_get_wins_servers ()</h3>
 <pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Arrays.html#GArray"><span class="returnvalue">GArray</span></a> *      nm_ip4_config_get_wins_servers      (<em class="parameter"><code><a class="link" href="NMIP4Config.html" title="NMIP4Config"><span class="type">NMIP4Config</span></a> *config</code></em>);</pre>
 <p>
@@ -322,17 +288,17 @@ Gets the Windows Internet Name Service servers (WINS).
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the <a href="http://library.gnome.org/devel/glib/unstable/glib-Arrays.html#GArray"><span class="type">GArray</span></a> containing <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><code class="literal">guint32</code></a>s. This is the internal copy used by the
-configuration and must not be modified.
+<td>the <a href="http://library.gnome.org/devel/glib/unstable/glib-Arrays.html#GArray"><span class="type">GArray</span></a> containing <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><code class="literal">guint32</code></a>s.
+This is the internal copy used by the configuration and must not be modified. <span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> guint32]</span>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 </div>
-<div class="refsect1" title="Property Details">
+<div class="refsect1">
 <a name="NMIP4Config.property-details"></a><h2>Property Details</h2>
-<div class="refsect2" title='The "addresses" property'>
+<div class="refsect2">
 <a name="NMIP4Config--addresses"></a><h3>The <code class="literal">"addresses"</code> property</h3>
 <pre class="programlisting">  "addresses"                <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>              : Read</pre>
 <p>
@@ -340,32 +306,23 @@ The <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.ht
 </p>
 </div>
 <hr>
-<div class="refsect2" title='The "domains" property'>
+<div class="refsect2">
 <a name="NMIP4Config--domains"></a><h3>The <code class="literal">"domains"</code> property</h3>
-<pre class="programlisting">  "domains"                  <span class="type">nm-string-array*</span>      : Read</pre>
+<pre class="programlisting">  "domains"                  <span class="type">NMStringArray</span>*        : Read</pre>
 <p>
 The <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> containing domain strings of the configuration.
 </p>
 </div>
 <hr>
-<div class="refsect2" title='The "hostname" property'>
-<a name="NMIP4Config--hostname"></a><h3>The <code class="literal">"hostname"</code> property</h3>
-<pre class="programlisting">  "hostname"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read</pre>
-<p>
-DEPRECATED.  Don't use.
-</p>
-<p>Default value: NULL</p>
-</div>
-<hr>
-<div class="refsect2" title='The "nameservers" property'>
+<div class="refsect2">
 <a name="NMIP4Config--nameservers"></a><h3>The <code class="literal">"nameservers"</code> property</h3>
-<pre class="programlisting">  "nameservers"              <span class="type">nm-uint-array*</span>        : Read</pre>
+<pre class="programlisting">  "nameservers"              <span class="type">NMUintArray</span>*          : Read</pre>
 <p>
 The <a href="http://library.gnome.org/devel/glib/unstable/glib-Arrays.html#GArray"><span class="type">GArray</span></a> containing name servers (<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><code class="literal">guint32</code></a>es) of the configuration.
 </p>
 </div>
 <hr>
-<div class="refsect2" title='The "routes" property'>
+<div class="refsect2">
 <a name="NMIP4Config--routes"></a><h3>The <code class="literal">"routes"</code> property</h3>
 <pre class="programlisting">  "routes"                   <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>              : Read</pre>
 <p>
@@ -373,9 +330,9 @@ The <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.ht
 </p>
 </div>
 <hr>
-<div class="refsect2" title='The "wins-servers" property'>
+<div class="refsect2">
 <a name="NMIP4Config--wins-servers"></a><h3>The <code class="literal">"wins-servers"</code> property</h3>
-<pre class="programlisting">  "wins-servers"             <span class="type">nm-uint-array*</span>        : Read</pre>
+<pre class="programlisting">  "wins-servers"             <span class="type">NMUintArray</span>*          : Read</pre>
 <p>
 The <a href="http://library.gnome.org/devel/glib/unstable/glib-Arrays.html#GArray"><span class="type">GArray</span></a> containing WINS servers (<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><code class="literal">guint32</code></a>es) of the configuration.
 </p>
@@ -384,6 +341,6 @@ The <a href="http://library.gnome.org/devel/glib/unstable/glib-Arrays.html#GArra
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.15</div>
+          Generated by GTK-Doc V1.17</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMIP6Config.html b/docs/libnm-glib/html/NMIP6Config.html
index b8de4edfb..1d2b58e11 100644
--- a/docs/libnm-glib/html/NMIP6Config.html
+++ b/docs/libnm-glib/html/NMIP6Config.html
@@ -3,19 +3,19 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>NMIP6Config</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="libnm-glib Reference Manual">
-<link rel="up" href="ch01.html" title="libnm-glib Objects">
+<link rel="up" href="ch02.html" title="libnm-glib API Reference">
 <link rel="prev" href="NMIP4Config.html" title="NMIP4Config">
 <link rel="next" href="NMDHCP4Config.html" title="NMDHCP4Config">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
 <tr valign="middle">
 <td><a accesskey="p" href="NMIP4Config.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="ch01.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
+<td><a accesskey="u" href="ch02.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
 <th width="100%" align="center">libnm-glib Reference Manual</th>
 <td><a accesskey="n" href="NMDHCP4Config.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
@@ -30,7 +30,7 @@
                   <a href="#NMIP6Config.properties" class="shortcut">Properties</a>
 </td></tr>
 </table>
-<div class="refentry" title="NMIP6Config">
+<div class="refentry">
 <a name="NMIP6Config"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
@@ -39,7 +39,7 @@
 </td>
 <td valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv" title="Synopsis">
+<div class="refsynopsisdiv">
 <a name="NMIP6Config.synopsis"></a><h2>Synopsis</h2>
 <pre class="synopsis">                    <a class="link" href="NMIP6Config.html#NMIP6Config-struct" title="NMIP6Config">NMIP6Config</a>;
                     <a class="link" href="NMIP6Config.html#NMIP6ConfigClass" title="NMIP6ConfigClass">NMIP6ConfigClass</a>;
@@ -55,7 +55,7 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.
 const <a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="returnvalue">GSList</span></a> *      <a class="link" href="NMIP6Config.html#nm-ip6-config-get-routes" title="nm_ip6_config_get_routes ()">nm_ip6_config_get_routes</a>            (<em class="parameter"><code><a class="link" href="NMIP6Config.html" title="NMIP6Config"><span class="type">NMIP6Config</span></a> *config</code></em>);
 </pre>
 </div>
-<div class="refsect1" title="Object Hierarchy">
+<div class="refsect1">
 <a name="NMIP6Config.object-hierarchy"></a><h2>Object Hierarchy</h2>
 <pre class="synopsis">
   <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>
@@ -63,30 +63,30 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-L
          +----NMIP6Config
 </pre>
 </div>
-<div class="refsect1" title="Properties">
+<div class="refsect1">
 <a name="NMIP6Config.properties"></a><h2>Properties</h2>
 <pre class="synopsis">
-  "<a class="link" href="NMIP6Config.html#NMIP6Config--addresses" title='The "addresses" property'>addresses</a>"                <span class="type">nm-ip6-address-object-array*</span>  : Read
-  "<a class="link" href="NMIP6Config.html#NMIP6Config--domains" title='The "domains" property'>domains</a>"                  <span class="type">nm-string-array*</span>      : Read
-  "<a class="link" href="NMIP6Config.html#NMIP6Config--nameservers" title='The "nameservers" property'>nameservers</a>"              <span class="type">nm-ip6-address-array*</span>  : Read
-  "<a class="link" href="NMIP6Config.html#NMIP6Config--routes" title='The "routes" property'>routes</a>"                   <span class="type">nm-ip6-route-object-array*</span>  : Read
+  "<a class="link" href="NMIP6Config.html#NMIP6Config--addresses" title='The "addresses" property'>addresses</a>"                <span class="type">NMIP6AddressObjectArray</span>*  : Read
+  "<a class="link" href="NMIP6Config.html#NMIP6Config--domains" title='The "domains" property'>domains</a>"                  <span class="type">NMStringArray</span>*        : Read
+  "<a class="link" href="NMIP6Config.html#NMIP6Config--nameservers" title='The "nameservers" property'>nameservers</a>"              <span class="type">NMIP6AddressArray</span>*    : Read
+  "<a class="link" href="NMIP6Config.html#NMIP6Config--routes" title='The "routes" property'>routes</a>"                   <span class="type">NMIP6RouteObjectArray</span>*  : Read
 </pre>
 </div>
-<div class="refsect1" title="Description">
+<div class="refsect1">
 <a name="NMIP6Config.description"></a><h2>Description</h2>
 <p>
 </p>
 </div>
-<div class="refsect1" title="Details">
+<div class="refsect1">
 <a name="NMIP6Config.details"></a><h2>Details</h2>
-<div class="refsect2" title="NMIP6Config">
+<div class="refsect2">
 <a name="NMIP6Config-struct"></a><h3>NMIP6Config</h3>
 <pre class="programlisting">typedef struct _NMIP6Config NMIP6Config;</pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMIP6ConfigClass">
+<div class="refsect2">
 <a name="NMIP6ConfigClass"></a><h3>NMIP6ConfigClass</h3>
 <pre class="programlisting">typedef struct {
 	NMObjectClass parent;
@@ -104,7 +104,7 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-L
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_IP6_CONFIG_ADDRESSES">
+<div class="refsect2">
 <a name="NM-IP6-CONFIG-ADDRESSES:CAPS"></a><h3>NM_IP6_CONFIG_ADDRESSES</h3>
 <pre class="programlisting">#define NM_IP6_CONFIG_ADDRESSES "addresses"
 </pre>
@@ -112,7 +112,7 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-L
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_IP6_CONFIG_NAMESERVERS">
+<div class="refsect2">
 <a name="NM-IP6-CONFIG-NAMESERVERS:CAPS"></a><h3>NM_IP6_CONFIG_NAMESERVERS</h3>
 <pre class="programlisting">#define NM_IP6_CONFIG_NAMESERVERS "nameservers"
 </pre>
@@ -120,7 +120,7 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-L
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_IP6_CONFIG_DOMAINS">
+<div class="refsect2">
 <a name="NM-IP6-CONFIG-DOMAINS:CAPS"></a><h3>NM_IP6_CONFIG_DOMAINS</h3>
 <pre class="programlisting">#define NM_IP6_CONFIG_DOMAINS "domains"
 </pre>
@@ -128,7 +128,7 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-L
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_IP6_CONFIG_ROUTES">
+<div class="refsect2">
 <a name="NM-IP6-CONFIG-ROUTES:CAPS"></a><h3>NM_IP6_CONFIG_ROUTES</h3>
 <pre class="programlisting">#define NM_IP6_CONFIG_ROUTES "routes"
 </pre>
@@ -136,7 +136,7 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-L
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip6_config_new ()">
+<div class="refsect2">
 <a name="nm-ip6-config-new"></a><h3>nm_ip6_config_new ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="returnvalue">GObject</span></a> *           nm_ip6_config_new                   (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGConnection.html#DBusGConnection"><span class="type">DBusGConnection</span></a> *connection</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *object_path</code></em>);</pre>
@@ -153,19 +153,18 @@ Creates a new <a class="link" href="NMIP6Config.html" title="NMIP6Config"><span
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>object_path</code></em> :</span></p></td>
-<td>the DBus object path of the device
-</td>
+<td>the DBus object path of the device</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a new IP6 configuration
+<td>a new IP6 configuration. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip6_config_get_addresses ()">
+<div class="refsect2">
 <a name="nm-ip6-config-get-addresses"></a><h3>nm_ip6_config_get_addresses ()</h3>
 <pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="returnvalue">GSList</span></a> *      nm_ip6_config_get_addresses         (<em class="parameter"><code><a class="link" href="NMIP6Config.html" title="NMIP6Config"><span class="type">NMIP6Config</span></a> *config</code></em>);</pre>
 <p>
@@ -181,15 +180,16 @@ Gets the IP6 addresses (containing the address, prefix, and gateway).
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the <a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> containing <span class="type">NMSettingIP6Address</span>es. This is the internal copy
-used by the configuration and must not be modified.
+<td>the <a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> containing
+<a href="http://projects.gnome.org/NetworkManager/developers/libnm-util/09/NMSettingIP6Config.html#NMIP6Address"><span class="type">NMIP6Address</span></a>es. This is the internal copy used by the configuration
+and must not be modified. <span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NetworkManager.IP6Address]</span>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip6_config_get_nameservers ()">
+<div class="refsect2">
 <a name="nm-ip6-config-get-nameservers"></a><h3>nm_ip6_config_get_nameservers ()</h3>
 <pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="returnvalue">GSList</span></a> *      nm_ip6_config_get_nameservers       (<em class="parameter"><code><a class="link" href="NMIP6Config.html" title="NMIP6Config"><span class="type">NMIP6Config</span></a> *config</code></em>);</pre>
 <p>
@@ -205,16 +205,16 @@ Gets the domain name servers (DNS).
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a <a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> containing elements of type 'struct in6_addr' which contain
-the addresses of nameservers of the configuration.  This is the internal copy
-used by the configuration and must not be modified.
+<td>a <a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> containing elements of type
+'struct in6_addr' which contain the addresses of nameservers of the configuration.
+This is the internal copy used by the configuration and must not be modified. <span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> Posix.in6_addr]</span>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip6_config_get_domains ()">
+<div class="refsect2">
 <a name="nm-ip6-config-get-domains"></a><h3>nm_ip6_config_get_domains ()</h3>
 <pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="returnvalue">GPtrArray</span></a> *   nm_ip6_config_get_domains           (<em class="parameter"><code><a class="link" href="NMIP6Config.html" title="NMIP6Config"><span class="type">NMIP6Config</span></a> *config</code></em>);</pre>
 <p>
@@ -230,15 +230,15 @@ Gets the domain names.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> containing domains as strings. This is the 
-internal copy used by the configuration, and must not be modified.
+<td>the <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> containing domains as strings.
+This is the internal copy used by the configuration, and must not be modified. <span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> utf8]</span>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip6_config_get_routes ()">
+<div class="refsect2">
 <a name="nm-ip6-config-get-routes"></a><h3>nm_ip6_config_get_routes ()</h3>
 <pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="returnvalue">GSList</span></a> *      nm_ip6_config_get_routes            (<em class="parameter"><code><a class="link" href="NMIP6Config.html" title="NMIP6Config"><span class="type">NMIP6Config</span></a> *config</code></em>);</pre>
 <p>
@@ -254,49 +254,50 @@ Gets the routes.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the <a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> containing <span class="type">NMSettingIP6Route</span>s. This is the 
-internal copy used by the configuration, and must not be modified.
+<td>the <a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> containing
+<a href="http://projects.gnome.org/NetworkManager/developers/libnm-util/09/NMSettingIP6Config.html#NMIP6Route"><span class="type">NMIP6Route</span></a>s. This is the internal copy used by the configuration,
+and must not be modified. <span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NetworkManager.IP6Route]</span>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 </div>
-<div class="refsect1" title="Property Details">
+<div class="refsect1">
 <a name="NMIP6Config.property-details"></a><h2>Property Details</h2>
-<div class="refsect2" title='The "addresses" property'>
+<div class="refsect2">
 <a name="NMIP6Config--addresses"></a><h3>The <code class="literal">"addresses"</code> property</h3>
-<pre class="programlisting">  "addresses"                <span class="type">nm-ip6-address-object-array*</span>  : Read</pre>
+<pre class="programlisting">  "addresses"                <span class="type">NMIP6AddressObjectArray</span>*  : Read</pre>
 <p>
 The <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> containing the IPv6 addresses;  use
-<a href="http://projects.gnome.org/NetworkManager/developers/libnm-util/08/libnm-util-nm-utils.html#nm-utils-ip6-addresses-from-gvalue"><code class="function">nm_utils_ip6_addresses_from_gvalue()</code></a> to return a <a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> of
+<a href="http://projects.gnome.org/NetworkManager/developers/libnm-util/09/libnm-util-nm-utils.html#nm-utils-ip6-addresses-from-gvalue"><code class="function">nm_utils_ip6_addresses_from_gvalue()</code></a> to return a <a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> of
 <span class="type">NMSettingIP6Address</span> objects that is more usable than the raw data.
 </p>
 </div>
 <hr>
-<div class="refsect2" title='The "domains" property'>
+<div class="refsect2">
 <a name="NMIP6Config--domains"></a><h3>The <code class="literal">"domains"</code> property</h3>
-<pre class="programlisting">  "domains"                  <span class="type">nm-string-array*</span>      : Read</pre>
+<pre class="programlisting">  "domains"                  <span class="type">NMStringArray</span>*        : Read</pre>
 <p>
 The <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> containing domain strings of the configuration.
 </p>
 </div>
 <hr>
-<div class="refsect2" title='The "nameservers" property'>
+<div class="refsect2">
 <a name="NMIP6Config--nameservers"></a><h3>The <code class="literal">"nameservers"</code> property</h3>
-<pre class="programlisting">  "nameservers"              <span class="type">nm-ip6-address-array*</span>  : Read</pre>
+<pre class="programlisting">  "nameservers"              <span class="type">NMIP6AddressArray</span>*    : Read</pre>
 <p>
 The <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> containing elements of type 'struct ip6_addr' which
 contain the addresses of nameservers of the configuration.
 </p>
 </div>
 <hr>
-<div class="refsect2" title='The "routes" property'>
+<div class="refsect2">
 <a name="NMIP6Config--routes"></a><h3>The <code class="literal">"routes"</code> property</h3>
-<pre class="programlisting">  "routes"                   <span class="type">nm-ip6-route-object-array*</span>  : Read</pre>
+<pre class="programlisting">  "routes"                   <span class="type">NMIP6RouteObjectArray</span>*  : Read</pre>
 <p>
 The <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> containing the IPv6 routes;  use
-<a href="http://projects.gnome.org/NetworkManager/developers/libnm-util/08/libnm-util-nm-utils.html#nm-utils-ip6-routes-from-gvalue"><code class="function">nm_utils_ip6_routes_from_gvalue()</code></a> to return a <a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> of
+<a href="http://projects.gnome.org/NetworkManager/developers/libnm-util/09/libnm-util-nm-utils.html#nm-utils-ip6-routes-from-gvalue"><code class="function">nm_utils_ip6_routes_from_gvalue()</code></a> to return a <a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> of
 <span class="type">NMSettingIP6Address</span> objects that is more usable than the raw data.
 </p>
 </div>
@@ -304,6 +305,6 @@ The <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.ht
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.15</div>
+          Generated by GTK-Doc V1.17</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMObject.html b/docs/libnm-glib/html/NMObject.html
index b21facc55..b09102353 100644
--- a/docs/libnm-glib/html/NMObject.html
+++ b/docs/libnm-glib/html/NMObject.html
@@ -3,19 +3,19 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>NMObject</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="libnm-glib Reference Manual">
-<link rel="up" href="ch01.html" title="libnm-glib Objects">
-<link rel="prev" href="NMExportedConnection.html" title="NMExportedConnection">
+<link rel="up" href="ch02.html" title="libnm-glib API Reference">
+<link rel="prev" href="NMDHCP6Config.html" title="NMDHCP6Config">
 <link rel="next" href="NMRemoteConnection.html" title="NMRemoteConnection">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
 <tr valign="middle">
-<td><a accesskey="p" href="NMExportedConnection.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="ch01.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="NMDHCP6Config.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
+<td><a accesskey="u" href="ch02.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
 <th width="100%" align="center">libnm-glib Reference Manual</th>
 <td><a accesskey="n" href="NMRemoteConnection.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
@@ -30,7 +30,7 @@
                   <a href="#NMObject.properties" class="shortcut">Properties</a>
 </td></tr>
 </table>
-<div class="refentry" title="NMObject">
+<div class="refentry">
 <a name="NMObject"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
@@ -39,7 +39,7 @@
 </td>
 <td valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv" title="Synopsis">
+<div class="refsynopsisdiv">
 <a name="NMObject.synopsis"></a><h2>Synopsis</h2>
 <pre class="synopsis">#define             <a class="link" href="NMObject.html#NM-OBJECT-DBUS-CONNECTION:CAPS" title="NM_OBJECT_DBUS_CONNECTION">NM_OBJECT_DBUS_CONNECTION</a>
 #define             <a class="link" href="NMObject.html#NM-OBJECT-DBUS-PATH:CAPS" title="NM_OBJECT_DBUS_PATH">NM_OBJECT_DBUS_PATH</a>
@@ -49,13 +49,14 @@
 const <span class="returnvalue">char</span> *        <a class="link" href="NMObject.html#nm-object-get-path" title="nm_object_get_path ()">nm_object_get_path</a>                  (<em class="parameter"><code><a class="link" href="NMObject.html" title="NMObject"><span class="type">NMObject</span></a> *object</code></em>);
 </pre>
 </div>
-<div class="refsect1" title="Object Hierarchy">
+<div class="refsect1">
 <a name="NMObject.object-hierarchy"></a><h2>Object Hierarchy</h2>
 <pre class="synopsis">
   <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>
    +----NMObject
          +----<a class="link" href="NMClient.html" title="NMClient">NMClient</a>
          +----<a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+         +----<a class="link" href="NMWimaxNsp.html" title="NMWimaxNsp">NMWimaxNsp</a>
          +----<a class="link" href="NMAccessPoint.html" title="NMAccessPoint">NMAccessPoint</a>
          +----<a class="link" href="NMIP4Config.html" title="NMIP4Config">NMIP4Config</a>
          +----<a class="link" href="NMIP6Config.html" title="NMIP6Config">NMIP6Config</a>
@@ -64,21 +65,21 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMObj
          +----<a class="link" href="NMDHCP6Config.html" title="NMDHCP6Config">NMDHCP6Config</a>
 </pre>
 </div>
-<div class="refsect1" title="Properties">
+<div class="refsect1">
 <a name="NMObject.properties"></a><h2>Properties</h2>
 <pre class="synopsis">
   "<a class="link" href="NMObject.html#NMObject--dbus-connection" title='The "dbus-connection" property'>dbus-connection</a>"          <a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGConnection.html#DBusGConnection"><span class="type">DBusGConnection</span></a>*      : Read / Write / Construct Only
   "<a class="link" href="NMObject.html#NMObject--dbus-path" title='The "dbus-path" property'>dbus-path</a>"                <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write / Construct Only
 </pre>
 </div>
-<div class="refsect1" title="Description">
+<div class="refsect1">
 <a name="NMObject.description"></a><h2>Description</h2>
 <p>
 </p>
 </div>
-<div class="refsect1" title="Details">
+<div class="refsect1">
 <a name="NMObject.details"></a><h2>Details</h2>
-<div class="refsect2" title="NM_OBJECT_DBUS_CONNECTION">
+<div class="refsect2">
 <a name="NM-OBJECT-DBUS-CONNECTION:CAPS"></a><h3>NM_OBJECT_DBUS_CONNECTION</h3>
 <pre class="programlisting">#define NM_OBJECT_DBUS_CONNECTION "dbus-connection"
 </pre>
@@ -86,7 +87,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMObj
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_OBJECT_DBUS_PATH">
+<div class="refsect2">
 <a name="NM-OBJECT-DBUS-PATH:CAPS"></a><h3>NM_OBJECT_DBUS_PATH</h3>
 <pre class="programlisting">#define NM_OBJECT_DBUS_PATH "dbus-path"
 </pre>
@@ -94,14 +95,14 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMObj
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMObject">
+<div class="refsect2">
 <a name="NMObject-struct"></a><h3>NMObject</h3>
 <pre class="programlisting">typedef struct _NMObject NMObject;</pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMObjectClass">
+<div class="refsect2">
 <a name="NMObjectClass"></a><h3>NMObjectClass</h3>
 <pre class="programlisting">typedef struct {
 	GObjectClass parent;
@@ -119,7 +120,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMObj
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_object_get_connection ()">
+<div class="refsect2">
 <a name="nm-object-get-connection"></a><h3>nm_object_get_connection ()</h3>
 <pre class="programlisting"><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGConnection.html#DBusGConnection"><span class="returnvalue">DBusGConnection</span></a> *   nm_object_get_connection            (<em class="parameter"><code><a class="link" href="NMObject.html" title="NMObject"><span class="type">NMObject</span></a> *object</code></em>);</pre>
 <p>
@@ -135,14 +136,14 @@ Gets the <a class="link" href="NMObject.html" title="NMObject"><span class="type
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the connection
+<td>the connection. <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_object_get_path ()">
+<div class="refsect2">
 <a name="nm-object-get-path"></a><h3>nm_object_get_path ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_object_get_path                  (<em class="parameter"><code><a class="link" href="NMObject.html" title="NMObject"><span class="type">NMObject</span></a> *object</code></em>);</pre>
 <p>
@@ -158,23 +159,22 @@ Gets the DBus path of the <a class="link" href="NMObject.html" title="NMObject">
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the object's path. This is the internal string used by the
-device, and must not be modified.
-</td>
+<td>the object's path. This is the internal string used by the
+device, and must not be modified.</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 </div>
-<div class="refsect1" title="Property Details">
+<div class="refsect1">
 <a name="NMObject.property-details"></a><h2>Property Details</h2>
-<div class="refsect2" title='The "dbus-connection" property'>
+<div class="refsect2">
 <a name="NMObject--dbus-connection"></a><h3>The <code class="literal">"dbus-connection"</code> property</h3>
 <pre class="programlisting">  "dbus-connection"          <a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGConnection.html#DBusGConnection"><span class="type">DBusGConnection</span></a>*      : Read / Write / Construct Only</pre>
 <p>Connection.</p>
 </div>
 <hr>
-<div class="refsect2" title='The "dbus-path" property'>
+<div class="refsect2">
 <a name="NMObject--dbus-path"></a><h3>The <code class="literal">"dbus-path"</code> property</h3>
 <pre class="programlisting">  "dbus-path"                <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write / Construct Only</pre>
 <p>DBus Object Path.</p>
@@ -184,6 +184,6 @@ device, and must not be modified.
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.15</div>
+          Generated by GTK-Doc V1.17</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMRemoteConnection.html b/docs/libnm-glib/html/NMRemoteConnection.html
index be3b10b07..07e3564bf 100644
--- a/docs/libnm-glib/html/NMRemoteConnection.html
+++ b/docs/libnm-glib/html/NMRemoteConnection.html
@@ -3,19 +3,19 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>NMRemoteConnection</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="libnm-glib Reference Manual">
-<link rel="up" href="ch01.html" title="libnm-glib Objects">
+<link rel="up" href="ch02.html" title="libnm-glib API Reference">
 <link rel="prev" href="NMObject.html" title="NMObject">
 <link rel="next" href="NMRemoteSettings.html" title="NMRemoteSettings">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
 <tr valign="middle">
 <td><a accesskey="p" href="NMObject.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="ch01.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
+<td><a accesskey="u" href="ch02.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
 <th width="100%" align="center">libnm-glib Reference Manual</th>
 <td><a accesskey="n" href="NMRemoteSettings.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
@@ -27,12 +27,12 @@
                    | 
                   <a href="#NMRemoteConnection.object-hierarchy" class="shortcut">Object Hierarchy</a>
                    | 
-                  <a href="#NMRemoteConnection.implemented-interfaces" class="shortcut">Implemented Interfaces</a>
-                   | 
                   <a href="#NMRemoteConnection.properties" class="shortcut">Properties</a>
+                   | 
+                  <a href="#NMRemoteConnection.signals" class="shortcut">Signals</a>
 </td></tr>
 </table>
-<div class="refentry" title="NMRemoteConnection">
+<div class="refentry">
 <a name="NMRemoteConnection"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
@@ -41,55 +41,100 @@
 </td>
 <td valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv" title="Synopsis">
+<div class="refsynopsisdiv">
 <a name="NMRemoteConnection.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">                    <a class="link" href="NMRemoteConnection.html#NMRemoteConnection-struct" title="NMRemoteConnection">NMRemoteConnection</a>;
+<pre class="synopsis">#define             <a class="link" href="NMRemoteConnection.html#NM-REMOTE-CONNECTION-UPDATED:CAPS" title="NM_REMOTE_CONNECTION_UPDATED">NM_REMOTE_CONNECTION_UPDATED</a>
+#define             <a class="link" href="NMRemoteConnection.html#NM-REMOTE-CONNECTION-REMOVED:CAPS" title="NM_REMOTE_CONNECTION_REMOVED">NM_REMOTE_CONNECTION_REMOVED</a>
+                    <a class="link" href="NMRemoteConnection.html#NMRemoteConnection-struct" title="NMRemoteConnection">NMRemoteConnection</a>;
                     <a class="link" href="NMRemoteConnection.html#NMRemoteConnectionClass" title="NMRemoteConnectionClass">NMRemoteConnectionClass</a>;
+<span class="returnvalue">void</span>                (<a class="link" href="NMRemoteConnection.html#NMRemoteConnectionCommitFunc" title="NMRemoteConnectionCommitFunc ()">*NMRemoteConnectionCommitFunc</a>)     (<em class="parameter"><code><a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection"><span class="type">NMRemoteConnection</span></a> *connection</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
+<span class="returnvalue">void</span>                (<a class="link" href="NMRemoteConnection.html#NMRemoteConnectionDeleteFunc" title="NMRemoteConnectionDeleteFunc ()">*NMRemoteConnectionDeleteFunc</a>)     (<em class="parameter"><code><a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection"><span class="type">NMRemoteConnection</span></a> *connection</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
+<span class="returnvalue">void</span>                (<a class="link" href="NMRemoteConnection.html#NMRemoteConnectionGetSecretsFunc" title="NMRemoteConnectionGetSecretsFunc ()">*NMRemoteConnectionGetSecretsFunc</a>) (<em class="parameter"><code><a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection"><span class="type">NMRemoteConnection</span></a> *connection</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *secrets</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
 <a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection"><span class="returnvalue">NMRemoteConnection</span></a> * <a class="link" href="NMRemoteConnection.html#nm-remote-connection-new" title="nm_remote_connection_new ()">nm_remote_connection_new</a>           (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGConnection.html#DBusGConnection"><span class="type">DBusGConnection</span></a> *bus</code></em>,
-                                                         <em class="parameter"><code><a href="http://projects.gnome.org/NetworkManager/developers/libnm-util/08/NMConnection.html#NMConnectionScope"><span class="type">NMConnectionScope</span></a> scope</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *path</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="NMRemoteConnection.html#nm-remote-connection-commit-changes" title="nm_remote_connection_commit_changes ()">nm_remote_connection_commit_changes</a> (<em class="parameter"><code><a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection"><span class="type">NMRemoteConnection</span></a> *connection</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="NMRemoteConnection.html#NMRemoteConnectionCommitFunc" title="NMRemoteConnectionCommitFunc ()"><span class="type">NMRemoteConnectionCommitFunc</span></a> callback</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="NMRemoteConnection.html#nm-remote-connection-delete" title="nm_remote_connection_delete ()">nm_remote_connection_delete</a>         (<em class="parameter"><code><a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection"><span class="type">NMRemoteConnection</span></a> *connection</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="NMRemoteConnection.html#NMRemoteConnectionDeleteFunc" title="NMRemoteConnectionDeleteFunc ()"><span class="type">NMRemoteConnectionDeleteFunc</span></a> callback</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="NMRemoteConnection.html#nm-remote-connection-get-secrets" title="nm_remote_connection_get_secrets ()">nm_remote_connection_get_secrets</a>    (<em class="parameter"><code><a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection"><span class="type">NMRemoteConnection</span></a> *connection</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *setting_name</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="NMRemoteConnection.html#NMRemoteConnectionGetSecretsFunc" title="NMRemoteConnectionGetSecretsFunc ()"><span class="type">NMRemoteConnectionGetSecretsFunc</span></a> callback</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
 </pre>
 </div>
-<div class="refsect1" title="Object Hierarchy">
+<div class="refsect1">
 <a name="NMRemoteConnection.object-hierarchy"></a><h2>Object Hierarchy</h2>
 <pre class="synopsis">
   <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>
-   +----<a href="http://projects.gnome.org/NetworkManager/developers/libnm-util/08/NMConnection.html">NMConnection</a>
+   +----NMConnection
          +----NMRemoteConnection
 </pre>
 </div>
-<div class="refsect1" title="Implemented Interfaces">
-<a name="NMRemoteConnection.implemented-interfaces"></a><h2>Implemented Interfaces</h2>
-<p>
-NMRemoteConnection implements
- <a class="link" href="libnm-glib-NMSettingsConnection.html#NMSettingsConnectionInterface">NMSettingsConnectionInterface</a>.</p>
-</div>
-<div class="refsect1" title="Properties">
+<div class="refsect1">
 <a name="NMRemoteConnection.properties"></a><h2>Properties</h2>
 <pre class="synopsis">
   "<a class="link" href="NMRemoteConnection.html#NMRemoteConnection--bus" title='The "bus" property'>bus</a>"                      <a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGConnection.html#DBusGConnection"><span class="type">DBusGConnection</span></a>*      : Write / Construct Only
   "<a class="link" href="NMRemoteConnection.html#NMRemoteConnection--init-result" title='The "init-result" property'>init-result</a>"              <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read
 </pre>
 </div>
-<div class="refsect1" title="Description">
+<div class="refsect1">
+<a name="NMRemoteConnection.signals"></a><h2>Signals</h2>
+<pre class="synopsis">
+  "<a class="link" href="NMRemoteConnection.html#NMRemoteConnection-removed" title='The "removed" signal'>removed</a>"                                        : <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-FIRST:CAPS"><code class="literal">Run First</code></a>
+  "<a class="link" href="NMRemoteConnection.html#NMRemoteConnection-updated" title='The "updated" signal'>updated</a>"                                        : <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-FIRST:CAPS"><code class="literal">Run First</code></a>
+  "<a class="link" href="NMRemoteConnection.html#NMRemoteConnection-visible" title='The "visible" signal'>visible</a>"                                        : <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-FIRST:CAPS"><code class="literal">Run First</code></a>
+</pre>
+</div>
+<div class="refsect1">
 <a name="NMRemoteConnection.description"></a><h2>Description</h2>
 <p>
 </p>
 </div>
-<div class="refsect1" title="Details">
+<div class="refsect1">
 <a name="NMRemoteConnection.details"></a><h2>Details</h2>
-<div class="refsect2" title="NMRemoteConnection">
+<div class="refsect2">
+<a name="NM-REMOTE-CONNECTION-UPDATED:CAPS"></a><h3>NM_REMOTE_CONNECTION_UPDATED</h3>
+<pre class="programlisting">#define NM_REMOTE_CONNECTION_UPDATED         "updated"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-REMOTE-CONNECTION-REMOVED:CAPS"></a><h3>NM_REMOTE_CONNECTION_REMOVED</h3>
+<pre class="programlisting">#define NM_REMOTE_CONNECTION_REMOVED         "removed"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="NMRemoteConnection-struct"></a><h3>NMRemoteConnection</h3>
 <pre class="programlisting">typedef struct _NMRemoteConnection NMRemoteConnection;</pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMRemoteConnectionClass">
+<div class="refsect2">
 <a name="NMRemoteConnectionClass"></a><h3>NMRemoteConnectionClass</h3>
 <pre class="programlisting">typedef struct {
 	NMConnectionClass parent_class;
 
+	/* Signals */
+	void (*updated) (NMRemoteConnection *connection,
+	                 GHashTable *new_settings);
+
+	void (*removed) (NMRemoteConnection *connection);
+
 	/* Padding for future expansion */
 	void (*_reserved1) (void);
 	void (*_reserved2) (void);
@@ -103,10 +148,37 @@ NMRemoteConnection implements
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_remote_connection_new ()">
+<div class="refsect2">
+<a name="NMRemoteConnectionCommitFunc"></a><h3>NMRemoteConnectionCommitFunc ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                (*NMRemoteConnectionCommitFunc)     (<em class="parameter"><code><a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection"><span class="type">NMRemoteConnection</span></a> *connection</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMRemoteConnectionDeleteFunc"></a><h3>NMRemoteConnectionDeleteFunc ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                (*NMRemoteConnectionDeleteFunc)     (<em class="parameter"><code><a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection"><span class="type">NMRemoteConnection</span></a> *connection</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMRemoteConnectionGetSecretsFunc"></a><h3>NMRemoteConnectionGetSecretsFunc ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                (*NMRemoteConnectionGetSecretsFunc) (<em class="parameter"><code><a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection"><span class="type">NMRemoteConnection</span></a> *connection</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *secrets</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="nm-remote-connection-new"></a><h3>nm_remote_connection_new ()</h3>
 <pre class="programlisting"><a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection"><span class="returnvalue">NMRemoteConnection</span></a> * nm_remote_connection_new           (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGConnection.html#DBusGConnection"><span class="type">DBusGConnection</span></a> *bus</code></em>,
-                                                         <em class="parameter"><code><a href="http://projects.gnome.org/NetworkManager/developers/libnm-util/08/NMConnection.html#NMConnectionScope"><span class="type">NMConnectionScope</span></a> scope</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *path</code></em>);</pre>
 <p>
 Creates a new object representing the remote connection.
@@ -116,38 +188,125 @@ Creates a new object representing the remote connection.
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>bus</code></em> :</span></p></td>
-<td>a valid and connected D-Bus connection
+<td>a valid and connected D-Bus connection</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>path</code></em> :</span></p></td>
+<td>the D-Bus path of the connection as exported by the settings service</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>the new remote connection object on success, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> on failure</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-remote-connection-commit-changes"></a><h3>nm_remote_connection_commit_changes ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                nm_remote_connection_commit_changes (<em class="parameter"><code><a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection"><span class="type">NMRemoteConnection</span></a> *connection</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="NMRemoteConnection.html#NMRemoteConnectionCommitFunc" title="NMRemoteConnectionCommitFunc ()"><span class="type">NMRemoteConnectionCommitFunc</span></a> callback</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
+<p>
+Save any local changes to the settings and properties of this connection and
+save them in the settings service.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
+<td>the <a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection"><span class="type">NMRemoteConnection</span></a>
 </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>scope</code></em> :</span></p></td>
-<td>the Connection scope (either user or system)
+<td><p><span class="term"><em class="parameter"><code>callback</code></em> :</span></p></td>
+<td>a function to be called when the commit completes. <span class="annotation">[<acronym title="The callback is valid until first called."><span class="acronym">scope async</span></acronym>]</span>
 </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>path</code></em> :</span></p></td>
-<td>the D-Bus path of the connection as exported by the settings service
- indicated by <em class="parameter"><code>scope</code></em>
+<td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
+<td>caller-specific data to be passed to <em class="parameter"><code>callback</code></em>
 </td>
 </tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-remote-connection-delete"></a><h3>nm_remote_connection_delete ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                nm_remote_connection_delete         (<em class="parameter"><code><a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection"><span class="type">NMRemoteConnection</span></a> *connection</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="NMRemoteConnection.html#NMRemoteConnectionDeleteFunc" title="NMRemoteConnectionDeleteFunc ()"><span class="type">NMRemoteConnectionDeleteFunc</span></a> callback</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
+<p>
+Delete the connection.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the new remote connection object on success, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> on failure
+<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
+<td>the <a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection"><span class="type">NMRemoteConnection</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>callback</code></em> :</span></p></td>
+<td>a function to be called when the delete completes. <span class="annotation">[<acronym title="The callback is valid until first called."><span class="acronym">scope async</span></acronym>][<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
+<td>caller-specific data to be passed to <em class="parameter"><code>callback</code></em>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-remote-connection-get-secrets"></a><h3>nm_remote_connection_get_secrets ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                nm_remote_connection_get_secrets    (<em class="parameter"><code><a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection"><span class="type">NMRemoteConnection</span></a> *connection</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *setting_name</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="NMRemoteConnection.html#NMRemoteConnectionGetSecretsFunc" title="NMRemoteConnectionGetSecretsFunc ()"><span class="type">NMRemoteConnectionGetSecretsFunc</span></a> callback</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
+<p>
+Request the connection's secrets.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
+<td>the <a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection"><span class="type">NMRemoteConnection</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>setting_name</code></em> :</span></p></td>
+<td>the <a href="http://projects.gnome.org/NetworkManager/developers/libnm-util/09/NMSetting.html"><span class="type">NMSetting</span></a> object name to get secrets for</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>callback</code></em> :</span></p></td>
+<td>a function to be called when the update completes. <span class="annotation">[<acronym title="The callback is valid until first called."><span class="acronym">scope async</span></acronym>]</span>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
+<td>caller-specific data to be passed to <em class="parameter"><code>callback</code></em>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 </div>
-<div class="refsect1" title="Property Details">
+<div class="refsect1">
 <a name="NMRemoteConnection.property-details"></a><h2>Property Details</h2>
-<div class="refsect2" title='The "bus" property'>
+<div class="refsect2">
 <a name="NMRemoteConnection--bus"></a><h3>The <code class="literal">"bus"</code> property</h3>
 <pre class="programlisting">  "bus"                      <a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGConnection.html#DBusGConnection"><span class="type">DBusGConnection</span></a>*      : Write / Construct Only</pre>
 <p>DBusGConnection.</p>
 </div>
 <hr>
-<div class="refsect2" title='The "init-result" property'>
+<div class="refsect2">
 <a name="NMRemoteConnection--init-result"></a><h3>The <code class="literal">"init-result"</code> property</h3>
 <pre class="programlisting">  "init-result"              <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read</pre>
 <p>Initialization result (PRIVATE).</p>
@@ -155,9 +314,81 @@ Creates a new object representing the remote connection.
 <p>Default value: 0</p>
 </div>
 </div>
+<div class="refsect1">
+<a name="NMRemoteConnection.signal-details"></a><h2>Signal Details</h2>
+<div class="refsect2">
+<a name="NMRemoteConnection-removed"></a><h3>The <code class="literal">"removed"</code> signal</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                user_function                      (<a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection"><span class="type">NMRemoteConnection</span></a> *connection,
+                                                        <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>            user_data)       : <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-FIRST:CAPS"><code class="literal">Run First</code></a></pre>
+<p>
+This signal is emitted when a connection is either deleted or becomes
+invisible to the current user.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
+<td>a <span class="type">NMConnection</span>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
+<td>user data set when the signal handler was connected.</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMRemoteConnection-updated"></a><h3>The <code class="literal">"updated"</code> signal</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                user_function                      (<a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection"><span class="type">NMRemoteConnection</span></a> *connection,
+                                                        <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>            user_data)       : <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-FIRST:CAPS"><code class="literal">Run First</code></a></pre>
+<p>
+This signal is emitted when a connection changes, and it is
+still visible to the user.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
+<td>a <span class="type">NMConnection</span>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
+<td>user data set when the signal handler was connected.</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMRemoteConnection-visible"></a><h3>The <code class="literal">"visible"</code> signal</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                user_function                      (<a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection"><span class="type">NMRemoteConnection</span></a> *nmremoteconnection,
+                                                        <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>            arg1,
+                                                        <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>            user_data)               : <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-FIRST:CAPS"><code class="literal">Run First</code></a></pre>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>nmremoteconnection</code></em> :</span></p></td>
+<td>the object which received the signal.</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
+<td>user data set when the signal handler was connected.</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.15</div>
+          Generated by GTK-Doc V1.17</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMRemoteSettings.html b/docs/libnm-glib/html/NMRemoteSettings.html
index d37f1883a..6ed1d82fc 100644
--- a/docs/libnm-glib/html/NMRemoteSettings.html
+++ b/docs/libnm-glib/html/NMRemoteSettings.html
@@ -3,22 +3,22 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>NMRemoteSettings</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="libnm-glib Reference Manual">
-<link rel="up" href="ch01.html" title="libnm-glib Objects">
+<link rel="up" href="ch02.html" title="libnm-glib API Reference">
 <link rel="prev" href="NMRemoteConnection.html" title="NMRemoteConnection">
-<link rel="next" href="libnm-glib-NMRemoteSettingsSystem.html" title="NMRemoteSettingsSystem">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
+<link rel="next" href="libnm-glib-nm-types.html" title="nm-types">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
 <tr valign="middle">
 <td><a accesskey="p" href="NMRemoteConnection.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="ch01.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
+<td><a accesskey="u" href="ch02.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
 <th width="100%" align="center">libnm-glib Reference Manual</th>
-<td><a accesskey="n" href="libnm-glib-NMRemoteSettingsSystem.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+<td><a accesskey="n" href="libnm-glib-nm-types.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
 </tr>
 <tr><td colspan="5" class="shortcuts">
 <a href="#NMRemoteSettings.synopsis" class="shortcut">Top</a>
@@ -27,12 +27,12 @@
                    | 
                   <a href="#NMRemoteSettings.object-hierarchy" class="shortcut">Object Hierarchy</a>
                    | 
-                  <a href="#NMRemoteSettings.implemented-interfaces" class="shortcut">Implemented Interfaces</a>
-                   | 
                   <a href="#NMRemoteSettings.properties" class="shortcut">Properties</a>
+                   | 
+                  <a href="#NMRemoteSettings.signals" class="shortcut">Signals</a>
 </td></tr>
 </table>
-<div class="refentry" title="NMRemoteSettings">
+<div class="refentry">
 <a name="NMRemoteSettings"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
@@ -41,62 +41,149 @@
 </td>
 <td valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv" title="Synopsis">
+<div class="refsynopsisdiv">
 <a name="NMRemoteSettings.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">#define             <a class="link" href="NMRemoteSettings.html#NM-REMOTE-SETTINGS-BUS:CAPS" title="NM_REMOTE_SETTINGS_BUS">NM_REMOTE_SETTINGS_BUS</a>
-#define             <a class="link" href="NMRemoteSettings.html#NM-REMOTE-SETTINGS-SCOPE:CAPS" title="NM_REMOTE_SETTINGS_SCOPE">NM_REMOTE_SETTINGS_SCOPE</a>
+<pre class="synopsis">enum                <a class="link" href="NMRemoteSettings.html#NMRemoteSettingsError" title="enum NMRemoteSettingsError">NMRemoteSettingsError</a>;
+#define             <a class="link" href="NMRemoteSettings.html#NM-TYPE-REMOTE-SETTINGS-ERROR:CAPS" title="NM_TYPE_REMOTE_SETTINGS_ERROR">NM_TYPE_REMOTE_SETTINGS_ERROR</a>
+#define             <a class="link" href="NMRemoteSettings.html#NM-REMOTE-SETTINGS-ERROR:CAPS" title="NM_REMOTE_SETTINGS_ERROR">NM_REMOTE_SETTINGS_ERROR</a>
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              <a class="link" href="NMRemoteSettings.html#nm-remote-settings-error-quark" title="nm_remote_settings_error_quark ()">nm_remote_settings_error_quark</a>      (<em class="parameter"><code><span class="type">void</span></code></em>);
+#define             <a class="link" href="NMRemoteSettings.html#NM-REMOTE-SETTINGS-BUS:CAPS" title="NM_REMOTE_SETTINGS_BUS">NM_REMOTE_SETTINGS_BUS</a>
 #define             <a class="link" href="NMRemoteSettings.html#NM-REMOTE-SETTINGS-SERVICE-RUNNING:CAPS" title="NM_REMOTE_SETTINGS_SERVICE_RUNNING">NM_REMOTE_SETTINGS_SERVICE_RUNNING</a>
-                    <a class="link" href="NMRemoteSettings.html#NMRemoteSettings-struct" title="NMRemoteSettings">NMRemoteSettings</a>;
-                    <a class="link" href="NMRemoteSettings.html#NMRemoteSettingsClass" title="NMRemoteSettingsClass">NMRemoteSettingsClass</a>;
-<a class="link" href="NMRemoteSettings.html" title="NMRemoteSettings"><span class="returnvalue">NMRemoteSettings</span></a> *  <a class="link" href="NMRemoteSettings.html#nm-remote-settings-new" title="nm_remote_settings_new ()">nm_remote_settings_new</a>              (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGConnection.html#DBusGConnection"><span class="type">DBusGConnection</span></a> *bus</code></em>,
-                                                         <em class="parameter"><code><a href="http://projects.gnome.org/NetworkManager/developers/libnm-util/08/NMConnection.html#NMConnectionScope"><span class="type">NMConnectionScope</span></a> scope</code></em>);
+#define             <a class="link" href="NMRemoteSettings.html#NM-REMOTE-SETTINGS-HOSTNAME:CAPS" title="NM_REMOTE_SETTINGS_HOSTNAME">NM_REMOTE_SETTINGS_HOSTNAME</a>
+#define             <a class="link" href="NMRemoteSettings.html#NM-REMOTE-SETTINGS-CAN-MODIFY:CAPS" title="NM_REMOTE_SETTINGS_CAN_MODIFY">NM_REMOTE_SETTINGS_CAN_MODIFY</a>
+#define             <a class="link" href="NMRemoteSettings.html#NM-REMOTE-SETTINGS-NEW-CONNECTION:CAPS" title="NM_REMOTE_SETTINGS_NEW_CONNECTION">NM_REMOTE_SETTINGS_NEW_CONNECTION</a>
+#define             <a class="link" href="NMRemoteSettings.html#NM-REMOTE-SETTINGS-CONNECTIONS-READ:CAPS" title="NM_REMOTE_SETTINGS_CONNECTIONS_READ">NM_REMOTE_SETTINGS_CONNECTIONS_READ</a>
+<span class="returnvalue">void</span>                (<a class="link" href="NMRemoteSettings.html#NMRemoteSettingsAddConnectionFunc" title="NMRemoteSettingsAddConnectionFunc ()">*NMRemoteSettingsAddConnectionFunc</a>)
+                                                        (<em class="parameter"><code><a class="link" href="NMRemoteSettings.html" title="NMRemoteSettings"><span class="type">NMRemoteSettings</span></a> *settings</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection"><span class="type">NMRemoteConnection</span></a> *connection</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
+<span class="returnvalue">void</span>                (<a class="link" href="NMRemoteSettings.html#NMRemoteSettingsSaveHostnameFunc" title="NMRemoteSettingsSaveHostnameFunc ()">*NMRemoteSettingsSaveHostnameFunc</a>) (<em class="parameter"><code><a class="link" href="NMRemoteSettings.html" title="NMRemoteSettings"><span class="type">NMRemoteSettings</span></a> *settings</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
+struct              <a class="link" href="NMRemoteSettings.html#NMRemoteSettings-struct" title="struct NMRemoteSettings">NMRemoteSettings</a>;
+struct              <a class="link" href="NMRemoteSettings.html#NMRemoteSettingsClass" title="struct NMRemoteSettingsClass">NMRemoteSettingsClass</a>;
+<a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               <a class="link" href="NMRemoteSettings.html#nm-remote-settings-get-type" title="nm_remote_settings_get_type ()">nm_remote_settings_get_type</a>         (<em class="parameter"><code><span class="type">void</span></code></em>);
+<a class="link" href="NMRemoteSettings.html" title="NMRemoteSettings"><span class="returnvalue">NMRemoteSettings</span></a> *  <a class="link" href="NMRemoteSettings.html#nm-remote-settings-new" title="nm_remote_settings_new ()">nm_remote_settings_new</a>              (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGConnection.html#DBusGConnection"><span class="type">DBusGConnection</span></a> *bus</code></em>);
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="returnvalue">GSList</span></a> *            <a class="link" href="NMRemoteSettings.html#nm-remote-settings-list-connections" title="nm_remote_settings_list_connections ()">nm_remote_settings_list_connections</a> (<em class="parameter"><code><a class="link" href="NMRemoteSettings.html" title="NMRemoteSettings"><span class="type">NMRemoteSettings</span></a> *settings</code></em>);
+<a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection"><span class="returnvalue">NMRemoteConnection</span></a> *  <a class="link" href="NMRemoteSettings.html#nm-remote-settings-get-connection-by-path" title="nm_remote_settings_get_connection_by_path ()">nm_remote_settings_get_connection_by_path</a>
+                                                        (<em class="parameter"><code><a class="link" href="NMRemoteSettings.html" title="NMRemoteSettings"><span class="type">NMRemoteSettings</span></a> *settings</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *path</code></em>);
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMRemoteSettings.html#nm-remote-settings-add-connection" title="nm_remote_settings_add_connection ()">nm_remote_settings_add_connection</a>   (<em class="parameter"><code><a class="link" href="NMRemoteSettings.html" title="NMRemoteSettings"><span class="type">NMRemoteSettings</span></a> *settings</code></em>,
+                                                         <em class="parameter"><code><span class="type">NMConnection</span> *connection</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="NMRemoteSettings.html#NMRemoteSettingsAddConnectionFunc" title="NMRemoteSettingsAddConnectionFunc ()"><span class="type">NMRemoteSettingsAddConnectionFunc</span></a> callback</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMRemoteSettings.html#nm-remote-settings-save-hostname" title="nm_remote_settings_save_hostname ()">nm_remote_settings_save_hostname</a>    (<em class="parameter"><code><a class="link" href="NMRemoteSettings.html" title="NMRemoteSettings"><span class="type">NMRemoteSettings</span></a> *settings</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *hostname</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="NMRemoteSettings.html#NMRemoteSettingsSaveHostnameFunc" title="NMRemoteSettingsSaveHostnameFunc ()"><span class="type">NMRemoteSettingsSaveHostnameFunc</span></a> callback</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
 </pre>
 </div>
-<div class="refsect1" title="Object Hierarchy">
+<div class="refsect1">
 <a name="NMRemoteSettings.object-hierarchy"></a><h2>Object Hierarchy</h2>
 <pre class="synopsis">
   <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>
    +----NMRemoteSettings
 </pre>
 </div>
-<div class="refsect1" title="Implemented Interfaces">
-<a name="NMRemoteSettings.implemented-interfaces"></a><h2>Implemented Interfaces</h2>
-<p>
-NMRemoteSettings implements
- <a class="link" href="libnm-glib-NMSettings.html#NMSettingsInterface">NMSettingsInterface</a>.</p>
-</div>
-<div class="refsect1" title="Properties">
+<div class="refsect1">
 <a name="NMRemoteSettings.properties"></a><h2>Properties</h2>
 <pre class="synopsis">
   "<a class="link" href="NMRemoteSettings.html#NMRemoteSettings--bus" title='The "bus" property'>bus</a>"                      <a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGConnection.html#DBusGConnection"><span class="type">DBusGConnection</span></a>*      : Read / Write / Construct Only
-  "<a class="link" href="NMRemoteSettings.html#NMRemoteSettings--scope" title='The "scope" property'>scope</a>"                    <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write / Construct Only
+  "<a class="link" href="NMRemoteSettings.html#NMRemoteSettings--can-modify" title='The "can-modify" property'>can-modify</a>"               <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read
+  "<a class="link" href="NMRemoteSettings.html#NMRemoteSettings--hostname" title='The "hostname" property'>hostname</a>"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read
   "<a class="link" href="NMRemoteSettings.html#NMRemoteSettings--service-running" title='The "service-running" property'>service-running</a>"          <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read
 </pre>
 </div>
-<div class="refsect1" title="Description">
+<div class="refsect1">
+<a name="NMRemoteSettings.signals"></a><h2>Signals</h2>
+<pre class="synopsis">
+  "<a class="link" href="NMRemoteSettings.html#NMRemoteSettings-connections-read" title='The "connections-read" signal'>connections-read</a>"                               : <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-FIRST:CAPS"><code class="literal">Run First</code></a>
+  "<a class="link" href="NMRemoteSettings.html#NMRemoteSettings-new-connection" title='The "new-connection" signal'>new-connection</a>"                                 : <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-FIRST:CAPS"><code class="literal">Run First</code></a>
+</pre>
+</div>
+<div class="refsect1">
 <a name="NMRemoteSettings.description"></a><h2>Description</h2>
 <p>
 </p>
 </div>
-<div class="refsect1" title="Details">
+<div class="refsect1">
 <a name="NMRemoteSettings.details"></a><h2>Details</h2>
-<div class="refsect2" title="NM_REMOTE_SETTINGS_BUS">
-<a name="NM-REMOTE-SETTINGS-BUS:CAPS"></a><h3>NM_REMOTE_SETTINGS_BUS</h3>
-<pre class="programlisting">#define NM_REMOTE_SETTINGS_BUS "bus"
+<div class="refsect2">
+<a name="NMRemoteSettingsError"></a><h3>enum NMRemoteSettingsError</h3>
+<pre class="programlisting">typedef enum {
+	NM_REMOTE_SETTINGS_ERROR_UNKNOWN = 0,
+	NM_REMOTE_SETTINGS_ERROR_CONNECTION_REMOVED,
+	NM_REMOTE_SETTINGS_ERROR_CONNECTION_UNAVAILABLE,
+} NMRemoteSettingsError;
 </pre>
 <p>
+Describes errors that may result from operations involving a <a class="link" href="NMRemoteSettings.html" title="NMRemoteSettings"><span class="type">NMRemoteSettings</span></a>.
 </p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><a name="NM-REMOTE-SETTINGS-ERROR-UNKNOWN:CAPS"></a><span class="term"><code class="literal">NM_REMOTE_SETTINGS_ERROR_UNKNOWN</code></span></p></td>
+<td>unknown or unclassified error
+</td>
+</tr>
+<tr>
+<td><p><a name="NM-REMOTE-SETTINGS-ERROR-CONNECTION-REMOVED:CAPS"></a><span class="term"><code class="literal">NM_REMOTE_SETTINGS_ERROR_CONNECTION_REMOVED</code></span></p></td>
+<td>the <a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection"><span class="type">NMRemoteConnection</span></a> object
+  was removed before it was completely initialized
+</td>
+</tr>
+<tr>
+<td><p><a name="NM-REMOTE-SETTINGS-ERROR-CONNECTION-UNAVAILABLE:CAPS"></a><span class="term"><code class="literal">NM_REMOTE_SETTINGS_ERROR_CONNECTION_UNAVAILABLE</code></span></p></td>
+<td>the <a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection"><span class="type">NMRemoteConnection</span></a> object
+  is not visible or otherwise unreadable
+</td>
+</tr>
+</tbody>
+</table></div>
 </div>
 <hr>
-<div class="refsect2" title="NM_REMOTE_SETTINGS_SCOPE">
-<a name="NM-REMOTE-SETTINGS-SCOPE:CAPS"></a><h3>NM_REMOTE_SETTINGS_SCOPE</h3>
-<pre class="programlisting">#define NM_REMOTE_SETTINGS_SCOPE "scope"
+<div class="refsect2">
+<a name="NM-TYPE-REMOTE-SETTINGS-ERROR:CAPS"></a><h3>NM_TYPE_REMOTE_SETTINGS_ERROR</h3>
+<pre class="programlisting">#define NM_TYPE_REMOTE_SETTINGS_ERROR (nm_remote_settings_error_get_type ()) 
 </pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_REMOTE_SETTINGS_SERVICE_RUNNING">
+<div class="refsect2">
+<a name="NM-REMOTE-SETTINGS-ERROR:CAPS"></a><h3>NM_REMOTE_SETTINGS_ERROR</h3>
+<pre class="programlisting">#define NM_REMOTE_SETTINGS_ERROR nm_remote_settings_error_quark ()
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-remote-settings-error-quark"></a><h3>nm_remote_settings_error_quark ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              nm_remote_settings_error_quark      (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
+<p>
+Registers an error quark for <a class="link" href="NMRemoteSettings.html" title="NMRemoteSettings"><span class="type">NMRemoteSettings</span></a> if necessary.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody><tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>the error quark used for <a class="link" href="NMRemoteSettings.html" title="NMRemoteSettings"><span class="type">NMRemoteSettings</span></a> errors.</td>
+</tr></tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-REMOTE-SETTINGS-BUS:CAPS"></a><h3>NM_REMOTE_SETTINGS_BUS</h3>
+<pre class="programlisting">#define NM_REMOTE_SETTINGS_BUS             "bus"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="NM-REMOTE-SETTINGS-SERVICE-RUNNING:CAPS"></a><h3>NM_REMOTE_SETTINGS_SERVICE_RUNNING</h3>
 <pre class="programlisting">#define NM_REMOTE_SETTINGS_SERVICE_RUNNING "service-running"
 </pre>
@@ -104,18 +191,76 @@ NMRemoteSettings implements
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMRemoteSettings">
-<a name="NMRemoteSettings-struct"></a><h3>NMRemoteSettings</h3>
-<pre class="programlisting">typedef struct _NMRemoteSettings NMRemoteSettings;</pre>
+<div class="refsect2">
+<a name="NM-REMOTE-SETTINGS-HOSTNAME:CAPS"></a><h3>NM_REMOTE_SETTINGS_HOSTNAME</h3>
+<pre class="programlisting">#define NM_REMOTE_SETTINGS_HOSTNAME        "hostname"
+</pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMRemoteSettingsClass">
-<a name="NMRemoteSettingsClass"></a><h3>NMRemoteSettingsClass</h3>
-<pre class="programlisting">typedef struct {
+<div class="refsect2">
+<a name="NM-REMOTE-SETTINGS-CAN-MODIFY:CAPS"></a><h3>NM_REMOTE_SETTINGS_CAN_MODIFY</h3>
+<pre class="programlisting">#define NM_REMOTE_SETTINGS_CAN_MODIFY      "can-modify"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-REMOTE-SETTINGS-NEW-CONNECTION:CAPS"></a><h3>NM_REMOTE_SETTINGS_NEW_CONNECTION</h3>
+<pre class="programlisting">#define NM_REMOTE_SETTINGS_NEW_CONNECTION    "new-connection"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-REMOTE-SETTINGS-CONNECTIONS-READ:CAPS"></a><h3>NM_REMOTE_SETTINGS_CONNECTIONS_READ</h3>
+<pre class="programlisting">#define NM_REMOTE_SETTINGS_CONNECTIONS_READ  "connections-read"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMRemoteSettingsAddConnectionFunc"></a><h3>NMRemoteSettingsAddConnectionFunc ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                (*NMRemoteSettingsAddConnectionFunc)
+                                                        (<em class="parameter"><code><a class="link" href="NMRemoteSettings.html" title="NMRemoteSettings"><span class="type">NMRemoteSettings</span></a> *settings</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection"><span class="type">NMRemoteConnection</span></a> *connection</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMRemoteSettingsSaveHostnameFunc"></a><h3>NMRemoteSettingsSaveHostnameFunc ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                (*NMRemoteSettingsSaveHostnameFunc) (<em class="parameter"><code><a class="link" href="NMRemoteSettings.html" title="NMRemoteSettings"><span class="type">NMRemoteSettings</span></a> *settings</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMRemoteSettings-struct"></a><h3>struct NMRemoteSettings</h3>
+<pre class="programlisting">struct NMRemoteSettings;</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMRemoteSettingsClass"></a><h3>struct NMRemoteSettingsClass</h3>
+<pre class="programlisting">struct NMRemoteSettingsClass {
 	GObjectClass parent;
 
+	/* Signals */
+	void (*new_connection) (NMRemoteSettings *settings,
+	                        NMRemoteConnection *connection);
+
+	void (*connections_read) (NMRemoteSettings *settings);
+
 	/* Padding for future expansion */
 	void (*_reserved1) (void);
 	void (*_reserved2) (void);
@@ -123,16 +268,22 @@ NMRemoteSettings implements
 	void (*_reserved4) (void);
 	void (*_reserved5) (void);
 	void (*_reserved6) (void);
-} NMRemoteSettingsClass;
+};
 </pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_remote_settings_new ()">
+<div class="refsect2">
+<a name="nm-remote-settings-get-type"></a><h3>nm_remote_settings_get_type ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               nm_remote_settings_get_type         (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="nm-remote-settings-new"></a><h3>nm_remote_settings_new ()</h3>
-<pre class="programlisting"><a class="link" href="NMRemoteSettings.html" title="NMRemoteSettings"><span class="returnvalue">NMRemoteSettings</span></a> *  nm_remote_settings_new              (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGConnection.html#DBusGConnection"><span class="type">DBusGConnection</span></a> *bus</code></em>,
-                                                         <em class="parameter"><code><a href="http://projects.gnome.org/NetworkManager/developers/libnm-util/08/NMConnection.html#NMConnectionScope"><span class="type">NMConnectionScope</span></a> scope</code></em>);</pre>
+<pre class="programlisting"><a class="link" href="NMRemoteSettings.html" title="NMRemoteSettings"><span class="returnvalue">NMRemoteSettings</span></a> *  nm_remote_settings_new              (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGConnection.html#DBusGConnection"><span class="type">DBusGConnection</span></a> *bus</code></em>);</pre>
 <p>
 Creates a new object representing the remote settings service.
 </p>
@@ -141,49 +292,231 @@ Creates a new object representing the remote settings service.
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>bus</code></em> :</span></p></td>
-<td>a valid and connected D-Bus connection
+<td>a valid and connected D-Bus connection. <span class="annotation">[<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>the new remote settings object on success, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> on failure</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-remote-settings-list-connections"></a><h3>nm_remote_settings_list_connections ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="returnvalue">GSList</span></a> *            nm_remote_settings_list_connections (<em class="parameter"><code><a class="link" href="NMRemoteSettings.html" title="NMRemoteSettings"><span class="type">NMRemoteSettings</span></a> *settings</code></em>);</pre>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>settings</code></em> :</span></p></td>
+<td>the <a class="link" href="NMRemoteSettings.html" title="NMRemoteSettings"><code class="literal">NMRemoteSettings</code></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>a
+list containing all connections provided by the remote settings service.
+Each element of the returned list is a <a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection"><code class="literal">NMRemoteConnection</code></a> instance, which is
+owned by the <a class="link" href="NMRemoteSettings.html" title="NMRemoteSettings"><code class="literal">NMRemoteSettings</code></a> object and should not be freed by the caller.
+The returned list is, however, owned by the caller and should be freed
+using <a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#g-slist-free"><code class="function">g_slist_free()</code></a> when no longer required. <span class="annotation">[<acronym title="Free data container after the code is done."><span class="acronym">transfer container</span></acronym>][<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMClient.RemoteConnection]</span>
 </td>
 </tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-remote-settings-get-connection-by-path"></a><h3>nm_remote_settings_get_connection_by_path ()</h3>
+<pre class="programlisting"><a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection"><span class="returnvalue">NMRemoteConnection</span></a> *  nm_remote_settings_get_connection_by_path
+                                                        (<em class="parameter"><code><a class="link" href="NMRemoteSettings.html" title="NMRemoteSettings"><span class="type">NMRemoteSettings</span></a> *settings</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *path</code></em>);</pre>
+<p>
+Returns the <a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection"><code class="literal">NMRemoteConnection</code></a> representing the connection at <em class="parameter"><code>path</code></em>.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>scope</code></em> :</span></p></td>
-<td>the settings service scope (either user or system)
+<td><p><span class="term"><em class="parameter"><code>settings</code></em> :</span></p></td>
+<td>the <a class="link" href="NMRemoteSettings.html" title="NMRemoteSettings"><code class="literal">NMRemoteSettings</code></a>
 </td>
 </tr>
 <tr>
+<td><p><span class="term"><em class="parameter"><code>path</code></em> :</span></p></td>
+<td>the D-Bus object path of the remote connection</td>
+</tr>
+<tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the new remote settings object on success, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> on failure
+<td>the remote connection object on success, or NULL if the object was
+not known. <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<hr>
+<div class="refsect2">
+<a name="nm-remote-settings-add-connection"></a><h3>nm_remote_settings_add_connection ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_remote_settings_add_connection   (<em class="parameter"><code><a class="link" href="NMRemoteSettings.html" title="NMRemoteSettings"><span class="type">NMRemoteSettings</span></a> *settings</code></em>,
+                                                         <em class="parameter"><code><span class="type">NMConnection</span> *connection</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="NMRemoteSettings.html#NMRemoteSettingsAddConnectionFunc" title="NMRemoteSettingsAddConnectionFunc ()"><span class="type">NMRemoteSettingsAddConnectionFunc</span></a> callback</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
+<p>
+Requests that the remote settings service add the given settings to a new
+connection.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>settings</code></em> :</span></p></td>
+<td>the <a class="link" href="NMRemoteSettings.html" title="NMRemoteSettings"><code class="literal">NMRemoteSettings</code></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
+<td>the connection to add. Note that this object's settings will be
+added, not the object itself</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>callback</code></em> :</span></p></td>
+<td>callback to be called when the add operation completes. <span class="annotation">[<acronym title="The callback is valid until first called."><span class="acronym">scope async</span></acronym>]</span>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
+<td>caller-specific data passed to <em class="parameter"><code>callback</code></em>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>TRUE if the request was successful, FALSE if it failed</td>
+</tr>
+</tbody>
+</table></div>
 </div>
-<div class="refsect1" title="Property Details">
+<hr>
+<div class="refsect2">
+<a name="nm-remote-settings-save-hostname"></a><h3>nm_remote_settings_save_hostname ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_remote_settings_save_hostname    (<em class="parameter"><code><a class="link" href="NMRemoteSettings.html" title="NMRemoteSettings"><span class="type">NMRemoteSettings</span></a> *settings</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *hostname</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="NMRemoteSettings.html#NMRemoteSettingsSaveHostnameFunc" title="NMRemoteSettingsSaveHostnameFunc ()"><span class="type">NMRemoteSettingsSaveHostnameFunc</span></a> callback</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
+<p>
+Requests that the machine's persistent hostname be set to the specified value
+or cleared.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>settings</code></em> :</span></p></td>
+<td>the <a class="link" href="NMRemoteSettings.html" title="NMRemoteSettings"><code class="literal">NMRemoteSettings</code></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>hostname</code></em> :</span></p></td>
+<td>the new persistent hostname to set, or NULL to clear any existing
+persistent hostname</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>callback</code></em> :</span></p></td>
+<td>callback to be called when the hostname operation completes. <span class="annotation">[<acronym title="The callback is valid until first called."><span class="acronym">scope async</span></acronym>]</span>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
+<td>caller-specific data passed to <em class="parameter"><code>callback</code></em>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>TRUE if the request was successful, FALSE if it failed</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<div class="refsect1">
 <a name="NMRemoteSettings.property-details"></a><h2>Property Details</h2>
-<div class="refsect2" title='The "bus" property'>
+<div class="refsect2">
 <a name="NMRemoteSettings--bus"></a><h3>The <code class="literal">"bus"</code> property</h3>
 <pre class="programlisting">  "bus"                      <a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGConnection.html#DBusGConnection"><span class="type">DBusGConnection</span></a>*      : Read / Write / Construct Only</pre>
 <p>DBusGConnection.</p>
 </div>
 <hr>
-<div class="refsect2" title='The "scope" property'>
-<a name="NMRemoteSettings--scope"></a><h3>The <code class="literal">"scope"</code> property</h3>
-<pre class="programlisting">  "scope"                    <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write / Construct Only</pre>
-<p>NMConnection scope.</p>
-<p>Allowed values: &lt;= 2</p>
-<p>Default value: 2</p>
+<div class="refsect2">
+<a name="NMRemoteSettings--can-modify"></a><h3>The <code class="literal">"can-modify"</code> property</h3>
+<pre class="programlisting">  "can-modify"               <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read</pre>
+<p>Can modify anything (hostname, connections, etc).</p>
+<p>Default value: FALSE</p>
 </div>
 <hr>
-<div class="refsect2" title='The "service-running" property'>
+<div class="refsect2">
+<a name="NMRemoteSettings--hostname"></a><h3>The <code class="literal">"hostname"</code> property</h3>
+<pre class="programlisting">  "hostname"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read</pre>
+<p>Persistent hostname.</p>
+<p>Default value: NULL</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="NMRemoteSettings--service-running"></a><h3>The <code class="literal">"service-running"</code> property</h3>
 <pre class="programlisting">  "service-running"          <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read</pre>
 <p>Is service running.</p>
 <p>Default value: FALSE</p>
 </div>
 </div>
+<div class="refsect1">
+<a name="NMRemoteSettings.signal-details"></a><h2>Signal Details</h2>
+<div class="refsect2">
+<a name="NMRemoteSettings-connections-read"></a><h3>The <code class="literal">"connections-read"</code> signal</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                user_function                      (<a class="link" href="NMRemoteSettings.html" title="NMRemoteSettings"><span class="type">NMRemoteSettings</span></a> *nmremotesettings,
+                                                        <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>          user_data)             : <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-FIRST:CAPS"><code class="literal">Run First</code></a></pre>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>nmremotesettings</code></em> :</span></p></td>
+<td>the object which received the signal.</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
+<td>user data set when the signal handler was connected.</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMRemoteSettings-new-connection"></a><h3>The <code class="literal">"new-connection"</code> signal</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                user_function                      (<a class="link" href="NMRemoteSettings.html" title="NMRemoteSettings"><span class="type">NMRemoteSettings</span></a> *nmremotesettings,
+                                                        <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a>          *arg1,
+                                                        <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>          user_data)             : <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-FIRST:CAPS"><code class="literal">Run First</code></a></pre>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>nmremotesettings</code></em> :</span></p></td>
+<td>the object which received the signal.</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
+<td>user data set when the signal handler was connected.</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.15</div>
+          Generated by GTK-Doc V1.17</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMSecretAgent.html b/docs/libnm-glib/html/NMSecretAgent.html
new file mode 100644
index 000000000..8da09f9cd
--- /dev/null
+++ b/docs/libnm-glib/html/NMSecretAgent.html
@@ -0,0 +1,593 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>NMSecretAgent</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<link rel="home" href="index.html" title="libnm-glib Reference Manual">
+<link rel="up" href="ch02.html" title="libnm-glib API Reference">
+<link rel="prev" href="libnm-glib-nm-types.html" title="nm-types">
+<link rel="next" href="NMVPNConnection.html" title="NMVPNConnection">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
+<tr valign="middle">
+<td><a accesskey="p" href="libnm-glib-nm-types.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
+<td><a accesskey="u" href="ch02.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
+<th width="100%" align="center">libnm-glib Reference Manual</th>
+<td><a accesskey="n" href="NMVPNConnection.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+</tr>
+<tr><td colspan="5" class="shortcuts">
+<a href="#NMSecretAgent.synopsis" class="shortcut">Top</a>
+                   | 
+                  <a href="#NMSecretAgent.description" class="shortcut">Description</a>
+                   | 
+                  <a href="#NMSecretAgent.object-hierarchy" class="shortcut">Object Hierarchy</a>
+                   | 
+                  <a href="#NMSecretAgent.properties" class="shortcut">Properties</a>
+                   | 
+                  <a href="#NMSecretAgent.signals" class="shortcut">Signals</a>
+</td></tr>
+</table>
+<div class="refentry">
+<a name="NMSecretAgent"></a><div class="titlepage"></div>
+<div class="refnamediv"><table width="100%"><tr>
+<td valign="top">
+<h2><span class="refentrytitle"><a name="NMSecretAgent.top_of_page"></a>NMSecretAgent</span></h2>
+<p>NMSecretAgent</p>
+</td>
+<td valign="top" align="right"></td>
+</tr></table></div>
+<div class="refsynopsisdiv">
+<a name="NMSecretAgent.synopsis"></a><h2>Synopsis</h2>
+<pre class="synopsis">#define             <a class="link" href="NMSecretAgent.html#NM-SECRET-AGENT-ERROR:CAPS" title="NM_SECRET_AGENT_ERROR">NM_SECRET_AGENT_ERROR</a>
+#define             <a class="link" href="NMSecretAgent.html#NM-TYPE-SECRET-AGENT-ERROR:CAPS" title="NM_TYPE_SECRET_AGENT_ERROR">NM_TYPE_SECRET_AGENT_ERROR</a>
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              <a class="link" href="NMSecretAgent.html#nm-secret-agent-error-quark" title="nm_secret_agent_error_quark ()">nm_secret_agent_error_quark</a>         (<em class="parameter"><code><span class="type">void</span></code></em>);
+enum                <a class="link" href="NMSecretAgent.html#NMSecretAgentError" title="enum NMSecretAgentError">NMSecretAgentError</a>;
+enum                <a class="link" href="NMSecretAgent.html#NMSecretAgentGetSecretsFlags" title="enum NMSecretAgentGetSecretsFlags">NMSecretAgentGetSecretsFlags</a>;
+#define             <a class="link" href="NMSecretAgent.html#NM-SECRET-AGENT-IDENTIFIER:CAPS" title="NM_SECRET_AGENT_IDENTIFIER">NM_SECRET_AGENT_IDENTIFIER</a>
+#define             <a class="link" href="NMSecretAgent.html#NM-SECRET-AGENT-AUTO-REGISTER:CAPS" title="NM_SECRET_AGENT_AUTO_REGISTER">NM_SECRET_AGENT_AUTO_REGISTER</a>
+#define             <a class="link" href="NMSecretAgent.html#NM-SECRET-AGENT-REGISTRATION-RESULT:CAPS" title="NM_SECRET_AGENT_REGISTRATION_RESULT">NM_SECRET_AGENT_REGISTRATION_RESULT</a>
+                    <a class="link" href="NMSecretAgent.html#NMSecretAgent-struct" title="NMSecretAgent">NMSecretAgent</a>;
+<span class="returnvalue">void</span>                (<a class="link" href="NMSecretAgent.html#NMSecretAgentGetSecretsFunc" title="NMSecretAgentGetSecretsFunc ()">*NMSecretAgentGetSecretsFunc</a>)      (<em class="parameter"><code><a class="link" href="NMSecretAgent.html" title="NMSecretAgent"><span class="type">NMSecretAgent</span></a> *agent</code></em>,
+                                                         <em class="parameter"><code><span class="type">NMConnection</span> *connection</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *secrets</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
+<span class="returnvalue">void</span>                (<a class="link" href="NMSecretAgent.html#NMSecretAgentSaveSecretsFunc" title="NMSecretAgentSaveSecretsFunc ()">*NMSecretAgentSaveSecretsFunc</a>)     (<em class="parameter"><code><a class="link" href="NMSecretAgent.html" title="NMSecretAgent"><span class="type">NMSecretAgent</span></a> *agent</code></em>,
+                                                         <em class="parameter"><code><span class="type">NMConnection</span> *connection</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
+<span class="returnvalue">void</span>                (<a class="link" href="NMSecretAgent.html#NMSecretAgentDeleteSecretsFunc" title="NMSecretAgentDeleteSecretsFunc ()">*NMSecretAgentDeleteSecretsFunc</a>)   (<em class="parameter"><code><a class="link" href="NMSecretAgent.html" title="NMSecretAgent"><span class="type">NMSecretAgent</span></a> *agent</code></em>,
+                                                         <em class="parameter"><code><span class="type">NMConnection</span> *connection</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
+                    <a class="link" href="NMSecretAgent.html#NMSecretAgentClass" title="NMSecretAgentClass">NMSecretAgentClass</a>;
+<a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               <a class="link" href="NMSecretAgent.html#nm-secret-agent-get-type" title="nm_secret_agent_get_type ()">nm_secret_agent_get_type</a>            (<em class="parameter"><code><span class="type">void</span></code></em>);
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMSecretAgent.html#nm-secret-agent-register" title="nm_secret_agent_register ()">nm_secret_agent_register</a>            (<em class="parameter"><code><a class="link" href="NMSecretAgent.html" title="NMSecretAgent"><span class="type">NMSecretAgent</span></a> *self</code></em>);
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMSecretAgent.html#nm-secret-agent-unregister" title="nm_secret_agent_unregister ()">nm_secret_agent_unregister</a>          (<em class="parameter"><code><a class="link" href="NMSecretAgent.html" title="NMSecretAgent"><span class="type">NMSecretAgent</span></a> *self</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="NMSecretAgent.html#nm-secret-agent-get-secrets" title="nm_secret_agent_get_secrets ()">nm_secret_agent_get_secrets</a>         (<em class="parameter"><code><a class="link" href="NMSecretAgent.html" title="NMSecretAgent"><span class="type">NMSecretAgent</span></a> *self</code></em>,
+                                                         <em class="parameter"><code><span class="type">NMConnection</span> *connection</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *setting_name</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> **hints</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="NMSecretAgent.html#NMSecretAgentGetSecretsFlags" title="enum NMSecretAgentGetSecretsFlags"><span class="type">NMSecretAgentGetSecretsFlags</span></a> flags</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="NMSecretAgent.html#NMSecretAgentGetSecretsFunc" title="NMSecretAgentGetSecretsFunc ()"><span class="type">NMSecretAgentGetSecretsFunc</span></a> callback</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> callback_data</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="NMSecretAgent.html#nm-secret-agent-save-secrets" title="nm_secret_agent_save_secrets ()">nm_secret_agent_save_secrets</a>        (<em class="parameter"><code><a class="link" href="NMSecretAgent.html" title="NMSecretAgent"><span class="type">NMSecretAgent</span></a> *self</code></em>,
+                                                         <em class="parameter"><code><span class="type">NMConnection</span> *connection</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="NMSecretAgent.html#NMSecretAgentSaveSecretsFunc" title="NMSecretAgentSaveSecretsFunc ()"><span class="type">NMSecretAgentSaveSecretsFunc</span></a> callback</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> callback_data</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="NMSecretAgent.html#nm-secret-agent-delete-secrets" title="nm_secret_agent_delete_secrets ()">nm_secret_agent_delete_secrets</a>      (<em class="parameter"><code><a class="link" href="NMSecretAgent.html" title="NMSecretAgent"><span class="type">NMSecretAgent</span></a> *self</code></em>,
+                                                         <em class="parameter"><code><span class="type">NMConnection</span> *connection</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="NMSecretAgent.html#NMSecretAgentDeleteSecretsFunc" title="NMSecretAgentDeleteSecretsFunc ()"><span class="type">NMSecretAgentDeleteSecretsFunc</span></a> callback</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> callback_data</code></em>);
+</pre>
+</div>
+<div class="refsect1">
+<a name="NMSecretAgent.object-hierarchy"></a><h2>Object Hierarchy</h2>
+<pre class="synopsis">
+  <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>
+   +----NMSecretAgent
+</pre>
+</div>
+<div class="refsect1">
+<a name="NMSecretAgent.properties"></a><h2>Properties</h2>
+<pre class="synopsis">
+  "<a class="link" href="NMSecretAgent.html#NMSecretAgent--auto-register" title='The "auto-register" property'>auto-register</a>"            <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write / Construct
+  "<a class="link" href="NMSecretAgent.html#NMSecretAgent--identifier" title='The "identifier" property'>identifier</a>"               <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write / Construct Only
+</pre>
+</div>
+<div class="refsect1">
+<a name="NMSecretAgent.signals"></a><h2>Signals</h2>
+<pre class="synopsis">
+  "<a class="link" href="NMSecretAgent.html#NMSecretAgent-registration-result" title='The "registration-result" signal'>registration-result</a>"                            : <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-FIRST:CAPS"><code class="literal">Run First</code></a>
+</pre>
+</div>
+<div class="refsect1">
+<a name="NMSecretAgent.description"></a><h2>Description</h2>
+<p>
+</p>
+</div>
+<div class="refsect1">
+<a name="NMSecretAgent.details"></a><h2>Details</h2>
+<div class="refsect2">
+<a name="NM-SECRET-AGENT-ERROR:CAPS"></a><h3>NM_SECRET_AGENT_ERROR</h3>
+<pre class="programlisting">#define NM_SECRET_AGENT_ERROR         (nm_secret_agent_error_quark ())
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-TYPE-SECRET-AGENT-ERROR:CAPS"></a><h3>NM_TYPE_SECRET_AGENT_ERROR</h3>
+<pre class="programlisting">#define NM_TYPE_SECRET_AGENT_ERROR    (nm_secret_agent_error_get_type ())
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-secret-agent-error-quark"></a><h3>nm_secret_agent_error_quark ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              nm_secret_agent_error_quark         (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMSecretAgentError"></a><h3>enum NMSecretAgentError</h3>
+<pre class="programlisting">typedef enum {
+	NM_SECRET_AGENT_ERROR_NOT_AUTHORIZED = 0,
+	NM_SECRET_AGENT_ERROR_INVALID_CONNECTION,
+	NM_SECRET_AGENT_ERROR_USER_CANCELED,
+	NM_SECRET_AGENT_ERROR_AGENT_CANCELED,
+	NM_SECRET_AGENT_ERROR_INTERNAL_ERROR,
+	NM_SECRET_AGENT_ERROR_NO_SECRETS,
+} NMSecretAgentError;
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMSecretAgentGetSecretsFlags"></a><h3>enum NMSecretAgentGetSecretsFlags</h3>
+<pre class="programlisting">typedef enum {
+	NM_SECRET_AGENT_GET_SECRETS_FLAG_NONE = 0x0,
+	NM_SECRET_AGENT_GET_SECRETS_FLAG_ALLOW_INTERACTION = 0x1,
+	NM_SECRET_AGENT_GET_SECRETS_FLAG_REQUEST_NEW = 0x2
+} NMSecretAgentGetSecretsFlags;
+</pre>
+<p>
+<a class="link" href="NMSecretAgent.html#NMSecretAgentGetSecretsFlags" title="enum NMSecretAgentGetSecretsFlags"><span class="type">NMSecretAgentGetSecretsFlags</span></a> values modify the behavior of a GetSecrets request.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><a name="NM-SECRET-AGENT-GET-SECRETS-FLAG-NONE:CAPS"></a><span class="term"><code class="literal">NM_SECRET_AGENT_GET_SECRETS_FLAG_NONE</code></span></p></td>
+<td>no special behavior; by default no
+user interaction is allowed and requests for secrets are fulfilled from
+persistent storage, or if no secrets are available an error is returned.
+</td>
+</tr>
+<tr>
+<td><p><a name="NM-SECRET-AGENT-GET-SECRETS-FLAG-ALLOW-INTERACTION:CAPS"></a><span class="term"><code class="literal">NM_SECRET_AGENT_GET_SECRETS_FLAG_ALLOW_INTERACTION</code></span></p></td>
+<td>allows the request to
+interact with the user, possibly prompting via UI for secrets if any are
+required, or if none are found in persistent storage.
+</td>
+</tr>
+<tr>
+<td><p><a name="NM-SECRET-AGENT-GET-SECRETS-FLAG-REQUEST-NEW:CAPS"></a><span class="term"><code class="literal">NM_SECRET_AGENT_GET_SECRETS_FLAG_REQUEST_NEW</code></span></p></td>
+<td>explicitly prompt for new
+secrets from the user.  This flag signals that NetworkManager thinks any
+existing secrets are invalid or wrong.  This flag implies that interaction
+is allowed.
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-SECRET-AGENT-IDENTIFIER:CAPS"></a><h3>NM_SECRET_AGENT_IDENTIFIER</h3>
+<pre class="programlisting">#define NM_SECRET_AGENT_IDENTIFIER          "identifier"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-SECRET-AGENT-AUTO-REGISTER:CAPS"></a><h3>NM_SECRET_AGENT_AUTO_REGISTER</h3>
+<pre class="programlisting">#define NM_SECRET_AGENT_AUTO_REGISTER       "auto-register"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-SECRET-AGENT-REGISTRATION-RESULT:CAPS"></a><h3>NM_SECRET_AGENT_REGISTRATION_RESULT</h3>
+<pre class="programlisting">#define NM_SECRET_AGENT_REGISTRATION_RESULT "registration-result"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMSecretAgent-struct"></a><h3>NMSecretAgent</h3>
+<pre class="programlisting">typedef struct _NMSecretAgent NMSecretAgent;</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMSecretAgentGetSecretsFunc"></a><h3>NMSecretAgentGetSecretsFunc ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                (*NMSecretAgentGetSecretsFunc)      (<em class="parameter"><code><a class="link" href="NMSecretAgent.html" title="NMSecretAgent"><span class="type">NMSecretAgent</span></a> *agent</code></em>,
+                                                         <em class="parameter"><code><span class="type">NMConnection</span> *connection</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *secrets</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMSecretAgentSaveSecretsFunc"></a><h3>NMSecretAgentSaveSecretsFunc ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                (*NMSecretAgentSaveSecretsFunc)     (<em class="parameter"><code><a class="link" href="NMSecretAgent.html" title="NMSecretAgent"><span class="type">NMSecretAgent</span></a> *agent</code></em>,
+                                                         <em class="parameter"><code><span class="type">NMConnection</span> *connection</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMSecretAgentDeleteSecretsFunc"></a><h3>NMSecretAgentDeleteSecretsFunc ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                (*NMSecretAgentDeleteSecretsFunc)   (<em class="parameter"><code><a class="link" href="NMSecretAgent.html" title="NMSecretAgent"><span class="type">NMSecretAgent</span></a> *agent</code></em>,
+                                                         <em class="parameter"><code><span class="type">NMConnection</span> *connection</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMSecretAgentClass"></a><h3>NMSecretAgentClass</h3>
+<pre class="programlisting">typedef struct {
+	GObjectClass parent;
+
+	/* Virtual methods for subclasses */
+
+	/* Called when the subclass should retrieve and return secrets.  Subclass
+	 * must copy or reference any arguments it may require after returning from
+	 * this method, as the arguments will freed (except for 'agent', 'callback',
+	 * and 'callback_data' of course).  If the request is canceled, the callback
+	 * should still be called, but with the NM_SECRET_AGENT_ERROR_AGENT_CANCELED
+	 * error.
+	 */
+	void (*get_secrets) (NMSecretAgent *agent,
+	                     NMConnection *connection,
+	                     const char *connection_path,
+	                     const char *setting_name,
+	                     const char **hints,
+	                     NMSecretAgentGetSecretsFlags flags,
+	                     NMSecretAgentGetSecretsFunc callback,
+	                     gpointer callback_data);
+
+	/* Called when the subclass should cancel an outstanding request to
+	 * get secrets for a given connection.  Canceling the request MUST
+	 * call the callback that was passed along with the initial get_secrets
+	 * call, sending the NM_SECRET_AGENT_ERROR/NM_SECRET_AGENT_ERROR_AGENT_CANCELED
+	 * error to that callback.
+	 */
+	void (*cancel_get_secrets) (NMSecretAgent *agent,
+	                            const char *connection_path,
+	                            const char *setting_name);
+
+	/* Called when the subclass should save the secrets contained in the
+	 * connection to backing storage.  Subclass must copy or reference any
+	 * arguments it may require after returning from this method, as the
+	 * arguments will freed (except for 'agent', 'callback', and 'callback_data'
+	 * of course).
+	 */
+	void (*save_secrets) (NMSecretAgent *agent,
+	                      NMConnection *connection,
+	                      const char *connection_path,
+	                      NMSecretAgentSaveSecretsFunc callback,
+	                      gpointer callback_data);
+
+	/* Called when the subclass should delete the secrets contained in the
+	 * connection from backing storage.  Subclass must copy or reference any
+	 * arguments it may require after returning from this method, as the
+	 * arguments will freed (except for 'agent', 'callback', and 'callback_data'
+	 * of course).
+	 */
+	void (*delete_secrets) (NMSecretAgent *agent,
+	                        NMConnection *connection,
+	                        const char *connection_path,
+	                        NMSecretAgentDeleteSecretsFunc callback,
+	                        gpointer callback_data);
+
+	/* Signals */
+	void (*registration_result) (NMSecretAgent *agent, GError *error);
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+	void (*_reserved5) (void);
+	void (*_reserved6) (void);
+} NMSecretAgentClass;
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-secret-agent-get-type"></a><h3>nm_secret_agent_get_type ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               nm_secret_agent_get_type            (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-secret-agent-register"></a><h3>nm_secret_agent_register ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_secret_agent_register            (<em class="parameter"><code><a class="link" href="NMSecretAgent.html" title="NMSecretAgent"><span class="type">NMSecretAgent</span></a> *self</code></em>);</pre>
+<p>
+Registers the <a class="link" href="NMSecretAgent.html" title="NMSecretAgent"><span class="type">NMSecretAgent</span></a> with the NetworkManager secret manager,
+indicating to NetworkManager that the agent is able to provide and save
+secrets for connections on behalf of its user.  Registration is an
+asynchronous operation and its success or failure is indicated via the
+'registration-result' signal.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>self</code></em> :</span></p></td>
+<td>a <a class="link" href="NMSecretAgent.html" title="NMSecretAgent"><span class="type">NMSecretAgent</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>a new <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if registration was successfully requested (this does
+not mean registration itself was successful), <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if registration was not
+successfully requested.</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-secret-agent-unregister"></a><h3>nm_secret_agent_unregister ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_secret_agent_unregister          (<em class="parameter"><code><a class="link" href="NMSecretAgent.html" title="NMSecretAgent"><span class="type">NMSecretAgent</span></a> *self</code></em>);</pre>
+<p>
+Unregisters the <a class="link" href="NMSecretAgent.html" title="NMSecretAgent"><span class="type">NMSecretAgent</span></a> with the NetworkManager secret manager,
+indicating to NetworkManager that the agent is will no longer provide or
+store secrets on behalf of this user.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>self</code></em> :</span></p></td>
+<td>a <a class="link" href="NMSecretAgent.html" title="NMSecretAgent"><span class="type">NMSecretAgent</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>a new <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if unregistration was successful, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if it was not.</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-secret-agent-get-secrets"></a><h3>nm_secret_agent_get_secrets ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                nm_secret_agent_get_secrets         (<em class="parameter"><code><a class="link" href="NMSecretAgent.html" title="NMSecretAgent"><span class="type">NMSecretAgent</span></a> *self</code></em>,
+                                                         <em class="parameter"><code><span class="type">NMConnection</span> *connection</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *setting_name</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> **hints</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="NMSecretAgent.html#NMSecretAgentGetSecretsFlags" title="enum NMSecretAgentGetSecretsFlags"><span class="type">NMSecretAgentGetSecretsFlags</span></a> flags</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="NMSecretAgent.html#NMSecretAgentGetSecretsFunc" title="NMSecretAgentGetSecretsFunc ()"><span class="type">NMSecretAgentGetSecretsFunc</span></a> callback</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> callback_data</code></em>);</pre>
+<p>
+Asyncronously retrieve secrets belonging to <em class="parameter"><code>connection</code></em> for the
+setting <em class="parameter"><code>setting_name</code></em>.  <em class="parameter"><code>flags</code></em> indicate specific behavior that the secret
+agent should use when performing the request, for example returning only
+existing secrets without user interaction, or requesting entirely new
+secrets from the user.
+</p>
+<p>
+VFunc: get_secrets
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>self</code></em> :</span></p></td>
+<td>a <a class="link" href="NMSecretAgent.html" title="NMSecretAgent"><span class="type">NMSecretAgent</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
+<td>the <span class="type">NMConnection</span> for which we're asked secrets</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>setting_name</code></em> :</span></p></td>
+<td>the name of the secret setting</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>hints</code></em> :</span></p></td>
+<td>hints to the agent. <span class="annotation">[<acronym title="Parameter points to an array of items."><span class="acronym">array</span></acronym> zero-terminated=1]</span>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>flags</code></em> :</span></p></td>
+<td>flags that modify the behavior of the request</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>callback</code></em> :</span></p></td>
+<td>a callback, invoked when the operation is done. <span class="annotation">[<acronym title="The callback is valid until first called."><span class="acronym">scope async</span></acronym>]</span>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>callback_data</code></em> :</span></p></td>
+<td>. <span class="annotation">[<acronym title="This parameter is a 'user_data', for callbacks; many bindings can pass NULL here."><span class="acronym">closure</span></acronym>]</span>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-secret-agent-save-secrets"></a><h3>nm_secret_agent_save_secrets ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                nm_secret_agent_save_secrets        (<em class="parameter"><code><a class="link" href="NMSecretAgent.html" title="NMSecretAgent"><span class="type">NMSecretAgent</span></a> *self</code></em>,
+                                                         <em class="parameter"><code><span class="type">NMConnection</span> *connection</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="NMSecretAgent.html#NMSecretAgentSaveSecretsFunc" title="NMSecretAgentSaveSecretsFunc ()"><span class="type">NMSecretAgentSaveSecretsFunc</span></a> callback</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> callback_data</code></em>);</pre>
+<p>
+Asyncronously ensure that all secrets inside <em class="parameter"><code>connection</code></em>
+are stored to disk.
+</p>
+<p>
+VFunc: save_secrets
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>self</code></em> :</span></p></td>
+<td>a <a class="link" href="NMSecretAgent.html" title="NMSecretAgent"><span class="type">NMSecretAgent</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
+<td>a <span class="type">NMConnection</span>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>callback</code></em> :</span></p></td>
+<td>a callback, invoked when the operation is done. <span class="annotation">[<acronym title="The callback is valid until first called."><span class="acronym">scope async</span></acronym>]</span>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>callback_data</code></em> :</span></p></td>
+<td>. <span class="annotation">[<acronym title="This parameter is a 'user_data', for callbacks; many bindings can pass NULL here."><span class="acronym">closure</span></acronym>]</span>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-secret-agent-delete-secrets"></a><h3>nm_secret_agent_delete_secrets ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                nm_secret_agent_delete_secrets      (<em class="parameter"><code><a class="link" href="NMSecretAgent.html" title="NMSecretAgent"><span class="type">NMSecretAgent</span></a> *self</code></em>,
+                                                         <em class="parameter"><code><span class="type">NMConnection</span> *connection</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="NMSecretAgent.html#NMSecretAgentDeleteSecretsFunc" title="NMSecretAgentDeleteSecretsFunc ()"><span class="type">NMSecretAgentDeleteSecretsFunc</span></a> callback</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> callback_data</code></em>);</pre>
+<p>
+Asynchronously ask the agent to delete all saved secrets belonging to
+<em class="parameter"><code>connection</code></em>.
+</p>
+<p>
+VFunc: delete_secrets
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>self</code></em> :</span></p></td>
+<td>a <a class="link" href="NMSecretAgent.html" title="NMSecretAgent"><span class="type">NMSecretAgent</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
+<td>a <span class="type">NMConnection</span>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>callback</code></em> :</span></p></td>
+<td>a callback, invoked when the operation is done. <span class="annotation">[<acronym title="The callback is valid until first called."><span class="acronym">scope async</span></acronym>]</span>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>callback_data</code></em> :</span></p></td>
+<td>. <span class="annotation">[<acronym title="This parameter is a 'user_data', for callbacks; many bindings can pass NULL here."><span class="acronym">closure</span></acronym>]</span>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<div class="refsect1">
+<a name="NMSecretAgent.property-details"></a><h2>Property Details</h2>
+<div class="refsect2">
+<a name="NMSecretAgent--auto-register"></a><h3>The <code class="literal">"auto-register"</code> property</h3>
+<pre class="programlisting">  "auto-register"            <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write / Construct</pre>
+<p>
+If TRUE, the agent will attempt to automatically register itself after
+it is created (via an idle handler) and to re-register itself if
+NetworkManager restarts.  If FALSE, the agent does not automatically
+register with NetworkManager, and <a class="link" href="NMSecretAgent.html#nm-secret-agent-register" title="nm_secret_agent_register ()"><code class="function">nm_secret_agent_register()</code></a> must be
+called.  If 'auto-register' is TRUE, calling <a class="link" href="NMSecretAgent.html#nm-secret-agent-unregister" title="nm_secret_agent_unregister ()"><code class="function">nm_secret_agent_unregister()</code></a>
+will suppress auto-registration until <a class="link" href="NMSecretAgent.html#nm-secret-agent-register" title="nm_secret_agent_register ()"><code class="function">nm_secret_agent_register()</code></a> is
+called, which re-enables auto-registration.
+</p>
+<p>Default value: TRUE</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMSecretAgent--identifier"></a><h3>The <code class="literal">"identifier"</code> property</h3>
+<pre class="programlisting">  "identifier"               <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write / Construct Only</pre>
+<p>
+Identifies this agent; only one agent in each user session may use the
+same identifier.  Identifier formatting follows the same rules as
+D-Bus bus names with the exception that the ':' character is not
+allowed.  The valid set of characters is "[A-Z][a-z][0-9]_-." and the
+identifier is limited in length to 255 characters with a minimum
+of 3 characters.  An example valid identifier is 'org.gnome.nm-applet'
+(without quotes).
+</p>
+<p>Default value: NULL</p>
+</div>
+</div>
+<div class="refsect1">
+<a name="NMSecretAgent.signal-details"></a><h2>Signal Details</h2>
+<div class="refsect2">
+<a name="NMSecretAgent-registration-result"></a><h3>The <code class="literal">"registration-result"</code> signal</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                user_function                      (<a class="link" href="NMSecretAgent.html" title="NMSecretAgent"><span class="type">NMSecretAgent</span></a> *agent,
+                                                        <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>       error,
+                                                        <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>       user_data)      : <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-FIRST:CAPS"><code class="literal">Run First</code></a></pre>
+<p>
+Indicates the result of a registration request; if <em class="parameter"><code>error</code></em> is NULL the
+request was successful.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>agent</code></em> :</span></p></td>
+<td>the agent that received the signal</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
+<td>the error, if any, that occured while registering</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
+<td>user data set when the signal handler was connected.</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+</div>
+<div class="footer">
+<hr>
+          Generated by GTK-Doc V1.17</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMSerialDevice.html b/docs/libnm-glib/html/NMSerialDevice.html
deleted file mode 100644
index 1b749ed7e..000000000
--- a/docs/libnm-glib/html/NMSerialDevice.html
+++ /dev/null
@@ -1,192 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>NMSerialDevice</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
-<link rel="home" href="index.html" title="libnm-glib Reference Manual">
-<link rel="up" href="ch01.html" title="libnm-glib Objects">
-<link rel="prev" href="NMDeviceWifi.html" title="NMDeviceWifi">
-<link rel="next" href="NMGsmDevice.html" title="NMGsmDevice">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
-<link rel="stylesheet" href="style.css" type="text/css">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
-<tr valign="middle">
-<td><a accesskey="p" href="NMDeviceWifi.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="ch01.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">libnm-glib Reference Manual</th>
-<td><a accesskey="n" href="NMGsmDevice.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
-</tr>
-<tr><td colspan="5" class="shortcuts">
-<a href="#NMSerialDevice.synopsis" class="shortcut">Top</a>
-                   | 
-                  <a href="#NMSerialDevice.description" class="shortcut">Description</a>
-                   | 
-                  <a href="#NMSerialDevice.object-hierarchy" class="shortcut">Object Hierarchy</a>
-                   | 
-                  <a href="#NMSerialDevice.signals" class="shortcut">Signals</a>
-</td></tr>
-</table>
-<div class="refentry" title="NMSerialDevice">
-<a name="NMSerialDevice"></a><div class="titlepage"></div>
-<div class="refnamediv"><table width="100%"><tr>
-<td valign="top">
-<h2><span class="refentrytitle"><a name="NMSerialDevice.top_of_page"></a>NMSerialDevice</span></h2>
-<p>NMSerialDevice</p>
-</td>
-<td valign="top" align="right"></td>
-</tr></table></div>
-<div class="refsynopsisdiv" title="Synopsis">
-<a name="NMSerialDevice.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">                    <a class="link" href="NMSerialDevice.html#NMSerialDevice-struct" title="NMSerialDevice">NMSerialDevice</a>;
-                    <a class="link" href="NMSerialDevice.html#NMSerialDeviceClass" title="NMSerialDeviceClass">NMSerialDeviceClass</a>;
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             <a class="link" href="NMSerialDevice.html#nm-serial-device-get-bytes-received" title="nm_serial_device_get_bytes_received ()">nm_serial_device_get_bytes_received</a> (<em class="parameter"><code><a class="link" href="NMSerialDevice.html" title="NMSerialDevice"><span class="type">NMSerialDevice</span></a> *self</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             <a class="link" href="NMSerialDevice.html#nm-serial-device-get-bytes-sent" title="nm_serial_device_get_bytes_sent ()">nm_serial_device_get_bytes_sent</a>     (<em class="parameter"><code><a class="link" href="NMSerialDevice.html" title="NMSerialDevice"><span class="type">NMSerialDevice</span></a> *self</code></em>);
-</pre>
-</div>
-<div class="refsect1" title="Object Hierarchy">
-<a name="NMSerialDevice.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="synopsis">
-  <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>
-   +----<a class="link" href="NMObject.html" title="NMObject">NMObject</a>
-         +----<a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
-               +----NMSerialDevice
-                     +----<a class="link" href="NMCdmaDevice.html" title="NMCdmaDevice">NMCdmaDevice</a>
-                     +----<a class="link" href="NMGsmDevice.html" title="NMGsmDevice">NMGsmDevice</a>
-</pre>
-</div>
-<div class="refsect1" title="Signals">
-<a name="NMSerialDevice.signals"></a><h2>Signals</h2>
-<pre class="synopsis">
-  "<a class="link" href="NMSerialDevice.html#NMSerialDevice-ppp-stats" title='The "ppp-stats" signal'>ppp-stats</a>"                                      : Run First
-</pre>
-</div>
-<div class="refsect1" title="Description">
-<a name="NMSerialDevice.description"></a><h2>Description</h2>
-<p>
-</p>
-</div>
-<div class="refsect1" title="Details">
-<a name="NMSerialDevice.details"></a><h2>Details</h2>
-<div class="refsect2" title="NMSerialDevice">
-<a name="NMSerialDevice-struct"></a><h3>NMSerialDevice</h3>
-<pre class="programlisting">typedef struct _NMSerialDevice NMSerialDevice;</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="NMSerialDeviceClass">
-<a name="NMSerialDeviceClass"></a><h3>NMSerialDeviceClass</h3>
-<pre class="programlisting">typedef struct {
-	NMDeviceClass parent;
-
-	/* Signals */
-	void (*ppp_stats) (NMSerialDevice *self, guint32 in_bytes, guint32 out_bytes);
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-	void (*_reserved5) (void);
-	void (*_reserved6) (void);
-} NMSerialDeviceClass;
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="nm_serial_device_get_bytes_received ()">
-<a name="nm-serial-device-get-bytes-received"></a><h3>nm_serial_device_get_bytes_received ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_serial_device_get_bytes_received (<em class="parameter"><code><a class="link" href="NMSerialDevice.html" title="NMSerialDevice"><span class="type">NMSerialDevice</span></a> *self</code></em>);</pre>
-<p>
-Gets the amount of bytes received by the serial device.
-This counter is reset when the device is activated.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>self</code></em> :</span></p></td>
-<td>a <a class="link" href="NMSerialDevice.html" title="NMSerialDevice"><span class="type">NMSerialDevice</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> bytes received
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_serial_device_get_bytes_sent ()">
-<a name="nm-serial-device-get-bytes-sent"></a><h3>nm_serial_device_get_bytes_sent ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_serial_device_get_bytes_sent     (<em class="parameter"><code><a class="link" href="NMSerialDevice.html" title="NMSerialDevice"><span class="type">NMSerialDevice</span></a> *self</code></em>);</pre>
-<p>
-Gets the amount of bytes sent by the serial device.
-This counter is reset when the device is activated.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>self</code></em> :</span></p></td>
-<td>a <a class="link" href="NMSerialDevice.html" title="NMSerialDevice"><span class="type">NMSerialDevice</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> bytes sent
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-</div>
-<div class="refsect1" title="Signal Details">
-<a name="NMSerialDevice.signal-details"></a><h2>Signal Details</h2>
-<div class="refsect2" title='The "ppp-stats" signal'>
-<a name="NMSerialDevice-ppp-stats"></a><h3>The <code class="literal">"ppp-stats"</code> signal</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                user_function                      (<a class="link" href="NMSerialDevice.html" title="NMSerialDevice"><span class="type">NMSerialDevice</span></a> *device,
-                                                        <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>           in_bytes,
-                                                        <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>           out_bytes,
-                                                        <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>        user_data)      : Run First</pre>
-<p>
-Notifies that a <a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a> is added to the wifi device.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>device</code></em> :</span></p></td>
-<td>the serial device that received the signal
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>in_bytes</code></em> :</span></p></td>
-<td>the amount of bytes received
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>out_bytes</code></em> :</span></p></td>
-<td>the amount of bytes sent
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
-<td>user data set when the signal handler was connected.</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-</div>
-</div>
-<div class="footer">
-<hr>
-          Generated by GTK-Doc V1.15</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMVPNConnection.html b/docs/libnm-glib/html/NMVPNConnection.html
index fa9961a58..3f547734e 100644
--- a/docs/libnm-glib/html/NMVPNConnection.html
+++ b/docs/libnm-glib/html/NMVPNConnection.html
@@ -3,19 +3,19 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>NMVPNConnection</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="libnm-glib Reference Manual">
-<link rel="up" href="ch01.html" title="libnm-glib Objects">
-<link rel="prev" href="libnm-glib-nm-types.html" title="nm-types">
+<link rel="up" href="ch02.html" title="libnm-glib API Reference">
+<link rel="prev" href="NMSecretAgent.html" title="NMSecretAgent">
 <link rel="next" href="libnm-glib-NMVPNPlugin.html" title="NMVPNPlugin">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
 <tr valign="middle">
-<td><a accesskey="p" href="libnm-glib-nm-types.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="ch01.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="NMSecretAgent.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
+<td><a accesskey="u" href="ch02.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
 <th width="100%" align="center">libnm-glib Reference Manual</th>
 <td><a accesskey="n" href="libnm-glib-NMVPNPlugin.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
@@ -32,7 +32,7 @@
                   <a href="#NMVPNConnection.signals" class="shortcut">Signals</a>
 </td></tr>
 </table>
-<div class="refentry" title="NMVPNConnection">
+<div class="refentry">
 <a name="NMVPNConnection"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
@@ -41,19 +41,19 @@
 </td>
 <td valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv" title="Synopsis">
+<div class="refsynopsisdiv">
 <a name="NMVPNConnection.synopsis"></a><h2>Synopsis</h2>
 <pre class="synopsis">#define             <a class="link" href="NMVPNConnection.html#NM-VPN-CONNECTION-VPN-STATE:CAPS" title="NM_VPN_CONNECTION_VPN_STATE">NM_VPN_CONNECTION_VPN_STATE</a>
 #define             <a class="link" href="NMVPNConnection.html#NM-VPN-CONNECTION-BANNER:CAPS" title="NM_VPN_CONNECTION_BANNER">NM_VPN_CONNECTION_BANNER</a>
                     <a class="link" href="NMVPNConnection.html#NMVPNConnection-struct" title="NMVPNConnection">NMVPNConnection</a>;
                     <a class="link" href="NMVPNConnection.html#NMVPNConnectionClass" title="NMVPNConnectionClass">NMVPNConnectionClass</a>;
-<a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="returnvalue">GObject</span></a> *           <a class="link" href="NMVPNConnection.html#nm-vpn-connection-new" title="nm_vpn_connection_new ()">nm_vpn_connection_new</a>               (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGConnection.html#DBusGConnection"><span class="type">DBusGConnection</span></a> *dbus_connection</code></em>,
+<a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="returnvalue">GObject</span></a> *           <a class="link" href="NMVPNConnection.html#nm-vpn-connection-new" title="nm_vpn_connection_new ()">nm_vpn_connection_new</a>               (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGConnection.html#DBusGConnection"><span class="type">DBusGConnection</span></a> *connection</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *path</code></em>);
 <span class="returnvalue">NMVPNConnectionState</span>  <a class="link" href="NMVPNConnection.html#nm-vpn-connection-get-vpn-state" title="nm_vpn_connection_get_vpn_state ()">nm_vpn_connection_get_vpn_state</a>   (<em class="parameter"><code><a class="link" href="NMVPNConnection.html" title="NMVPNConnection"><span class="type">NMVPNConnection</span></a> *vpn</code></em>);
-const <span class="returnvalue">char</span> *        <a class="link" href="NMVPNConnection.html#nm-vpn-connection-get-banner" title="nm_vpn_connection_get_banner ()">nm_vpn_connection_get_banner</a>        (<em class="parameter"><code><a class="link" href="NMVPNConnection.html" title="NMVPNConnection"><span class="type">NMVPNConnection</span></a> *vpn</code></em>);
+const <span class="returnvalue">char</span> *           <a class="link" href="NMVPNConnection.html#nm-vpn-connection-get-banner" title="nm_vpn_connection_get_banner ()">nm_vpn_connection_get_banner</a>     (<em class="parameter"><code><a class="link" href="NMVPNConnection.html" title="NMVPNConnection"><span class="type">NMVPNConnection</span></a> *vpn</code></em>);
 </pre>
 </div>
-<div class="refsect1" title="Object Hierarchy">
+<div class="refsect1">
 <a name="NMVPNConnection.object-hierarchy"></a><h2>Object Hierarchy</h2>
 <pre class="synopsis">
   <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>
@@ -62,27 +62,27 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMVPN
                +----NMVPNConnection
 </pre>
 </div>
-<div class="refsect1" title="Properties">
+<div class="refsect1">
 <a name="NMVPNConnection.properties"></a><h2>Properties</h2>
 <pre class="synopsis">
   "<a class="link" href="NMVPNConnection.html#NMVPNConnection--banner" title='The "banner" property'>banner</a>"                   <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read
   "<a class="link" href="NMVPNConnection.html#NMVPNConnection--vpn-state" title='The "vpn-state" property'>vpn-state</a>"                <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read
 </pre>
 </div>
-<div class="refsect1" title="Signals">
+<div class="refsect1">
 <a name="NMVPNConnection.signals"></a><h2>Signals</h2>
 <pre class="synopsis">
-  "<a class="link" href="NMVPNConnection.html#NMVPNConnection-vpn-state-changed" title='The "vpn-state-changed" signal'>vpn-state-changed</a>"                              : Run First
+  "<a class="link" href="NMVPNConnection.html#NMVPNConnection-vpn-state-changed" title='The "vpn-state-changed" signal'>vpn-state-changed</a>"                              : <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-FIRST:CAPS"><code class="literal">Run First</code></a>
 </pre>
 </div>
-<div class="refsect1" title="Description">
+<div class="refsect1">
 <a name="NMVPNConnection.description"></a><h2>Description</h2>
 <p>
 </p>
 </div>
-<div class="refsect1" title="Details">
+<div class="refsect1">
 <a name="NMVPNConnection.details"></a><h2>Details</h2>
-<div class="refsect2" title="NM_VPN_CONNECTION_VPN_STATE">
+<div class="refsect2">
 <a name="NM-VPN-CONNECTION-VPN-STATE:CAPS"></a><h3>NM_VPN_CONNECTION_VPN_STATE</h3>
 <pre class="programlisting">#define NM_VPN_CONNECTION_VPN_STATE "vpn-state"
 </pre>
@@ -90,7 +90,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMVPN
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_VPN_CONNECTION_BANNER">
+<div class="refsect2">
 <a name="NM-VPN-CONNECTION-BANNER:CAPS"></a><h3>NM_VPN_CONNECTION_BANNER</h3>
 <pre class="programlisting">#define NM_VPN_CONNECTION_BANNER "banner"
 </pre>
@@ -98,14 +98,14 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMVPN
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMVPNConnection">
+<div class="refsect2">
 <a name="NMVPNConnection-struct"></a><h3>NMVPNConnection</h3>
 <pre class="programlisting">typedef struct _NMVPNConnection NMVPNConnection;</pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMVPNConnectionClass">
+<div class="refsect2">
 <a name="NMVPNConnectionClass"></a><h3>NMVPNConnectionClass</h3>
 <pre class="programlisting">typedef struct {
 	NMActiveConnectionClass parent;
@@ -128,81 +128,51 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMVPN
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_vpn_connection_new ()">
+<div class="refsect2">
 <a name="nm-vpn-connection-new"></a><h3>nm_vpn_connection_new ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="returnvalue">GObject</span></a> *           nm_vpn_connection_new               (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGConnection.html#DBusGConnection"><span class="type">DBusGConnection</span></a> *dbus_connection</code></em>,
+<pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="returnvalue">GObject</span></a> *           nm_vpn_connection_new               (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGConnection.html#DBusGConnection"><span class="type">DBusGConnection</span></a> *connection</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *path</code></em>);</pre>
 <p>
+Creates a new <a class="link" href="NMVPNConnection.html" title="NMVPNConnection"><span class="type">NMVPNConnection</span></a>.
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>dbus_connection</code></em> :</span></p></td>
-<td>
+<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
+<td>the <a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGConnection.html#DBusGConnection"><span class="type">DBusGConnection</span></a>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>path</code></em> :</span></p></td>
-<td>
-</td>
+<td>the DBus object path of the new connection</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
+<td>a new connection object. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_vpn_connection_get_vpn_state ()">
+<div class="refsect2">
 <a name="nm-vpn-connection-get-vpn-state"></a><h3>nm_vpn_connection_get_vpn_state ()</h3>
 <pre class="programlisting"><span class="returnvalue">NMVPNConnectionState</span>  nm_vpn_connection_get_vpn_state   (<em class="parameter"><code><a class="link" href="NMVPNConnection.html" title="NMVPNConnection"><span class="type">NMVPNConnection</span></a> *vpn</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>vpn</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_vpn_connection_get_banner ()">
+<div class="refsect2">
 <a name="nm-vpn-connection-get-banner"></a><h3>nm_vpn_connection_get_banner ()</h3>
-<pre class="programlisting">const <span class="returnvalue">char</span> *        nm_vpn_connection_get_banner        (<em class="parameter"><code><a class="link" href="NMVPNConnection.html" title="NMVPNConnection"><span class="type">NMVPNConnection</span></a> *vpn</code></em>);</pre>
+<pre class="programlisting">const <span class="returnvalue">char</span> *           nm_vpn_connection_get_banner     (<em class="parameter"><code><a class="link" href="NMVPNConnection.html" title="NMVPNConnection"><span class="type">NMVPNConnection</span></a> *vpn</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>vpn</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 </div>
-<div class="refsect1" title="Property Details">
+<div class="refsect1">
 <a name="NMVPNConnection.property-details"></a><h2>Property Details</h2>
-<div class="refsect2" title='The "banner" property'>
+<div class="refsect2">
 <a name="NMVPNConnection--banner"></a><h3>The <code class="literal">"banner"</code> property</h3>
 <pre class="programlisting">  "banner"                   <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read</pre>
 <p>
@@ -211,7 +181,7 @@ The VPN login banner of the active VPN connection.
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "vpn-state" property'>
+<div class="refsect2">
 <a name="NMVPNConnection--vpn-state"></a><h3>The <code class="literal">"vpn-state"</code> property</h3>
 <pre class="programlisting">  "vpn-state"                <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read</pre>
 <p>
@@ -221,14 +191,14 @@ The VPN state of the active VPN connection.
 <p>Default value: 0</p>
 </div>
 </div>
-<div class="refsect1" title="Signal Details">
+<div class="refsect1">
 <a name="NMVPNConnection.signal-details"></a><h2>Signal Details</h2>
-<div class="refsect2" title='The "vpn-state-changed" signal'>
+<div class="refsect2">
 <a name="NMVPNConnection-vpn-state-changed"></a><h3>The <code class="literal">"vpn-state-changed"</code> signal</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                user_function                      (<a class="link" href="NMVPNConnection.html" title="NMVPNConnection"><span class="type">NMVPNConnection</span></a> *nmvpnconnection,
                                                         <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>            arg1,
                                                         <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>            arg2,
-                                                        <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>         user_data)            : Run First</pre>
+                                                        <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>         user_data)            : <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-FIRST:CAPS"><code class="literal">Run First</code></a></pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -236,18 +206,7 @@ The VPN state of the active VPN connection.
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>nmvpnconnection</code></em> :</span></p></td>
-<td>the object which received the signal.
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>arg1</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>arg2</code></em> :</span></p></td>
-<td>
-</td>
+<td>the object which received the signal.</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
@@ -260,6 +219,6 @@ The VPN state of the active VPN connection.
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.15</div>
+          Generated by GTK-Doc V1.17</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMWimaxNsp.html b/docs/libnm-glib/html/NMWimaxNsp.html
new file mode 100644
index 000000000..e243c6da5
--- /dev/null
+++ b/docs/libnm-glib/html/NMWimaxNsp.html
@@ -0,0 +1,306 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>NMWimaxNsp</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<link rel="home" href="index.html" title="libnm-glib Reference Manual">
+<link rel="up" href="ch02.html" title="libnm-glib API Reference">
+<link rel="prev" href="NMDeviceWimax.html" title="NMDeviceWimax">
+<link rel="next" href="NMAccessPoint.html" title="NMAccessPoint">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
+<tr valign="middle">
+<td><a accesskey="p" href="NMDeviceWimax.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
+<td><a accesskey="u" href="ch02.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
+<th width="100%" align="center">libnm-glib Reference Manual</th>
+<td><a accesskey="n" href="NMAccessPoint.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+</tr>
+<tr><td colspan="5" class="shortcuts">
+<a href="#NMWimaxNsp.synopsis" class="shortcut">Top</a>
+                   | 
+                  <a href="#NMWimaxNsp.description" class="shortcut">Description</a>
+                   | 
+                  <a href="#NMWimaxNsp.object-hierarchy" class="shortcut">Object Hierarchy</a>
+                   | 
+                  <a href="#NMWimaxNsp.properties" class="shortcut">Properties</a>
+</td></tr>
+</table>
+<div class="refentry">
+<a name="NMWimaxNsp"></a><div class="titlepage"></div>
+<div class="refnamediv"><table width="100%"><tr>
+<td valign="top">
+<h2><span class="refentrytitle"><a name="NMWimaxNsp.top_of_page"></a>NMWimaxNsp</span></h2>
+<p>NMWimaxNsp</p>
+</td>
+<td valign="top" align="right"></td>
+</tr></table></div>
+<div class="refsynopsisdiv">
+<a name="NMWimaxNsp.synopsis"></a><h2>Synopsis</h2>
+<pre class="synopsis">#define             <a class="link" href="NMWimaxNsp.html#NM-WIMAX-NSP-NAME:CAPS" title="NM_WIMAX_NSP_NAME">NM_WIMAX_NSP_NAME</a>
+#define             <a class="link" href="NMWimaxNsp.html#NM-WIMAX-NSP-SIGNAL-QUALITY:CAPS" title="NM_WIMAX_NSP_SIGNAL_QUALITY">NM_WIMAX_NSP_SIGNAL_QUALITY</a>
+#define             <a class="link" href="NMWimaxNsp.html#NM-WIMAX-NSP-NETWORK-TYPE:CAPS" title="NM_WIMAX_NSP_NETWORK_TYPE">NM_WIMAX_NSP_NETWORK_TYPE</a>
+enum                <a class="link" href="NMWimaxNsp.html#NMWimaxNspNetworkType" title="enum NMWimaxNspNetworkType">NMWimaxNspNetworkType</a>;
+                    <a class="link" href="NMWimaxNsp.html#NMWimaxNsp-struct" title="NMWimaxNsp">NMWimaxNsp</a>;
+                    <a class="link" href="NMWimaxNsp.html#NMWimaxNspClass" title="NMWimaxNspClass">NMWimaxNspClass</a>;
+<a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="returnvalue">GObject</span></a> *           <a class="link" href="NMWimaxNsp.html#nm-wimax-nsp-new" title="nm_wimax_nsp_new ()">nm_wimax_nsp_new</a>                    (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGConnection.html#DBusGConnection"><span class="type">DBusGConnection</span></a> *connection</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *path</code></em>);
+const <span class="returnvalue">char</span> *        <a class="link" href="NMWimaxNsp.html#nm-wimax-nsp-get-name" title="nm_wimax_nsp_get_name ()">nm_wimax_nsp_get_name</a>               (<em class="parameter"><code><a class="link" href="NMWimaxNsp.html" title="NMWimaxNsp"><span class="type">NMWimaxNsp</span></a> *nsp</code></em>);
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             <a class="link" href="NMWimaxNsp.html#nm-wimax-nsp-get-signal-quality" title="nm_wimax_nsp_get_signal_quality ()">nm_wimax_nsp_get_signal_quality</a>     (<em class="parameter"><code><a class="link" href="NMWimaxNsp.html" title="NMWimaxNsp"><span class="type">NMWimaxNsp</span></a> *nsp</code></em>);
+<a class="link" href="NMWimaxNsp.html#NMWimaxNspNetworkType" title="enum NMWimaxNspNetworkType"><span class="returnvalue">NMWimaxNspNetworkType</span></a>  <a class="link" href="NMWimaxNsp.html#nm-wimax-nsp-get-network-type" title="nm_wimax_nsp_get_network_type ()">nm_wimax_nsp_get_network_type</a>    (<em class="parameter"><code><a class="link" href="NMWimaxNsp.html" title="NMWimaxNsp"><span class="type">NMWimaxNsp</span></a> *nsp</code></em>);
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="returnvalue">GSList</span></a> *                <a class="link" href="NMWimaxNsp.html#nm-wimax-nsp-filter-connections" title="nm_wimax_nsp_filter_connections ()">nm_wimax_nsp_filter_connections</a> (<em class="parameter"><code><a class="link" href="NMWimaxNsp.html" title="NMWimaxNsp"><span class="type">NMWimaxNsp</span></a> *nsp</code></em>,
+                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> *connections</code></em>);
+</pre>
+</div>
+<div class="refsect1">
+<a name="NMWimaxNsp.object-hierarchy"></a><h2>Object Hierarchy</h2>
+<pre class="synopsis">
+  <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>
+   +----<a class="link" href="NMObject.html" title="NMObject">NMObject</a>
+         +----NMWimaxNsp
+</pre>
+</div>
+<div class="refsect1">
+<a name="NMWimaxNsp.properties"></a><h2>Properties</h2>
+<pre class="synopsis">
+  "<a class="link" href="NMWimaxNsp.html#NMWimaxNsp--name" title='The "name" property'>name</a>"                     <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read
+  "<a class="link" href="NMWimaxNsp.html#NMWimaxNsp--network-type" title='The "network-type" property'>network-type</a>"             <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read
+  "<a class="link" href="NMWimaxNsp.html#NMWimaxNsp--signal-quality" title='The "signal-quality" property'>signal-quality</a>"           <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read
+</pre>
+</div>
+<div class="refsect1">
+<a name="NMWimaxNsp.description"></a><h2>Description</h2>
+<p>
+</p>
+</div>
+<div class="refsect1">
+<a name="NMWimaxNsp.details"></a><h2>Details</h2>
+<div class="refsect2">
+<a name="NM-WIMAX-NSP-NAME:CAPS"></a><h3>NM_WIMAX_NSP_NAME</h3>
+<pre class="programlisting">#define NM_WIMAX_NSP_NAME           "name"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-WIMAX-NSP-SIGNAL-QUALITY:CAPS"></a><h3>NM_WIMAX_NSP_SIGNAL_QUALITY</h3>
+<pre class="programlisting">#define NM_WIMAX_NSP_SIGNAL_QUALITY "signal-quality"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-WIMAX-NSP-NETWORK-TYPE:CAPS"></a><h3>NM_WIMAX_NSP_NETWORK_TYPE</h3>
+<pre class="programlisting">#define NM_WIMAX_NSP_NETWORK_TYPE   "network-type"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMWimaxNspNetworkType"></a><h3>enum NMWimaxNspNetworkType</h3>
+<pre class="programlisting">typedef enum {
+	NM_WIMAX_NSP_NETWORK_TYPE_UNKNOWN         = 0,
+	NM_WIMAX_NSP_NETWORK_TYPE_HOME            = 1,
+	NM_WIMAX_NSP_NETWORK_TYPE_PARTNER         = 2,
+	NM_WIMAX_NSP_NETWORK_TYPE_ROAMING_PARTNER = 3
+} NMWimaxNspNetworkType;
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMWimaxNsp-struct"></a><h3>NMWimaxNsp</h3>
+<pre class="programlisting">typedef struct _NMWimaxNsp NMWimaxNsp;</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMWimaxNspClass"></a><h3>NMWimaxNspClass</h3>
+<pre class="programlisting">typedef struct {
+	NMObjectClass parent;
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+	void (*_reserved5) (void);
+	void (*_reserved6) (void);
+} NMWimaxNspClass;
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-wimax-nsp-new"></a><h3>nm_wimax_nsp_new ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="returnvalue">GObject</span></a> *           nm_wimax_nsp_new                    (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGConnection.html#DBusGConnection"><span class="type">DBusGConnection</span></a> *connection</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *path</code></em>);</pre>
+<p>
+Creates a new <a class="link" href="NMWimaxNsp.html" title="NMWimaxNsp"><span class="type">NMWimaxNsp</span></a>.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
+<td>the <a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGConnection.html#DBusGConnection"><span class="type">DBusGConnection</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>path</code></em> :</span></p></td>
+<td>the D-Bus object path of the WiMAX NSP</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>a new WiMAX NSP. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-wimax-nsp-get-name"></a><h3>nm_wimax_nsp_get_name ()</h3>
+<pre class="programlisting">const <span class="returnvalue">char</span> *        nm_wimax_nsp_get_name               (<em class="parameter"><code><a class="link" href="NMWimaxNsp.html" title="NMWimaxNsp"><span class="type">NMWimaxNsp</span></a> *nsp</code></em>);</pre>
+<p>
+Gets the name of the wimax NSP
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>nsp</code></em> :</span></p></td>
+<td>a <a class="link" href="NMWimaxNsp.html" title="NMWimaxNsp"><span class="type">NMWimaxNsp</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>the name</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-wimax-nsp-get-signal-quality"></a><h3>nm_wimax_nsp_get_signal_quality ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_wimax_nsp_get_signal_quality     (<em class="parameter"><code><a class="link" href="NMWimaxNsp.html" title="NMWimaxNsp"><span class="type">NMWimaxNsp</span></a> *nsp</code></em>);</pre>
+<p>
+Gets the WPA signal quality of the wimax NSP.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>nsp</code></em> :</span></p></td>
+<td>a <a class="link" href="NMWimaxNsp.html" title="NMWimaxNsp"><span class="type">NMWimaxNsp</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>the signal quality</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-wimax-nsp-get-network-type"></a><h3>nm_wimax_nsp_get_network_type ()</h3>
+<pre class="programlisting"><a class="link" href="NMWimaxNsp.html#NMWimaxNspNetworkType" title="enum NMWimaxNspNetworkType"><span class="returnvalue">NMWimaxNspNetworkType</span></a>  nm_wimax_nsp_get_network_type    (<em class="parameter"><code><a class="link" href="NMWimaxNsp.html" title="NMWimaxNsp"><span class="type">NMWimaxNsp</span></a> *nsp</code></em>);</pre>
+<p>
+Gets the network type of the wimax NSP.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>nsp</code></em> :</span></p></td>
+<td>a <a class="link" href="NMWimaxNsp.html" title="NMWimaxNsp"><span class="type">NMWimaxNsp</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>the network type</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-wimax-nsp-filter-connections"></a><h3>nm_wimax_nsp_filter_connections ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="returnvalue">GSList</span></a> *                nm_wimax_nsp_filter_connections (<em class="parameter"><code><a class="link" href="NMWimaxNsp.html" title="NMWimaxNsp"><span class="type">NMWimaxNsp</span></a> *nsp</code></em>,
+                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> *connections</code></em>);</pre>
+<p>
+Filters a given list of connections for a given <a class="link" href="NMWimaxNsp.html" title="NMWimaxNsp"><span class="type">NMWimaxNsp</span></a> object and
+return connections which may be activated with the access point.  Any
+returned connections will match the <em class="parameter"><code>nsp</code></em>'s network name and other attributes.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>nsp</code></em> :</span></p></td>
+<td>an <a class="link" href="NMWimaxNsp.html" title="NMWimaxNsp"><span class="type">NMWimaxNsp</span></a> to filter connections for</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>connections</code></em> :</span></p></td>
+<td>a list of <span class="type">NMConnection</span> objects to filter</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>a
+list of <span class="type">NMConnection</span> objects that could be activated with the given <em class="parameter"><code>nsp</code></em>.
+The elements of the list are owned by their creator and should not be freed
+by the caller, but the returned list itself is owned by the caller and should
+be freed with <a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#g-slist-free"><code class="function">g_slist_free()</code></a> when it is no longer required. <span class="annotation">[<acronym title="Free data container after the code is done."><span class="acronym">transfer container</span></acronym>][<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NetworkManager.Connection]</span>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<div class="refsect1">
+<a name="NMWimaxNsp.property-details"></a><h2>Property Details</h2>
+<div class="refsect2">
+<a name="NMWimaxNsp--name"></a><h3>The <code class="literal">"name"</code> property</h3>
+<pre class="programlisting">  "name"                     <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read</pre>
+<p>
+The name of the WiMAX NSP.
+</p>
+<p>Default value: NULL</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMWimaxNsp--network-type"></a><h3>The <code class="literal">"network-type"</code> property</h3>
+<pre class="programlisting">  "network-type"             <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read</pre>
+<p>
+The network type of the WiMAX NSP.
+</p>
+<p>Default value: 0</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMWimaxNsp--signal-quality"></a><h3>The <code class="literal">"signal-quality"</code> property</h3>
+<pre class="programlisting">  "signal-quality"           <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read</pre>
+<p>
+The signal quality of the WiMAX NSP.
+</p>
+<p>Allowed values: &lt;= 100</p>
+<p>Default value: 0</p>
+</div>
+</div>
+</div>
+<div class="footer">
+<hr>
+          Generated by GTK-Doc V1.17</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/annotation-glossary.html b/docs/libnm-glib/html/annotation-glossary.html
new file mode 100644
index 000000000..37e2673f2
--- /dev/null
+++ b/docs/libnm-glib/html/annotation-glossary.html
@@ -0,0 +1,86 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Annotation Glossary</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<link rel="home" href="index.html" title="libnm-glib Reference Manual">
+<link rel="up" href="index.html" title="libnm-glib Reference Manual">
+<link rel="prev" href="api-index-full.html" title="API Index">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
+<tr valign="middle">
+<td><a accesskey="p" href="api-index-full.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
+<td> </td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
+<th width="100%" align="center">libnm-glib Reference Manual</th>
+<td> </td>
+</tr>
+<tr><td colspan="5" class="shortcuts">
+<a class="shortcut" href="#glsO">O</a>
+                      | 
+                   <a class="shortcut" href="#glsS">S</a>
+                      | 
+                   <a class="shortcut" href="#glsA">A</a>
+                      | 
+                   <a class="shortcut" href="#glsC">C</a>
+                      | 
+                   <a class="shortcut" href="#glsT">T</a>
+                      | 
+                   <a class="shortcut" href="#glsA">A</a>
+                      | 
+                   <a class="shortcut" href="#glsE">E</a>
+                      | 
+                   <a class="shortcut" href="#glsT">T</a>
+</td></tr>
+</table>
+<div class="glossary">
+<div class="titlepage"><div><div><h2 class="title">
+<a name="annotation-glossary"></a>Annotation Glossary</h2></div></div></div>
+<a name="glsO"></a><h3 class="title">O</h3>
+<dt>
+<a name="annotation-glossterm-out"></a>out</dt>
+<dd><p>Parameter for returning results. Default is <acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>.</p></dd>
+<a name="glsS"></a><h3 class="title">S</h3>
+<dt>
+<a name="annotation-glossterm-scope%20async"></a>scope async</dt>
+<dd><p>The callback is valid until first called.</p></dd>
+<a name="glsA"></a><h3 class="title">A</h3>
+<dt>
+<a name="annotation-glossterm-allow-none"></a>allow-none</dt>
+<dd><p>NULL is ok, both for passing and for returning.</p></dd>
+<a name="glsC"></a><h3 class="title">C</h3>
+<dt>
+<a name="annotation-glossterm-closure"></a>closure</dt>
+<dd><p>This parameter is a 'user_data', for callbacks; many bindings can pass NULL here.</p></dd>
+<a name="glsT"></a><h3 class="title">T</h3>
+<dt>
+<a name="annotation-glossterm-transfer%20none"></a>transfer none</dt>
+<dd><p>Don't free data after the code is done.</p></dd>
+<a name="glsA"></a><h3 class="title">A</h3>
+<dt>
+<a name="annotation-glossterm-array"></a>array</dt>
+<dd><p>Parameter points to an array of items.</p></dd>
+<a name="glsE"></a><h3 class="title">E</h3>
+<dt>
+<a name="annotation-glossterm-element-type"></a>element-type</dt>
+<dd><p>Generics and defining elements of containers and arrays.</p></dd>
+<a name="glsT"></a><h3 class="title">T</h3>
+<dt>
+<a name="annotation-glossterm-transfer%20container"></a>transfer container</dt>
+<dd><p>Free data container after the code is done.</p></dd>
+<dt>
+<a name="annotation-glossterm-transfer%20full"></a>transfer full</dt>
+<dd><p>Free data after the code is done.</p></dd>
+<dt>
+<a name="annotation-glossterm-type"></a>type</dt>
+<dd><p>Override the parsed C type with given type</p></dd>
+</div>
+<div class="footer">
+<hr>
+          Generated by GTK-Doc V1.17</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/api-index-full.html b/docs/libnm-glib/html/api-index-full.html
new file mode 100644
index 000000000..d592d729d
--- /dev/null
+++ b/docs/libnm-glib/html/api-index-full.html
@@ -0,0 +1,1965 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>API Index</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<link rel="home" href="index.html" title="libnm-glib Reference Manual">
+<link rel="up" href="index.html" title="libnm-glib Reference Manual">
+<link rel="prev" href="object-tree.html" title="Object Hierarchy">
+<link rel="next" href="annotation-glossary.html" title="Annotation Glossary">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
+<tr valign="middle">
+<td><a accesskey="p" href="object-tree.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
+<td> </td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
+<th width="100%" align="center">libnm-glib Reference Manual</th>
+<td><a accesskey="n" href="annotation-glossary.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+</tr>
+<tr><td colspan="5" class="shortcuts">
+<a class="shortcut" href="#idxA">A</a>
+                      | 
+                   <a class="shortcut" href="#idxC">C</a>
+                      | 
+                   <a class="shortcut" href="#idxD">D</a>
+                      | 
+                   <a class="shortcut" href="#idxG">G</a>
+                      | 
+                   <a class="shortcut" href="#idxI">I</a>
+                      | 
+                   <a class="shortcut" href="#idxO">O</a>
+                      | 
+                   <a class="shortcut" href="#idxR">R</a>
+                      | 
+                   <a class="shortcut" href="#idxS">S</a>
+                      | 
+                   <a class="shortcut" href="#idxT">T</a>
+                      | 
+                   <a class="shortcut" href="#idxU">U</a>
+                      | 
+                   <a class="shortcut" href="#idxV">V</a>
+                      | 
+                   <a class="shortcut" href="#idxW">W</a>
+</td></tr>
+</table>
+<div class="index">
+<div class="titlepage"><div><div><h2 class="title">
+<a name="api-index-full"></a>API Index</h2></div></div></div>
+<a name="idx"></a><a name="idxA"></a><h3 class="title">A</h3>
+<dt>
+<a class="link" href="NMAccessPoint.html#NMAccessPoint-struct" title="NMAccessPoint">NMAccessPoint</a>, struct in <a class="link" href="NMAccessPoint.html" title="NMAccessPoint">NMAccessPoint</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMAccessPoint.html#NMAccessPoint--bssid" title='The "bssid" property'>NMAccessPoint:bssid</a>, object property in <a class="link" href="NMAccessPoint.html" title="NMAccessPoint">NMAccessPoint</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMAccessPoint.html#NMAccessPoint--flags" title='The "flags" property'>NMAccessPoint:flags</a>, object property in <a class="link" href="NMAccessPoint.html" title="NMAccessPoint">NMAccessPoint</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMAccessPoint.html#NMAccessPoint--frequency" title='The "frequency" property'>NMAccessPoint:frequency</a>, object property in <a class="link" href="NMAccessPoint.html" title="NMAccessPoint">NMAccessPoint</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMAccessPoint.html#NMAccessPoint--hw-address" title='The "hw-address" property'>NMAccessPoint:hw-address</a>, object property in <a class="link" href="NMAccessPoint.html" title="NMAccessPoint">NMAccessPoint</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMAccessPoint.html#NMAccessPoint--max-bitrate" title='The "max-bitrate" property'>NMAccessPoint:max-bitrate</a>, object property in <a class="link" href="NMAccessPoint.html" title="NMAccessPoint">NMAccessPoint</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMAccessPoint.html#NMAccessPoint--mode" title='The "mode" property'>NMAccessPoint:mode</a>, object property in <a class="link" href="NMAccessPoint.html" title="NMAccessPoint">NMAccessPoint</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMAccessPoint.html#NMAccessPoint--rsn-flags" title='The "rsn-flags" property'>NMAccessPoint:rsn-flags</a>, object property in <a class="link" href="NMAccessPoint.html" title="NMAccessPoint">NMAccessPoint</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMAccessPoint.html#NMAccessPoint--ssid" title='The "ssid" property'>NMAccessPoint:ssid</a>, object property in <a class="link" href="NMAccessPoint.html" title="NMAccessPoint">NMAccessPoint</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMAccessPoint.html#NMAccessPoint--strength" title='The "strength" property'>NMAccessPoint:strength</a>, object property in <a class="link" href="NMAccessPoint.html" title="NMAccessPoint">NMAccessPoint</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMAccessPoint.html#NMAccessPoint--wpa-flags" title='The "wpa-flags" property'>NMAccessPoint:wpa-flags</a>, object property in <a class="link" href="NMAccessPoint.html" title="NMAccessPoint">NMAccessPoint</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMAccessPoint.html#NMAccessPointClass" title="NMAccessPointClass">NMAccessPointClass</a>, struct in <a class="link" href="NMAccessPoint.html" title="NMAccessPoint">NMAccessPoint</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMAccessPoint.html#NM-ACCESS-POINT-BSSID:CAPS" title="NM_ACCESS_POINT_BSSID">NM_ACCESS_POINT_BSSID</a>, macro in <a class="link" href="NMAccessPoint.html" title="NMAccessPoint">NMAccessPoint</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMAccessPoint.html#nm-access-point-filter-connections" title="nm_access_point_filter_connections ()">nm_access_point_filter_connections</a>, function in <a class="link" href="NMAccessPoint.html" title="NMAccessPoint">NMAccessPoint</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMAccessPoint.html#NM-ACCESS-POINT-FLAGS:CAPS" title="NM_ACCESS_POINT_FLAGS">NM_ACCESS_POINT_FLAGS</a>, macro in <a class="link" href="NMAccessPoint.html" title="NMAccessPoint">NMAccessPoint</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMAccessPoint.html#NM-ACCESS-POINT-FREQUENCY:CAPS" title="NM_ACCESS_POINT_FREQUENCY">NM_ACCESS_POINT_FREQUENCY</a>, macro in <a class="link" href="NMAccessPoint.html" title="NMAccessPoint">NMAccessPoint</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMAccessPoint.html#nm-access-point-get-bssid" title="nm_access_point_get_bssid ()">nm_access_point_get_bssid</a>, function in <a class="link" href="NMAccessPoint.html" title="NMAccessPoint">NMAccessPoint</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMAccessPoint.html#nm-access-point-get-flags" title="nm_access_point_get_flags ()">nm_access_point_get_flags</a>, function in <a class="link" href="NMAccessPoint.html" title="NMAccessPoint">NMAccessPoint</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMAccessPoint.html#nm-access-point-get-frequency" title="nm_access_point_get_frequency ()">nm_access_point_get_frequency</a>, function in <a class="link" href="NMAccessPoint.html" title="NMAccessPoint">NMAccessPoint</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMAccessPoint.html#nm-access-point-get-hw-address" title="nm_access_point_get_hw_address ()">nm_access_point_get_hw_address</a>, function in <a class="link" href="NMAccessPoint.html" title="NMAccessPoint">NMAccessPoint</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMAccessPoint.html#nm-access-point-get-max-bitrate" title="nm_access_point_get_max_bitrate ()">nm_access_point_get_max_bitrate</a>, function in <a class="link" href="NMAccessPoint.html" title="NMAccessPoint">NMAccessPoint</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMAccessPoint.html#nm-access-point-get-mode" title="nm_access_point_get_mode ()">nm_access_point_get_mode</a>, function in <a class="link" href="NMAccessPoint.html" title="NMAccessPoint">NMAccessPoint</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMAccessPoint.html#nm-access-point-get-rsn-flags" title="nm_access_point_get_rsn_flags ()">nm_access_point_get_rsn_flags</a>, function in <a class="link" href="NMAccessPoint.html" title="NMAccessPoint">NMAccessPoint</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMAccessPoint.html#nm-access-point-get-ssid" title="nm_access_point_get_ssid ()">nm_access_point_get_ssid</a>, function in <a class="link" href="NMAccessPoint.html" title="NMAccessPoint">NMAccessPoint</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMAccessPoint.html#nm-access-point-get-strength" title="nm_access_point_get_strength ()">nm_access_point_get_strength</a>, function in <a class="link" href="NMAccessPoint.html" title="NMAccessPoint">NMAccessPoint</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMAccessPoint.html#nm-access-point-get-wpa-flags" title="nm_access_point_get_wpa_flags ()">nm_access_point_get_wpa_flags</a>, function in <a class="link" href="NMAccessPoint.html" title="NMAccessPoint">NMAccessPoint</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMAccessPoint.html#NM-ACCESS-POINT-HW-ADDRESS:CAPS" title="NM_ACCESS_POINT_HW_ADDRESS">NM_ACCESS_POINT_HW_ADDRESS</a>, macro in <a class="link" href="NMAccessPoint.html" title="NMAccessPoint">NMAccessPoint</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMAccessPoint.html#NM-ACCESS-POINT-MAX-BITRATE:CAPS" title="NM_ACCESS_POINT_MAX_BITRATE">NM_ACCESS_POINT_MAX_BITRATE</a>, macro in <a class="link" href="NMAccessPoint.html" title="NMAccessPoint">NMAccessPoint</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMAccessPoint.html#NM-ACCESS-POINT-MODE:CAPS" title="NM_ACCESS_POINT_MODE">NM_ACCESS_POINT_MODE</a>, macro in <a class="link" href="NMAccessPoint.html" title="NMAccessPoint">NMAccessPoint</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMAccessPoint.html#nm-access-point-new" title="nm_access_point_new ()">nm_access_point_new</a>, function in <a class="link" href="NMAccessPoint.html" title="NMAccessPoint">NMAccessPoint</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMAccessPoint.html#NM-ACCESS-POINT-RSN-FLAGS:CAPS" title="NM_ACCESS_POINT_RSN_FLAGS">NM_ACCESS_POINT_RSN_FLAGS</a>, macro in <a class="link" href="NMAccessPoint.html" title="NMAccessPoint">NMAccessPoint</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMAccessPoint.html#NM-ACCESS-POINT-SSID:CAPS" title="NM_ACCESS_POINT_SSID">NM_ACCESS_POINT_SSID</a>, macro in <a class="link" href="NMAccessPoint.html" title="NMAccessPoint">NMAccessPoint</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMAccessPoint.html#NM-ACCESS-POINT-STRENGTH:CAPS" title="NM_ACCESS_POINT_STRENGTH">NM_ACCESS_POINT_STRENGTH</a>, macro in <a class="link" href="NMAccessPoint.html" title="NMAccessPoint">NMAccessPoint</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMAccessPoint.html#NM-ACCESS-POINT-WPA-FLAGS:CAPS" title="NM_ACCESS_POINT_WPA_FLAGS">NM_ACCESS_POINT_WPA_FLAGS</a>, macro in <a class="link" href="NMAccessPoint.html" title="NMAccessPoint">NMAccessPoint</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMActiveConnection.html#NMActiveConnection-struct" title="NMActiveConnection">NMActiveConnection</a>, struct in <a class="link" href="NMActiveConnection.html" title="NMActiveConnection">NMActiveConnection</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMActiveConnection.html#NMActiveConnection--connection" title='The "connection" property'>NMActiveConnection:connection</a>, object property in <a class="link" href="NMActiveConnection.html" title="NMActiveConnection">NMActiveConnection</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMActiveConnection.html#NMActiveConnection--default" title='The "default" property'>NMActiveConnection:default</a>, object property in <a class="link" href="NMActiveConnection.html" title="NMActiveConnection">NMActiveConnection</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMActiveConnection.html#NMActiveConnection--default6" title='The "default6" property'>NMActiveConnection:default6</a>, object property in <a class="link" href="NMActiveConnection.html" title="NMActiveConnection">NMActiveConnection</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMActiveConnection.html#NMActiveConnection--devices" title='The "devices" property'>NMActiveConnection:devices</a>, object property in <a class="link" href="NMActiveConnection.html" title="NMActiveConnection">NMActiveConnection</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMActiveConnection.html#NMActiveConnection--specific-object" title='The "specific-object" property'>NMActiveConnection:specific-object</a>, object property in <a class="link" href="NMActiveConnection.html" title="NMActiveConnection">NMActiveConnection</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMActiveConnection.html#NMActiveConnection--state" title='The "state" property'>NMActiveConnection:state</a>, object property in <a class="link" href="NMActiveConnection.html" title="NMActiveConnection">NMActiveConnection</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMActiveConnection.html#NMActiveConnectionClass" title="NMActiveConnectionClass">NMActiveConnectionClass</a>, struct in <a class="link" href="NMActiveConnection.html" title="NMActiveConnection">NMActiveConnection</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMActiveConnection.html#NM-ACTIVE-CONNECTION-CONNECTION:CAPS" title="NM_ACTIVE_CONNECTION_CONNECTION">NM_ACTIVE_CONNECTION_CONNECTION</a>, macro in <a class="link" href="NMActiveConnection.html" title="NMActiveConnection">NMActiveConnection</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMActiveConnection.html#NM-ACTIVE-CONNECTION-DEFAULT:CAPS" title="NM_ACTIVE_CONNECTION_DEFAULT">NM_ACTIVE_CONNECTION_DEFAULT</a>, macro in <a class="link" href="NMActiveConnection.html" title="NMActiveConnection">NMActiveConnection</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMActiveConnection.html#NM-ACTIVE-CONNECTION-DEFAULT6:CAPS" title="NM_ACTIVE_CONNECTION_DEFAULT6">NM_ACTIVE_CONNECTION_DEFAULT6</a>, macro in <a class="link" href="NMActiveConnection.html" title="NMActiveConnection">NMActiveConnection</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMActiveConnection.html#NM-ACTIVE-CONNECTION-DEVICES:CAPS" title="NM_ACTIVE_CONNECTION_DEVICES">NM_ACTIVE_CONNECTION_DEVICES</a>, macro in <a class="link" href="NMActiveConnection.html" title="NMActiveConnection">NMActiveConnection</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMActiveConnection.html#nm-active-connection-get-connection" title="nm_active_connection_get_connection ()">nm_active_connection_get_connection</a>, function in <a class="link" href="NMActiveConnection.html" title="NMActiveConnection">NMActiveConnection</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMActiveConnection.html#nm-active-connection-get-default" title="nm_active_connection_get_default ()">nm_active_connection_get_default</a>, function in <a class="link" href="NMActiveConnection.html" title="NMActiveConnection">NMActiveConnection</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMActiveConnection.html#nm-active-connection-get-default6" title="nm_active_connection_get_default6 ()">nm_active_connection_get_default6</a>, function in <a class="link" href="NMActiveConnection.html" title="NMActiveConnection">NMActiveConnection</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMActiveConnection.html#nm-active-connection-get-devices" title="nm_active_connection_get_devices ()">nm_active_connection_get_devices</a>, function in <a class="link" href="NMActiveConnection.html" title="NMActiveConnection">NMActiveConnection</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMActiveConnection.html#nm-active-connection-get-specific-object" title="nm_active_connection_get_specific_object ()">nm_active_connection_get_specific_object</a>, function in <a class="link" href="NMActiveConnection.html" title="NMActiveConnection">NMActiveConnection</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMActiveConnection.html#nm-active-connection-get-state" title="nm_active_connection_get_state ()">nm_active_connection_get_state</a>, function in <a class="link" href="NMActiveConnection.html" title="NMActiveConnection">NMActiveConnection</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMActiveConnection.html#nm-active-connection-new" title="nm_active_connection_new ()">nm_active_connection_new</a>, function in <a class="link" href="NMActiveConnection.html" title="NMActiveConnection">NMActiveConnection</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMActiveConnection.html#NM-ACTIVE-CONNECTION-SPECIFIC-OBJECT:CAPS" title="NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT">NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT</a>, macro in <a class="link" href="NMActiveConnection.html" title="NMActiveConnection">NMActiveConnection</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMActiveConnection.html#NM-ACTIVE-CONNECTION-STATE:CAPS" title="NM_ACTIVE_CONNECTION_STATE">NM_ACTIVE_CONNECTION_STATE</a>, macro in <a class="link" href="NMActiveConnection.html" title="NMActiveConnection">NMActiveConnection</a>
+</dt>
+<dd></dd>
+<a name="idxC"></a><h3 class="title">C</h3>
+<dt>
+<a class="link" href="NMClient.html#NMClient-struct" title="NMClient">NMClient</a>, struct in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMClient.html#NMClient-device-added" title='The "device-added" signal'>NMClient::device-added</a>, object signal in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMClient.html#NMClient-device-removed" title='The "device-removed" signal'>NMClient::device-removed</a>, object signal in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMClient.html#NMClient-permission-changed" title='The "permission-changed" signal'>NMClient::permission-changed</a>, object signal in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMClient.html#NMClient--active-connections" title='The "active-connections" property'>NMClient:active-connections</a>, object property in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMClient.html#NMClient--manager-running" title='The "manager-running" property'>NMClient:manager-running</a>, object property in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMClient.html#NMClient--networking-enabled" title='The "networking-enabled" property'>NMClient:networking-enabled</a>, object property in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMClient.html#NMClient--state" title='The "state" property'>NMClient:state</a>, object property in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMClient.html#NMClient--version" title='The "version" property'>NMClient:version</a>, object property in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMClient.html#NMClient--wimax-enabled" title='The "wimax-enabled" property'>NMClient:wimax-enabled</a>, object property in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMClient.html#NMClient--wimax-hardware-enabled" title='The "wimax-hardware-enabled" property'>NMClient:wimax-hardware-enabled</a>, object property in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMClient.html#NMClient--wireless-enabled" title='The "wireless-enabled" property'>NMClient:wireless-enabled</a>, object property in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMClient.html#NMClient--wireless-hardware-enabled" title='The "wireless-hardware-enabled" property'>NMClient:wireless-hardware-enabled</a>, object property in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMClient.html#NMClient--wwan-enabled" title='The "wwan-enabled" property'>NMClient:wwan-enabled</a>, object property in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMClient.html#NMClient--wwan-hardware-enabled" title='The "wwan-hardware-enabled" property'>NMClient:wwan-hardware-enabled</a>, object property in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMClient.html#NMClientActivateFn" title="NMClientActivateFn ()">NMClientActivateFn</a>, user_function in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMClient.html#NMClientAddActivateFn" title="NMClientAddActivateFn ()">NMClientAddActivateFn</a>, user_function in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMClient.html#NMClientClass" title="NMClientClass">NMClientClass</a>, struct in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMClient.html#NMClientPermission" title="enum NMClientPermission">NMClientPermission</a>, enum in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMClient.html#NMClientPermissionResult" title="enum NMClientPermissionResult">NMClientPermissionResult</a>, enum in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMClient.html#nm-client-activate-connection" title="nm_client_activate_connection ()">nm_client_activate_connection</a>, function in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMClient.html#NM-CLIENT-ACTIVE-CONNECTIONS:CAPS" title="NM_CLIENT_ACTIVE_CONNECTIONS">NM_CLIENT_ACTIVE_CONNECTIONS</a>, macro in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMClient.html#nm-client-add-and-activate-connection" title="nm_client_add_and_activate_connection ()">nm_client_add_and_activate_connection</a>, function in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMClient.html#nm-client-deactivate-connection" title="nm_client_deactivate_connection ()">nm_client_deactivate_connection</a>, function in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMClient.html#nm-client-get-active-connections" title="nm_client_get_active_connections ()">nm_client_get_active_connections</a>, function in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMClient.html#nm-client-get-devices" title="nm_client_get_devices ()">nm_client_get_devices</a>, function in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMClient.html#nm-client-get-device-by-path" title="nm_client_get_device_by_path ()">nm_client_get_device_by_path</a>, function in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMClient.html#nm-client-get-manager-running" title="nm_client_get_manager_running ()">nm_client_get_manager_running</a>, function in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMClient.html#nm-client-get-permission-result" title="nm_client_get_permission_result ()">nm_client_get_permission_result</a>, function in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMClient.html#nm-client-get-state" title="nm_client_get_state ()">nm_client_get_state</a>, function in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMClient.html#nm-client-get-version" title="nm_client_get_version ()">nm_client_get_version</a>, function in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMClient.html#NM-CLIENT-MANAGER-RUNNING:CAPS" title="NM_CLIENT_MANAGER_RUNNING">NM_CLIENT_MANAGER_RUNNING</a>, macro in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMClient.html#NM-CLIENT-NETWORKING-ENABLED:CAPS" title="NM_CLIENT_NETWORKING_ENABLED">NM_CLIENT_NETWORKING_ENABLED</a>, macro in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMClient.html#nm-client-networking-get-enabled" title="nm_client_networking_get_enabled ()">nm_client_networking_get_enabled</a>, function in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMClient.html#nm-client-networking-set-enabled" title="nm_client_networking_set_enabled ()">nm_client_networking_set_enabled</a>, function in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMClient.html#nm-client-new" title="nm_client_new ()">nm_client_new</a>, function in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMClient.html#nm-client-sleep" title="nm_client_sleep ()">nm_client_sleep</a>, function in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMClient.html#NM-CLIENT-STATE:CAPS" title="NM_CLIENT_STATE">NM_CLIENT_STATE</a>, macro in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMClient.html#NM-CLIENT-VERSION:CAPS" title="NM_CLIENT_VERSION">NM_CLIENT_VERSION</a>, macro in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMClient.html#NM-CLIENT-WIMAX-ENABLED:CAPS" title="NM_CLIENT_WIMAX_ENABLED">NM_CLIENT_WIMAX_ENABLED</a>, macro in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMClient.html#nm-client-wimax-get-enabled" title="nm_client_wimax_get_enabled ()">nm_client_wimax_get_enabled</a>, function in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMClient.html#NM-CLIENT-WIMAX-HARDWARE-ENABLED:CAPS" title="NM_CLIENT_WIMAX_HARDWARE_ENABLED">NM_CLIENT_WIMAX_HARDWARE_ENABLED</a>, macro in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMClient.html#nm-client-wimax-hardware-get-enabled" title="nm_client_wimax_hardware_get_enabled ()">nm_client_wimax_hardware_get_enabled</a>, function in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMClient.html#nm-client-wimax-set-enabled" title="nm_client_wimax_set_enabled ()">nm_client_wimax_set_enabled</a>, function in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMClient.html#NM-CLIENT-WIRELESS-ENABLED:CAPS" title="NM_CLIENT_WIRELESS_ENABLED">NM_CLIENT_WIRELESS_ENABLED</a>, macro in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMClient.html#nm-client-wireless-get-enabled" title="nm_client_wireless_get_enabled ()">nm_client_wireless_get_enabled</a>, function in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMClient.html#NM-CLIENT-WIRELESS-HARDWARE-ENABLED:CAPS" title="NM_CLIENT_WIRELESS_HARDWARE_ENABLED">NM_CLIENT_WIRELESS_HARDWARE_ENABLED</a>, macro in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMClient.html#nm-client-wireless-hardware-get-enabled" title="nm_client_wireless_hardware_get_enabled ()">nm_client_wireless_hardware_get_enabled</a>, function in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMClient.html#nm-client-wireless-set-enabled" title="nm_client_wireless_set_enabled ()">nm_client_wireless_set_enabled</a>, function in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMClient.html#NM-CLIENT-WWAN-ENABLED:CAPS" title="NM_CLIENT_WWAN_ENABLED">NM_CLIENT_WWAN_ENABLED</a>, macro in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMClient.html#nm-client-wwan-get-enabled" title="nm_client_wwan_get_enabled ()">nm_client_wwan_get_enabled</a>, function in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMClient.html#NM-CLIENT-WWAN-HARDWARE-ENABLED:CAPS" title="NM_CLIENT_WWAN_HARDWARE_ENABLED">NM_CLIENT_WWAN_HARDWARE_ENABLED</a>, macro in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMClient.html#nm-client-wwan-hardware-get-enabled" title="nm_client_wwan_hardware_get_enabled ()">nm_client_wwan_hardware_get_enabled</a>, function in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMClient.html#nm-client-wwan-set-enabled" title="nm_client_wwan_set_enabled ()">nm_client_wwan_set_enabled</a>, function in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+</dt>
+<dd></dd>
+<a name="idxD"></a><h3 class="title">D</h3>
+<dt>
+dbus_glib_marshal_nm_secret_agent_NONE__BOXED_BOXED_POINTER, macro in nm-secret-agent-glue
+</dt>
+<dd></dd>
+<dt>
+dbus_glib_marshal_nm_secret_agent_NONE__BOXED_BOXED_STRING_BOXED_UINT_POINTER, macro in nm-secret-agent-glue
+</dt>
+<dd></dd>
+<dt>
+dbus_glib_marshal_nm_secret_agent_NONE__BOXED_STRING_POINTER, macro in nm-secret-agent-glue
+</dt>
+<dd></dd>
+<dt>
+dbus_glib_marshal_nm_secret_agent_VOID__BOXED_BOXED_POINTER, function in nm-secret-agent-glue
+</dt>
+<dd></dd>
+<dt>
+dbus_glib_marshal_nm_secret_agent_VOID__BOXED_BOXED_STRING_BOXED_UINT_POINTER, function in nm-secret-agent-glue
+</dt>
+<dd></dd>
+<dt>
+dbus_glib_marshal_nm_secret_agent_VOID__BOXED_STRING_POINTER, function in nm-secret-agent-glue
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDevice.html#NMDevice-struct" title="NMDevice">NMDevice</a>, struct in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDevice.html#NMDevice-state-changed" title='The "state-changed" signal'>NMDevice::state-changed</a>, object signal in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDevice.html#NMDevice--capabilities" title='The "capabilities" property'>NMDevice:capabilities</a>, object property in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDevice.html#NMDevice--device-type" title='The "device-type" property'>NMDevice:device-type</a>, object property in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDevice.html#NMDevice--dhcp4-config" title='The "dhcp4-config" property'>NMDevice:dhcp4-config</a>, object property in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDevice.html#NMDevice--dhcp6-config" title='The "dhcp6-config" property'>NMDevice:dhcp6-config</a>, object property in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDevice.html#NMDevice--driver" title='The "driver" property'>NMDevice:driver</a>, object property in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDevice.html#NMDevice--firmware-missing" title='The "firmware-missing" property'>NMDevice:firmware-missing</a>, object property in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDevice.html#NMDevice--interface" title='The "interface" property'>NMDevice:interface</a>, object property in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDevice.html#NMDevice--ip-interface" title='The "ip-interface" property'>NMDevice:ip-interface</a>, object property in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDevice.html#NMDevice--ip4-config" title='The "ip4-config" property'>NMDevice:ip4-config</a>, object property in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDevice.html#NMDevice--ip6-config" title='The "ip6-config" property'>NMDevice:ip6-config</a>, object property in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDevice.html#NMDevice--managed" title='The "managed" property'>NMDevice:managed</a>, object property in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDevice.html#NMDevice--product" title='The "product" property'>NMDevice:product</a>, object property in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDevice.html#NMDevice--state" title='The "state" property'>NMDevice:state</a>, object property in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDevice.html#NMDevice--udi" title='The "udi" property'>NMDevice:udi</a>, object property in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDevice.html#NMDevice--vendor" title='The "vendor" property'>NMDevice:vendor</a>, object property in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceBt.html#NMDeviceBt-struct" title="NMDeviceBt">NMDeviceBt</a>, struct in <a class="link" href="NMDeviceBt.html" title="NMDeviceBt">NMDeviceBt</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceBt.html#NMDeviceBt--bt-capabilities" title='The "bt-capabilities" property'>NMDeviceBt:bt-capabilities</a>, object property in <a class="link" href="NMDeviceBt.html" title="NMDeviceBt">NMDeviceBt</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceBt.html#NMDeviceBt--hw-address" title='The "hw-address" property'>NMDeviceBt:hw-address</a>, object property in <a class="link" href="NMDeviceBt.html" title="NMDeviceBt">NMDeviceBt</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceBt.html#NMDeviceBt--name" title='The "name" property'>NMDeviceBt:name</a>, object property in <a class="link" href="NMDeviceBt.html" title="NMDeviceBt">NMDeviceBt</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceBt.html#NMDeviceBtClass" title="NMDeviceBtClass">NMDeviceBtClass</a>, struct in <a class="link" href="NMDeviceBt.html" title="NMDeviceBt">NMDeviceBt</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDevice.html#NMDeviceClass" title="NMDeviceClass">NMDeviceClass</a>, struct in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDevice.html#NMDeviceDeactivateFn" title="NMDeviceDeactivateFn ()">NMDeviceDeactivateFn</a>, user_function in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceEthernet.html#NMDeviceEthernet-struct" title="NMDeviceEthernet">NMDeviceEthernet</a>, struct in <a class="link" href="NMDeviceEthernet.html" title="NMDeviceEthernet">NMDeviceEthernet</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceEthernet.html#NMDeviceEthernet--carrier" title='The "carrier" property'>NMDeviceEthernet:carrier</a>, object property in <a class="link" href="NMDeviceEthernet.html" title="NMDeviceEthernet">NMDeviceEthernet</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceEthernet.html#NMDeviceEthernet--hw-address" title='The "hw-address" property'>NMDeviceEthernet:hw-address</a>, object property in <a class="link" href="NMDeviceEthernet.html" title="NMDeviceEthernet">NMDeviceEthernet</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceEthernet.html#NMDeviceEthernet--perm-hw-address" title='The "perm-hw-address" property'>NMDeviceEthernet:perm-hw-address</a>, object property in <a class="link" href="NMDeviceEthernet.html" title="NMDeviceEthernet">NMDeviceEthernet</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceEthernet.html#NMDeviceEthernet--speed" title='The "speed" property'>NMDeviceEthernet:speed</a>, object property in <a class="link" href="NMDeviceEthernet.html" title="NMDeviceEthernet">NMDeviceEthernet</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceEthernet.html#NMDeviceEthernetClass" title="NMDeviceEthernetClass">NMDeviceEthernetClass</a>, struct in <a class="link" href="NMDeviceEthernet.html" title="NMDeviceEthernet">NMDeviceEthernet</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceModem.html#NMDeviceModem-struct" title="NMDeviceModem">NMDeviceModem</a>, struct in <a class="link" href="NMDeviceModem.html" title="NMDeviceModem">NMDeviceModem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceModem.html#NMDeviceModem--current-capabilities" title='The "current-capabilities" property'>NMDeviceModem:current-capabilities</a>, object property in <a class="link" href="NMDeviceModem.html" title="NMDeviceModem">NMDeviceModem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceModem.html#NMDeviceModem--modem-capabilities" title='The "modem-capabilities" property'>NMDeviceModem:modem-capabilities</a>, object property in <a class="link" href="NMDeviceModem.html" title="NMDeviceModem">NMDeviceModem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceModem.html#NMDeviceModemClass" title="NMDeviceModemClass">NMDeviceModemClass</a>, struct in <a class="link" href="NMDeviceModem.html" title="NMDeviceModem">NMDeviceModem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceWifi.html#NMDeviceWifi-struct" title="NMDeviceWifi">NMDeviceWifi</a>, struct in <a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi">NMDeviceWifi</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceWifi.html#NMDeviceWifi-access-point-added" title='The "access-point-added" signal'>NMDeviceWifi::access-point-added</a>, object signal in <a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi">NMDeviceWifi</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceWifi.html#NMDeviceWifi-access-point-removed" title='The "access-point-removed" signal'>NMDeviceWifi::access-point-removed</a>, object signal in <a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi">NMDeviceWifi</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceWifi.html#NMDeviceWifi--active-access-point" title='The "active-access-point" property'>NMDeviceWifi:active-access-point</a>, object property in <a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi">NMDeviceWifi</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceWifi.html#NMDeviceWifi--bitrate" title='The "bitrate" property'>NMDeviceWifi:bitrate</a>, object property in <a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi">NMDeviceWifi</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceWifi.html#NMDeviceWifi--hw-address" title='The "hw-address" property'>NMDeviceWifi:hw-address</a>, object property in <a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi">NMDeviceWifi</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceWifi.html#NMDeviceWifi--mode" title='The "mode" property'>NMDeviceWifi:mode</a>, object property in <a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi">NMDeviceWifi</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceWifi.html#NMDeviceWifi--perm-hw-address" title='The "perm-hw-address" property'>NMDeviceWifi:perm-hw-address</a>, object property in <a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi">NMDeviceWifi</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceWifi.html#NMDeviceWifi--wireless-capabilities" title='The "wireless-capabilities" property'>NMDeviceWifi:wireless-capabilities</a>, object property in <a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi">NMDeviceWifi</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceWifi.html#NMDeviceWifiClass" title="NMDeviceWifiClass">NMDeviceWifiClass</a>, struct in <a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi">NMDeviceWifi</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceWimax.html#NMDeviceWimax-struct" title="NMDeviceWimax">NMDeviceWimax</a>, struct in <a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax">NMDeviceWimax</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceWimax.html#NMDeviceWimax-nsp-added" title='The "nsp-added" signal'>NMDeviceWimax::nsp-added</a>, object signal in <a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax">NMDeviceWimax</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceWimax.html#NMDeviceWimax-nsp-removed" title='The "nsp-removed" signal'>NMDeviceWimax::nsp-removed</a>, object signal in <a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax">NMDeviceWimax</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceWimax.html#NMDeviceWimax--active-nsp" title='The "active-nsp" property'>NMDeviceWimax:active-nsp</a>, object property in <a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax">NMDeviceWimax</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceWimax.html#NMDeviceWimax--bsid" title='The "bsid" property'>NMDeviceWimax:bsid</a>, object property in <a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax">NMDeviceWimax</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceWimax.html#NMDeviceWimax--center-frequency" title='The "center-frequency" property'>NMDeviceWimax:center-frequency</a>, object property in <a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax">NMDeviceWimax</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceWimax.html#NMDeviceWimax--cinr" title='The "cinr" property'>NMDeviceWimax:cinr</a>, object property in <a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax">NMDeviceWimax</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceWimax.html#NMDeviceWimax--hw-address" title='The "hw-address" property'>NMDeviceWimax:hw-address</a>, object property in <a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax">NMDeviceWimax</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceWimax.html#NMDeviceWimax--rssi" title='The "rssi" property'>NMDeviceWimax:rssi</a>, object property in <a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax">NMDeviceWimax</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceWimax.html#NMDeviceWimax--tx-power" title='The "tx-power" property'>NMDeviceWimax:tx-power</a>, object property in <a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax">NMDeviceWimax</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceWimax.html#NMDeviceWimaxClass" title="NMDeviceWimaxClass">NMDeviceWimaxClass</a>, struct in <a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax">NMDeviceWimax</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceBt.html#NM-DEVICE-BT-CAPABILITIES:CAPS" title="NM_DEVICE_BT_CAPABILITIES">NM_DEVICE_BT_CAPABILITIES</a>, macro in <a class="link" href="NMDeviceBt.html" title="NMDeviceBt">NMDeviceBt</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceBt.html#nm-device-bt-get-capabilities" title="nm_device_bt_get_capabilities ()">nm_device_bt_get_capabilities</a>, function in <a class="link" href="NMDeviceBt.html" title="NMDeviceBt">NMDeviceBt</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceBt.html#nm-device-bt-get-hw-address" title="nm_device_bt_get_hw_address ()">nm_device_bt_get_hw_address</a>, function in <a class="link" href="NMDeviceBt.html" title="NMDeviceBt">NMDeviceBt</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceBt.html#nm-device-bt-get-name" title="nm_device_bt_get_name ()">nm_device_bt_get_name</a>, function in <a class="link" href="NMDeviceBt.html" title="NMDeviceBt">NMDeviceBt</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceBt.html#NM-DEVICE-BT-HW-ADDRESS:CAPS" title="NM_DEVICE_BT_HW_ADDRESS">NM_DEVICE_BT_HW_ADDRESS</a>, macro in <a class="link" href="NMDeviceBt.html" title="NMDeviceBt">NMDeviceBt</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceBt.html#NM-DEVICE-BT-NAME:CAPS" title="NM_DEVICE_BT_NAME">NM_DEVICE_BT_NAME</a>, macro in <a class="link" href="NMDeviceBt.html" title="NMDeviceBt">NMDeviceBt</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceBt.html#nm-device-bt-new" title="nm_device_bt_new ()">nm_device_bt_new</a>, function in <a class="link" href="NMDeviceBt.html" title="NMDeviceBt">NMDeviceBt</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDevice.html#NM-DEVICE-CAPABILITIES:CAPS" title="NM_DEVICE_CAPABILITIES">NM_DEVICE_CAPABILITIES</a>, macro in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDevice.html#NM-DEVICE-DEVICE-TYPE:CAPS" title="NM_DEVICE_DEVICE_TYPE">NM_DEVICE_DEVICE_TYPE</a>, macro in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDevice.html#NM-DEVICE-DHCP4-CONFIG:CAPS" title="NM_DEVICE_DHCP4_CONFIG">NM_DEVICE_DHCP4_CONFIG</a>, macro in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDevice.html#NM-DEVICE-DHCP6-CONFIG:CAPS" title="NM_DEVICE_DHCP6_CONFIG">NM_DEVICE_DHCP6_CONFIG</a>, macro in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDevice.html#nm-device-disconnect" title="nm_device_disconnect ()">nm_device_disconnect</a>, function in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDevice.html#NM-DEVICE-DRIVER:CAPS" title="NM_DEVICE_DRIVER">NM_DEVICE_DRIVER</a>, macro in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceEthernet.html#NM-DEVICE-ETHERNET-CARRIER:CAPS" title="NM_DEVICE_ETHERNET_CARRIER">NM_DEVICE_ETHERNET_CARRIER</a>, macro in <a class="link" href="NMDeviceEthernet.html" title="NMDeviceEthernet">NMDeviceEthernet</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceEthernet.html#nm-device-ethernet-get-carrier" title="nm_device_ethernet_get_carrier ()">nm_device_ethernet_get_carrier</a>, function in <a class="link" href="NMDeviceEthernet.html" title="NMDeviceEthernet">NMDeviceEthernet</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceEthernet.html#nm-device-ethernet-get-hw-address" title="nm_device_ethernet_get_hw_address ()">nm_device_ethernet_get_hw_address</a>, function in <a class="link" href="NMDeviceEthernet.html" title="NMDeviceEthernet">NMDeviceEthernet</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceEthernet.html#nm-device-ethernet-get-permanent-hw-address" title="nm_device_ethernet_get_permanent_hw_address ()">nm_device_ethernet_get_permanent_hw_address</a>, function in <a class="link" href="NMDeviceEthernet.html" title="NMDeviceEthernet">NMDeviceEthernet</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceEthernet.html#nm-device-ethernet-get-speed" title="nm_device_ethernet_get_speed ()">nm_device_ethernet_get_speed</a>, function in <a class="link" href="NMDeviceEthernet.html" title="NMDeviceEthernet">NMDeviceEthernet</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceEthernet.html#NM-DEVICE-ETHERNET-HW-ADDRESS:CAPS" title="NM_DEVICE_ETHERNET_HW_ADDRESS">NM_DEVICE_ETHERNET_HW_ADDRESS</a>, macro in <a class="link" href="NMDeviceEthernet.html" title="NMDeviceEthernet">NMDeviceEthernet</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceEthernet.html#nm-device-ethernet-new" title="nm_device_ethernet_new ()">nm_device_ethernet_new</a>, function in <a class="link" href="NMDeviceEthernet.html" title="NMDeviceEthernet">NMDeviceEthernet</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceEthernet.html#NM-DEVICE-ETHERNET-PERMANENT-HW-ADDRESS:CAPS" title="NM_DEVICE_ETHERNET_PERMANENT_HW_ADDRESS">NM_DEVICE_ETHERNET_PERMANENT_HW_ADDRESS</a>, macro in <a class="link" href="NMDeviceEthernet.html" title="NMDeviceEthernet">NMDeviceEthernet</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceEthernet.html#NM-DEVICE-ETHERNET-SPEED:CAPS" title="NM_DEVICE_ETHERNET_SPEED">NM_DEVICE_ETHERNET_SPEED</a>, macro in <a class="link" href="NMDeviceEthernet.html" title="NMDeviceEthernet">NMDeviceEthernet</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDevice.html#nm-device-filter-connections" title="nm_device_filter_connections ()">nm_device_filter_connections</a>, function in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDevice.html#NM-DEVICE-FIRMWARE-MISSING:CAPS" title="NM_DEVICE_FIRMWARE_MISSING">NM_DEVICE_FIRMWARE_MISSING</a>, macro in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDevice.html#nm-device-get-capabilities" title="nm_device_get_capabilities ()">nm_device_get_capabilities</a>, function in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDevice.html#nm-device-get-device-type" title="nm_device_get_device_type ()">nm_device_get_device_type</a>, function in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDevice.html#nm-device-get-dhcp4-config" title="nm_device_get_dhcp4_config ()">nm_device_get_dhcp4_config</a>, function in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDevice.html#nm-device-get-dhcp6-config" title="nm_device_get_dhcp6_config ()">nm_device_get_dhcp6_config</a>, function in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDevice.html#nm-device-get-driver" title="nm_device_get_driver ()">nm_device_get_driver</a>, function in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDevice.html#nm-device-get-firmware-missing" title="nm_device_get_firmware_missing ()">nm_device_get_firmware_missing</a>, function in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDevice.html#nm-device-get-iface" title="nm_device_get_iface ()">nm_device_get_iface</a>, function in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDevice.html#nm-device-get-ip4-config" title="nm_device_get_ip4_config ()">nm_device_get_ip4_config</a>, function in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDevice.html#nm-device-get-ip6-config" title="nm_device_get_ip6_config ()">nm_device_get_ip6_config</a>, function in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDevice.html#nm-device-get-ip-iface" title="nm_device_get_ip_iface ()">nm_device_get_ip_iface</a>, function in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDevice.html#nm-device-get-managed" title="nm_device_get_managed ()">nm_device_get_managed</a>, function in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDevice.html#nm-device-get-product" title="nm_device_get_product ()">nm_device_get_product</a>, function in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDevice.html#nm-device-get-state" title="nm_device_get_state ()">nm_device_get_state</a>, function in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDevice.html#nm-device-get-udi" title="nm_device_get_udi ()">nm_device_get_udi</a>, function in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDevice.html#nm-device-get-vendor" title="nm_device_get_vendor ()">nm_device_get_vendor</a>, function in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDevice.html#NM-DEVICE-INTERFACE:CAPS" title="NM_DEVICE_INTERFACE">NM_DEVICE_INTERFACE</a>, macro in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDevice.html#NM-DEVICE-IP4-CONFIG:CAPS" title="NM_DEVICE_IP4_CONFIG">NM_DEVICE_IP4_CONFIG</a>, macro in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDevice.html#NM-DEVICE-IP6-CONFIG:CAPS" title="NM_DEVICE_IP6_CONFIG">NM_DEVICE_IP6_CONFIG</a>, macro in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDevice.html#NM-DEVICE-IP-INTERFACE:CAPS" title="NM_DEVICE_IP_INTERFACE">NM_DEVICE_IP_INTERFACE</a>, macro in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDevice.html#NM-DEVICE-MANAGED:CAPS" title="NM_DEVICE_MANAGED">NM_DEVICE_MANAGED</a>, macro in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceModem.html#NM-DEVICE-MODEM-CURRENT-CAPABILITIES:CAPS" title="NM_DEVICE_MODEM_CURRENT_CAPABILITIES">NM_DEVICE_MODEM_CURRENT_CAPABILITIES</a>, macro in <a class="link" href="NMDeviceModem.html" title="NMDeviceModem">NMDeviceModem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceModem.html#nm-device-modem-get-current-capabilities" title="nm_device_modem_get_current_capabilities ()">nm_device_modem_get_current_capabilities</a>, function in <a class="link" href="NMDeviceModem.html" title="NMDeviceModem">NMDeviceModem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceModem.html#nm-device-modem-get-modem-capabilities" title="nm_device_modem_get_modem_capabilities ()">nm_device_modem_get_modem_capabilities</a>, function in <a class="link" href="NMDeviceModem.html" title="NMDeviceModem">NMDeviceModem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceModem.html#NM-DEVICE-MODEM-MODEM-CAPABILITIES:CAPS" title="NM_DEVICE_MODEM_MODEM_CAPABILITIES">NM_DEVICE_MODEM_MODEM_CAPABILITIES</a>, macro in <a class="link" href="NMDeviceModem.html" title="NMDeviceModem">NMDeviceModem</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDevice.html#nm-device-new" title="nm_device_new ()">nm_device_new</a>, function in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDevice.html#NM-DEVICE-PRODUCT:CAPS" title="NM_DEVICE_PRODUCT">NM_DEVICE_PRODUCT</a>, macro in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDevice.html#NM-DEVICE-STATE:CAPS" title="NM_DEVICE_STATE">NM_DEVICE_STATE</a>, macro in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDevice.html#NM-DEVICE-UDI:CAPS" title="NM_DEVICE_UDI">NM_DEVICE_UDI</a>, macro in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDevice.html#NM-DEVICE-VENDOR:CAPS" title="NM_DEVICE_VENDOR">NM_DEVICE_VENDOR</a>, macro in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceWifi.html#NM-DEVICE-WIFI-ACTIVE-ACCESS-POINT:CAPS" title="NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT">NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT</a>, macro in <a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi">NMDeviceWifi</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceWifi.html#NM-DEVICE-WIFI-BITRATE:CAPS" title="NM_DEVICE_WIFI_BITRATE">NM_DEVICE_WIFI_BITRATE</a>, macro in <a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi">NMDeviceWifi</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceWifi.html#NM-DEVICE-WIFI-CAPABILITIES:CAPS" title="NM_DEVICE_WIFI_CAPABILITIES">NM_DEVICE_WIFI_CAPABILITIES</a>, macro in <a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi">NMDeviceWifi</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceWifi.html#nm-device-wifi-get-access-points" title="nm_device_wifi_get_access_points ()">nm_device_wifi_get_access_points</a>, function in <a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi">NMDeviceWifi</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceWifi.html#nm-device-wifi-get-access-point-by-path" title="nm_device_wifi_get_access_point_by_path ()">nm_device_wifi_get_access_point_by_path</a>, function in <a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi">NMDeviceWifi</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceWifi.html#nm-device-wifi-get-active-access-point" title="nm_device_wifi_get_active_access_point ()">nm_device_wifi_get_active_access_point</a>, function in <a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi">NMDeviceWifi</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceWifi.html#nm-device-wifi-get-bitrate" title="nm_device_wifi_get_bitrate ()">nm_device_wifi_get_bitrate</a>, function in <a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi">NMDeviceWifi</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceWifi.html#nm-device-wifi-get-capabilities" title="nm_device_wifi_get_capabilities ()">nm_device_wifi_get_capabilities</a>, function in <a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi">NMDeviceWifi</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceWifi.html#nm-device-wifi-get-hw-address" title="nm_device_wifi_get_hw_address ()">nm_device_wifi_get_hw_address</a>, function in <a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi">NMDeviceWifi</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceWifi.html#nm-device-wifi-get-mode" title="nm_device_wifi_get_mode ()">nm_device_wifi_get_mode</a>, function in <a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi">NMDeviceWifi</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceWifi.html#nm-device-wifi-get-permanent-hw-address" title="nm_device_wifi_get_permanent_hw_address ()">nm_device_wifi_get_permanent_hw_address</a>, function in <a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi">NMDeviceWifi</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceWifi.html#NM-DEVICE-WIFI-HW-ADDRESS:CAPS" title="NM_DEVICE_WIFI_HW_ADDRESS">NM_DEVICE_WIFI_HW_ADDRESS</a>, macro in <a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi">NMDeviceWifi</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceWifi.html#NM-DEVICE-WIFI-MODE:CAPS" title="NM_DEVICE_WIFI_MODE">NM_DEVICE_WIFI_MODE</a>, macro in <a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi">NMDeviceWifi</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceWifi.html#nm-device-wifi-new" title="nm_device_wifi_new ()">nm_device_wifi_new</a>, function in <a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi">NMDeviceWifi</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceWifi.html#NM-DEVICE-WIFI-PERMANENT-HW-ADDRESS:CAPS" title="NM_DEVICE_WIFI_PERMANENT_HW_ADDRESS">NM_DEVICE_WIFI_PERMANENT_HW_ADDRESS</a>, macro in <a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi">NMDeviceWifi</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceWimax.html#NM-DEVICE-WIMAX-ACTIVE-NSP:CAPS" title="NM_DEVICE_WIMAX_ACTIVE_NSP">NM_DEVICE_WIMAX_ACTIVE_NSP</a>, macro in <a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax">NMDeviceWimax</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceWimax.html#NM-DEVICE-WIMAX-BSID:CAPS" title="NM_DEVICE_WIMAX_BSID">NM_DEVICE_WIMAX_BSID</a>, macro in <a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax">NMDeviceWimax</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceWimax.html#NM-DEVICE-WIMAX-CENTER-FREQUENCY:CAPS" title="NM_DEVICE_WIMAX_CENTER_FREQUENCY">NM_DEVICE_WIMAX_CENTER_FREQUENCY</a>, macro in <a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax">NMDeviceWimax</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceWimax.html#NM-DEVICE-WIMAX-CINR:CAPS" title="NM_DEVICE_WIMAX_CINR">NM_DEVICE_WIMAX_CINR</a>, macro in <a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax">NMDeviceWimax</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceWimax.html#nm-device-wimax-get-active-nsp" title="nm_device_wimax_get_active_nsp ()">nm_device_wimax_get_active_nsp</a>, function in <a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax">NMDeviceWimax</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceWimax.html#nm-device-wimax-get-bsid" title="nm_device_wimax_get_bsid ()">nm_device_wimax_get_bsid</a>, function in <a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax">NMDeviceWimax</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceWimax.html#nm-device-wimax-get-center-frequency" title="nm_device_wimax_get_center_frequency ()">nm_device_wimax_get_center_frequency</a>, function in <a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax">NMDeviceWimax</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceWimax.html#nm-device-wimax-get-cinr" title="nm_device_wimax_get_cinr ()">nm_device_wimax_get_cinr</a>, function in <a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax">NMDeviceWimax</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceWimax.html#nm-device-wimax-get-hw-address" title="nm_device_wimax_get_hw_address ()">nm_device_wimax_get_hw_address</a>, function in <a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax">NMDeviceWimax</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceWimax.html#nm-device-wimax-get-nsps" title="nm_device_wimax_get_nsps ()">nm_device_wimax_get_nsps</a>, function in <a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax">NMDeviceWimax</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceWimax.html#nm-device-wimax-get-nsp-by-path" title="nm_device_wimax_get_nsp_by_path ()">nm_device_wimax_get_nsp_by_path</a>, function in <a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax">NMDeviceWimax</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceWimax.html#nm-device-wimax-get-rssi" title="nm_device_wimax_get_rssi ()">nm_device_wimax_get_rssi</a>, function in <a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax">NMDeviceWimax</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceWimax.html#nm-device-wimax-get-tx-power" title="nm_device_wimax_get_tx_power ()">nm_device_wimax_get_tx_power</a>, function in <a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax">NMDeviceWimax</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceWimax.html#NM-DEVICE-WIMAX-HW-ADDRESS:CAPS" title="NM_DEVICE_WIMAX_HW_ADDRESS">NM_DEVICE_WIMAX_HW_ADDRESS</a>, macro in <a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax">NMDeviceWimax</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceWimax.html#nm-device-wimax-new" title="nm_device_wimax_new ()">nm_device_wimax_new</a>, function in <a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax">NMDeviceWimax</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceWimax.html#NM-DEVICE-WIMAX-RSSI:CAPS" title="NM_DEVICE_WIMAX_RSSI">NM_DEVICE_WIMAX_RSSI</a>, macro in <a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax">NMDeviceWimax</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceWimax.html#NM-DEVICE-WIMAX-TX-POWER:CAPS" title="NM_DEVICE_WIMAX_TX_POWER">NM_DEVICE_WIMAX_TX_POWER</a>, macro in <a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax">NMDeviceWimax</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDHCP4Config.html#NMDHCP4Config-struct" title="NMDHCP4Config">NMDHCP4Config</a>, struct in <a class="link" href="NMDHCP4Config.html" title="NMDHCP4Config">NMDHCP4Config</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDHCP4Config.html#NMDHCP4Config--options" title='The "options" property'>NMDHCP4Config:options</a>, object property in <a class="link" href="NMDHCP4Config.html" title="NMDHCP4Config">NMDHCP4Config</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDHCP4Config.html#NMDHCP4ConfigClass" title="NMDHCP4ConfigClass">NMDHCP4ConfigClass</a>, struct in <a class="link" href="NMDHCP4Config.html" title="NMDHCP4Config">NMDHCP4Config</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDHCP4Config.html#nm-dhcp4-config-get-one-option" title="nm_dhcp4_config_get_one_option ()">nm_dhcp4_config_get_one_option</a>, function in <a class="link" href="NMDHCP4Config.html" title="NMDHCP4Config">NMDHCP4Config</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDHCP4Config.html#nm-dhcp4-config-get-options" title="nm_dhcp4_config_get_options ()">nm_dhcp4_config_get_options</a>, function in <a class="link" href="NMDHCP4Config.html" title="NMDHCP4Config">NMDHCP4Config</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDHCP4Config.html#nm-dhcp4-config-new" title="nm_dhcp4_config_new ()">nm_dhcp4_config_new</a>, function in <a class="link" href="NMDHCP4Config.html" title="NMDHCP4Config">NMDHCP4Config</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDHCP4Config.html#NM-DHCP4-CONFIG-OPTIONS:CAPS" title="NM_DHCP4_CONFIG_OPTIONS">NM_DHCP4_CONFIG_OPTIONS</a>, macro in <a class="link" href="NMDHCP4Config.html" title="NMDHCP4Config">NMDHCP4Config</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDHCP6Config.html#NMDHCP6Config-struct" title="NMDHCP6Config">NMDHCP6Config</a>, struct in <a class="link" href="NMDHCP6Config.html" title="NMDHCP6Config">NMDHCP6Config</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDHCP6Config.html#NMDHCP6Config--options" title='The "options" property'>NMDHCP6Config:options</a>, object property in <a class="link" href="NMDHCP6Config.html" title="NMDHCP6Config">NMDHCP6Config</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDHCP6Config.html#NMDHCP6ConfigClass" title="NMDHCP6ConfigClass">NMDHCP6ConfigClass</a>, struct in <a class="link" href="NMDHCP6Config.html" title="NMDHCP6Config">NMDHCP6Config</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDHCP6Config.html#nm-dhcp6-config-get-one-option" title="nm_dhcp6_config_get_one_option ()">nm_dhcp6_config_get_one_option</a>, function in <a class="link" href="NMDHCP6Config.html" title="NMDHCP6Config">NMDHCP6Config</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDHCP6Config.html#nm-dhcp6-config-get-options" title="nm_dhcp6_config_get_options ()">nm_dhcp6_config_get_options</a>, function in <a class="link" href="NMDHCP6Config.html" title="NMDHCP6Config">NMDHCP6Config</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDHCP6Config.html#nm-dhcp6-config-new" title="nm_dhcp6_config_new ()">nm_dhcp6_config_new</a>, function in <a class="link" href="NMDHCP6Config.html" title="NMDHCP6Config">NMDHCP6Config</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDHCP6Config.html#NM-DHCP6-CONFIG-OPTIONS:CAPS" title="NM_DHCP6_CONFIG_OPTIONS">NM_DHCP6_CONFIG_OPTIONS</a>, macro in <a class="link" href="NMDHCP6Config.html" title="NMDHCP6Config">NMDHCP6Config</a>
+</dt>
+<dd></dd>
+<a name="idxG"></a><h3 class="title">G</h3>
+<dt>
+g_marshal_value_peek_boolean, macro in nm-secret-agent-glue
+</dt>
+<dd></dd>
+<dt>
+g_marshal_value_peek_boxed, macro in nm-secret-agent-glue
+</dt>
+<dd></dd>
+<dt>
+g_marshal_value_peek_char, macro in nm-secret-agent-glue
+</dt>
+<dd></dd>
+<dt>
+g_marshal_value_peek_double, macro in nm-secret-agent-glue
+</dt>
+<dd></dd>
+<dt>
+g_marshal_value_peek_enum, macro in nm-secret-agent-glue
+</dt>
+<dd></dd>
+<dt>
+g_marshal_value_peek_flags, macro in nm-secret-agent-glue
+</dt>
+<dd></dd>
+<dt>
+g_marshal_value_peek_float, macro in nm-secret-agent-glue
+</dt>
+<dd></dd>
+<dt>
+g_marshal_value_peek_int, macro in nm-secret-agent-glue
+</dt>
+<dd></dd>
+<dt>
+g_marshal_value_peek_int64, macro in nm-secret-agent-glue
+</dt>
+<dd></dd>
+<dt>
+g_marshal_value_peek_long, macro in nm-secret-agent-glue
+</dt>
+<dd></dd>
+<dt>
+g_marshal_value_peek_object, macro in nm-secret-agent-glue
+</dt>
+<dd></dd>
+<dt>
+g_marshal_value_peek_param, macro in nm-secret-agent-glue
+</dt>
+<dd></dd>
+<dt>
+g_marshal_value_peek_pointer, macro in nm-secret-agent-glue
+</dt>
+<dd></dd>
+<dt>
+g_marshal_value_peek_string, macro in nm-secret-agent-glue
+</dt>
+<dd></dd>
+<dt>
+g_marshal_value_peek_uchar, macro in nm-secret-agent-glue
+</dt>
+<dd></dd>
+<dt>
+g_marshal_value_peek_uint, macro in nm-secret-agent-glue
+</dt>
+<dd></dd>
+<dt>
+g_marshal_value_peek_uint64, macro in nm-secret-agent-glue
+</dt>
+<dd></dd>
+<dt>
+g_marshal_value_peek_ulong, macro in nm-secret-agent-glue
+</dt>
+<dd></dd>
+<dt>
+g_marshal_value_peek_variant, macro in nm-secret-agent-glue
+</dt>
+<dd></dd>
+<a name="idxI"></a><h3 class="title">I</h3>
+<dt>
+<a class="link" href="NMIP4Config.html#NMIP4Config-struct" title="NMIP4Config">NMIP4Config</a>, struct in <a class="link" href="NMIP4Config.html" title="NMIP4Config">NMIP4Config</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMIP4Config.html#NMIP4Config--addresses" title='The "addresses" property'>NMIP4Config:addresses</a>, object property in <a class="link" href="NMIP4Config.html" title="NMIP4Config">NMIP4Config</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMIP4Config.html#NMIP4Config--domains" title='The "domains" property'>NMIP4Config:domains</a>, object property in <a class="link" href="NMIP4Config.html" title="NMIP4Config">NMIP4Config</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMIP4Config.html#NMIP4Config--nameservers" title='The "nameservers" property'>NMIP4Config:nameservers</a>, object property in <a class="link" href="NMIP4Config.html" title="NMIP4Config">NMIP4Config</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMIP4Config.html#NMIP4Config--routes" title='The "routes" property'>NMIP4Config:routes</a>, object property in <a class="link" href="NMIP4Config.html" title="NMIP4Config">NMIP4Config</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMIP4Config.html#NMIP4Config--wins-servers" title='The "wins-servers" property'>NMIP4Config:wins-servers</a>, object property in <a class="link" href="NMIP4Config.html" title="NMIP4Config">NMIP4Config</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMIP4Config.html#NMIP4ConfigClass" title="NMIP4ConfigClass">NMIP4ConfigClass</a>, struct in <a class="link" href="NMIP4Config.html" title="NMIP4Config">NMIP4Config</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMIP4Config.html#NM-IP4-CONFIG-ADDRESSES:CAPS" title="NM_IP4_CONFIG_ADDRESSES">NM_IP4_CONFIG_ADDRESSES</a>, macro in <a class="link" href="NMIP4Config.html" title="NMIP4Config">NMIP4Config</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMIP4Config.html#NM-IP4-CONFIG-DOMAINS:CAPS" title="NM_IP4_CONFIG_DOMAINS">NM_IP4_CONFIG_DOMAINS</a>, macro in <a class="link" href="NMIP4Config.html" title="NMIP4Config">NMIP4Config</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMIP4Config.html#nm-ip4-config-get-addresses" title="nm_ip4_config_get_addresses ()">nm_ip4_config_get_addresses</a>, function in <a class="link" href="NMIP4Config.html" title="NMIP4Config">NMIP4Config</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMIP4Config.html#nm-ip4-config-get-domains" title="nm_ip4_config_get_domains ()">nm_ip4_config_get_domains</a>, function in <a class="link" href="NMIP4Config.html" title="NMIP4Config">NMIP4Config</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMIP4Config.html#nm-ip4-config-get-nameservers" title="nm_ip4_config_get_nameservers ()">nm_ip4_config_get_nameservers</a>, function in <a class="link" href="NMIP4Config.html" title="NMIP4Config">NMIP4Config</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMIP4Config.html#nm-ip4-config-get-routes" title="nm_ip4_config_get_routes ()">nm_ip4_config_get_routes</a>, function in <a class="link" href="NMIP4Config.html" title="NMIP4Config">NMIP4Config</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMIP4Config.html#nm-ip4-config-get-wins-servers" title="nm_ip4_config_get_wins_servers ()">nm_ip4_config_get_wins_servers</a>, function in <a class="link" href="NMIP4Config.html" title="NMIP4Config">NMIP4Config</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMIP4Config.html#NM-IP4-CONFIG-NAMESERVERS:CAPS" title="NM_IP4_CONFIG_NAMESERVERS">NM_IP4_CONFIG_NAMESERVERS</a>, macro in <a class="link" href="NMIP4Config.html" title="NMIP4Config">NMIP4Config</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMIP4Config.html#nm-ip4-config-new" title="nm_ip4_config_new ()">nm_ip4_config_new</a>, function in <a class="link" href="NMIP4Config.html" title="NMIP4Config">NMIP4Config</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMIP4Config.html#NM-IP4-CONFIG-ROUTES:CAPS" title="NM_IP4_CONFIG_ROUTES">NM_IP4_CONFIG_ROUTES</a>, macro in <a class="link" href="NMIP4Config.html" title="NMIP4Config">NMIP4Config</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMIP4Config.html#NM-IP4-CONFIG-WINS-SERVERS:CAPS" title="NM_IP4_CONFIG_WINS_SERVERS">NM_IP4_CONFIG_WINS_SERVERS</a>, macro in <a class="link" href="NMIP4Config.html" title="NMIP4Config">NMIP4Config</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMIP6Config.html#NMIP6Config-struct" title="NMIP6Config">NMIP6Config</a>, struct in <a class="link" href="NMIP6Config.html" title="NMIP6Config">NMIP6Config</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMIP6Config.html#NMIP6Config--addresses" title='The "addresses" property'>NMIP6Config:addresses</a>, object property in <a class="link" href="NMIP6Config.html" title="NMIP6Config">NMIP6Config</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMIP6Config.html#NMIP6Config--domains" title='The "domains" property'>NMIP6Config:domains</a>, object property in <a class="link" href="NMIP6Config.html" title="NMIP6Config">NMIP6Config</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMIP6Config.html#NMIP6Config--nameservers" title='The "nameservers" property'>NMIP6Config:nameservers</a>, object property in <a class="link" href="NMIP6Config.html" title="NMIP6Config">NMIP6Config</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMIP6Config.html#NMIP6Config--routes" title='The "routes" property'>NMIP6Config:routes</a>, object property in <a class="link" href="NMIP6Config.html" title="NMIP6Config">NMIP6Config</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMIP6Config.html#NMIP6ConfigClass" title="NMIP6ConfigClass">NMIP6ConfigClass</a>, struct in <a class="link" href="NMIP6Config.html" title="NMIP6Config">NMIP6Config</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libnm-glib-nm-types.html#nm-ip6-address-array-get-type" title="nm_ip6_address_array_get_type ()">nm_ip6_address_array_get_type</a>, function in <a class="link" href="libnm-glib-nm-types.html" title="nm-types">nm-types</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libnm-glib-nm-types.html#nm-ip6-address-object-array-get-type" title="nm_ip6_address_object_array_get_type ()">nm_ip6_address_object_array_get_type</a>, function in <a class="link" href="libnm-glib-nm-types.html" title="nm-types">nm-types</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMIP6Config.html#NM-IP6-CONFIG-ADDRESSES:CAPS" title="NM_IP6_CONFIG_ADDRESSES">NM_IP6_CONFIG_ADDRESSES</a>, macro in <a class="link" href="NMIP6Config.html" title="NMIP6Config">NMIP6Config</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMIP6Config.html#NM-IP6-CONFIG-DOMAINS:CAPS" title="NM_IP6_CONFIG_DOMAINS">NM_IP6_CONFIG_DOMAINS</a>, macro in <a class="link" href="NMIP6Config.html" title="NMIP6Config">NMIP6Config</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMIP6Config.html#nm-ip6-config-get-addresses" title="nm_ip6_config_get_addresses ()">nm_ip6_config_get_addresses</a>, function in <a class="link" href="NMIP6Config.html" title="NMIP6Config">NMIP6Config</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMIP6Config.html#nm-ip6-config-get-domains" title="nm_ip6_config_get_domains ()">nm_ip6_config_get_domains</a>, function in <a class="link" href="NMIP6Config.html" title="NMIP6Config">NMIP6Config</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMIP6Config.html#nm-ip6-config-get-nameservers" title="nm_ip6_config_get_nameservers ()">nm_ip6_config_get_nameservers</a>, function in <a class="link" href="NMIP6Config.html" title="NMIP6Config">NMIP6Config</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMIP6Config.html#nm-ip6-config-get-routes" title="nm_ip6_config_get_routes ()">nm_ip6_config_get_routes</a>, function in <a class="link" href="NMIP6Config.html" title="NMIP6Config">NMIP6Config</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMIP6Config.html#NM-IP6-CONFIG-NAMESERVERS:CAPS" title="NM_IP6_CONFIG_NAMESERVERS">NM_IP6_CONFIG_NAMESERVERS</a>, macro in <a class="link" href="NMIP6Config.html" title="NMIP6Config">NMIP6Config</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMIP6Config.html#nm-ip6-config-new" title="nm_ip6_config_new ()">nm_ip6_config_new</a>, function in <a class="link" href="NMIP6Config.html" title="NMIP6Config">NMIP6Config</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMIP6Config.html#NM-IP6-CONFIG-ROUTES:CAPS" title="NM_IP6_CONFIG_ROUTES">NM_IP6_CONFIG_ROUTES</a>, macro in <a class="link" href="NMIP6Config.html" title="NMIP6Config">NMIP6Config</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libnm-glib-nm-types.html#nm-ip6-route-object-array-get-type" title="nm_ip6_route_object_array_get_type ()">nm_ip6_route_object_array_get_type</a>, function in <a class="link" href="libnm-glib-nm-types.html" title="nm-types">nm-types</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libnm-glib-NMVpnPluginUi.html#NM-IS-VPN-PLUGIN-UI-WIDGET-INTERFACE:CAPS" title="NM_IS_VPN_PLUGIN_UI_WIDGET_INTERFACE()">NM_IS_VPN_PLUGIN_UI_WIDGET_INTERFACE</a>, macro in <a class="link" href="libnm-glib-NMVpnPluginUi.html" title="NMVpnPluginUi">NMVpnPluginUi</a>
+</dt>
+<dd></dd>
+<a name="idxO"></a><h3 class="title">O</h3>
+<dt>
+<a class="link" href="NMObject.html#NMObject-struct" title="NMObject">NMObject</a>, struct in <a class="link" href="NMObject.html" title="NMObject">NMObject</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMObject.html#NMObject--dbus-connection" title='The "dbus-connection" property'>NMObject:dbus-connection</a>, object property in <a class="link" href="NMObject.html" title="NMObject">NMObject</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMObject.html#NMObject--dbus-path" title='The "dbus-path" property'>NMObject:dbus-path</a>, object property in <a class="link" href="NMObject.html" title="NMObject">NMObject</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMObject.html#NMObjectClass" title="NMObjectClass">NMObjectClass</a>, struct in <a class="link" href="NMObject.html" title="NMObject">NMObject</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libnm-glib-nm-types.html#nm-object-array-get-type" title="nm_object_array_get_type ()">nm_object_array_get_type</a>, function in <a class="link" href="libnm-glib-nm-types.html" title="nm-types">nm-types</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMObject.html#NM-OBJECT-DBUS-CONNECTION:CAPS" title="NM_OBJECT_DBUS_CONNECTION">NM_OBJECT_DBUS_CONNECTION</a>, macro in <a class="link" href="NMObject.html" title="NMObject">NMObject</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMObject.html#NM-OBJECT-DBUS-PATH:CAPS" title="NM_OBJECT_DBUS_PATH">NM_OBJECT_DBUS_PATH</a>, macro in <a class="link" href="NMObject.html" title="NMObject">NMObject</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMObject.html#nm-object-get-connection" title="nm_object_get_connection ()">nm_object_get_connection</a>, function in <a class="link" href="NMObject.html" title="NMObject">NMObject</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMObject.html#nm-object-get-path" title="nm_object_get_path ()">nm_object_get_path</a>, function in <a class="link" href="NMObject.html" title="NMObject">NMObject</a>
+</dt>
+<dd></dd>
+<a name="idxR"></a><h3 class="title">R</h3>
+<dt>
+<a class="link" href="NMRemoteConnection.html#NMRemoteConnection-struct" title="NMRemoteConnection">NMRemoteConnection</a>, struct in <a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection">NMRemoteConnection</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMRemoteConnection.html#NMRemoteConnection-removed" title='The "removed" signal'>NMRemoteConnection::removed</a>, object signal in <a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection">NMRemoteConnection</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMRemoteConnection.html#NMRemoteConnection-updated" title='The "updated" signal'>NMRemoteConnection::updated</a>, object signal in <a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection">NMRemoteConnection</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMRemoteConnection.html#NMRemoteConnection-visible" title='The "visible" signal'>NMRemoteConnection::visible</a>, object signal in <a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection">NMRemoteConnection</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMRemoteConnection.html#NMRemoteConnection--bus" title='The "bus" property'>NMRemoteConnection:bus</a>, object property in <a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection">NMRemoteConnection</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMRemoteConnection.html#NMRemoteConnection--init-result" title='The "init-result" property'>NMRemoteConnection:init-result</a>, object property in <a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection">NMRemoteConnection</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMRemoteConnection.html#NMRemoteConnectionClass" title="NMRemoteConnectionClass">NMRemoteConnectionClass</a>, struct in <a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection">NMRemoteConnection</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMRemoteConnection.html#NMRemoteConnectionCommitFunc" title="NMRemoteConnectionCommitFunc ()">NMRemoteConnectionCommitFunc</a>, user_function in <a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection">NMRemoteConnection</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMRemoteConnection.html#NMRemoteConnectionDeleteFunc" title="NMRemoteConnectionDeleteFunc ()">NMRemoteConnectionDeleteFunc</a>, user_function in <a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection">NMRemoteConnection</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMRemoteConnection.html#NMRemoteConnectionGetSecretsFunc" title="NMRemoteConnectionGetSecretsFunc ()">NMRemoteConnectionGetSecretsFunc</a>, user_function in <a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection">NMRemoteConnection</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMRemoteSettings.html#NMRemoteSettings-struct" title="struct NMRemoteSettings">NMRemoteSettings</a>, struct in <a class="link" href="NMRemoteSettings.html" title="NMRemoteSettings">NMRemoteSettings</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMRemoteSettings.html#NMRemoteSettings-connections-read" title='The "connections-read" signal'>NMRemoteSettings::connections-read</a>, object signal in <a class="link" href="NMRemoteSettings.html" title="NMRemoteSettings">NMRemoteSettings</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMRemoteSettings.html#NMRemoteSettings-new-connection" title='The "new-connection" signal'>NMRemoteSettings::new-connection</a>, object signal in <a class="link" href="NMRemoteSettings.html" title="NMRemoteSettings">NMRemoteSettings</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMRemoteSettings.html#NMRemoteSettings--bus" title='The "bus" property'>NMRemoteSettings:bus</a>, object property in <a class="link" href="NMRemoteSettings.html" title="NMRemoteSettings">NMRemoteSettings</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMRemoteSettings.html#NMRemoteSettings--can-modify" title='The "can-modify" property'>NMRemoteSettings:can-modify</a>, object property in <a class="link" href="NMRemoteSettings.html" title="NMRemoteSettings">NMRemoteSettings</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMRemoteSettings.html#NMRemoteSettings--hostname" title='The "hostname" property'>NMRemoteSettings:hostname</a>, object property in <a class="link" href="NMRemoteSettings.html" title="NMRemoteSettings">NMRemoteSettings</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMRemoteSettings.html#NMRemoteSettings--service-running" title='The "service-running" property'>NMRemoteSettings:service-running</a>, object property in <a class="link" href="NMRemoteSettings.html" title="NMRemoteSettings">NMRemoteSettings</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMRemoteSettings.html#NMRemoteSettingsAddConnectionFunc" title="NMRemoteSettingsAddConnectionFunc ()">NMRemoteSettingsAddConnectionFunc</a>, user_function in <a class="link" href="NMRemoteSettings.html" title="NMRemoteSettings">NMRemoteSettings</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMRemoteSettings.html#NMRemoteSettingsClass" title="struct NMRemoteSettingsClass">NMRemoteSettingsClass</a>, struct in <a class="link" href="NMRemoteSettings.html" title="NMRemoteSettings">NMRemoteSettings</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMRemoteSettings.html#NMRemoteSettingsError" title="enum NMRemoteSettingsError">NMRemoteSettingsError</a>, enum in <a class="link" href="NMRemoteSettings.html" title="NMRemoteSettings">NMRemoteSettings</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMRemoteSettings.html#NMRemoteSettingsSaveHostnameFunc" title="NMRemoteSettingsSaveHostnameFunc ()">NMRemoteSettingsSaveHostnameFunc</a>, user_function in <a class="link" href="NMRemoteSettings.html" title="NMRemoteSettings">NMRemoteSettings</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMRemoteConnection.html#nm-remote-connection-commit-changes" title="nm_remote_connection_commit_changes ()">nm_remote_connection_commit_changes</a>, function in <a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection">NMRemoteConnection</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMRemoteConnection.html#nm-remote-connection-delete" title="nm_remote_connection_delete ()">nm_remote_connection_delete</a>, function in <a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection">NMRemoteConnection</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMRemoteConnection.html#nm-remote-connection-get-secrets" title="nm_remote_connection_get_secrets ()">nm_remote_connection_get_secrets</a>, function in <a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection">NMRemoteConnection</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMRemoteConnection.html#nm-remote-connection-new" title="nm_remote_connection_new ()">nm_remote_connection_new</a>, function in <a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection">NMRemoteConnection</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMRemoteConnection.html#NM-REMOTE-CONNECTION-REMOVED:CAPS" title="NM_REMOTE_CONNECTION_REMOVED">NM_REMOTE_CONNECTION_REMOVED</a>, macro in <a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection">NMRemoteConnection</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMRemoteConnection.html#NM-REMOTE-CONNECTION-UPDATED:CAPS" title="NM_REMOTE_CONNECTION_UPDATED">NM_REMOTE_CONNECTION_UPDATED</a>, macro in <a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection">NMRemoteConnection</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMRemoteSettings.html#nm-remote-settings-add-connection" title="nm_remote_settings_add_connection ()">nm_remote_settings_add_connection</a>, function in <a class="link" href="NMRemoteSettings.html" title="NMRemoteSettings">NMRemoteSettings</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMRemoteSettings.html#NM-REMOTE-SETTINGS-BUS:CAPS" title="NM_REMOTE_SETTINGS_BUS">NM_REMOTE_SETTINGS_BUS</a>, macro in <a class="link" href="NMRemoteSettings.html" title="NMRemoteSettings">NMRemoteSettings</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMRemoteSettings.html#NM-REMOTE-SETTINGS-CAN-MODIFY:CAPS" title="NM_REMOTE_SETTINGS_CAN_MODIFY">NM_REMOTE_SETTINGS_CAN_MODIFY</a>, macro in <a class="link" href="NMRemoteSettings.html" title="NMRemoteSettings">NMRemoteSettings</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMRemoteSettings.html#NM-REMOTE-SETTINGS-CONNECTIONS-READ:CAPS" title="NM_REMOTE_SETTINGS_CONNECTIONS_READ">NM_REMOTE_SETTINGS_CONNECTIONS_READ</a>, macro in <a class="link" href="NMRemoteSettings.html" title="NMRemoteSettings">NMRemoteSettings</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMRemoteSettings.html#NM-REMOTE-SETTINGS-ERROR:CAPS" title="NM_REMOTE_SETTINGS_ERROR">NM_REMOTE_SETTINGS_ERROR</a>, macro in <a class="link" href="NMRemoteSettings.html" title="NMRemoteSettings">NMRemoteSettings</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMRemoteSettings.html#nm-remote-settings-error-quark" title="nm_remote_settings_error_quark ()">nm_remote_settings_error_quark</a>, function in <a class="link" href="NMRemoteSettings.html" title="NMRemoteSettings">NMRemoteSettings</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMRemoteSettings.html#nm-remote-settings-get-connection-by-path" title="nm_remote_settings_get_connection_by_path ()">nm_remote_settings_get_connection_by_path</a>, function in <a class="link" href="NMRemoteSettings.html" title="NMRemoteSettings">NMRemoteSettings</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMRemoteSettings.html#nm-remote-settings-get-type" title="nm_remote_settings_get_type ()">nm_remote_settings_get_type</a>, function in <a class="link" href="NMRemoteSettings.html" title="NMRemoteSettings">NMRemoteSettings</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMRemoteSettings.html#NM-REMOTE-SETTINGS-HOSTNAME:CAPS" title="NM_REMOTE_SETTINGS_HOSTNAME">NM_REMOTE_SETTINGS_HOSTNAME</a>, macro in <a class="link" href="NMRemoteSettings.html" title="NMRemoteSettings">NMRemoteSettings</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMRemoteSettings.html#nm-remote-settings-list-connections" title="nm_remote_settings_list_connections ()">nm_remote_settings_list_connections</a>, function in <a class="link" href="NMRemoteSettings.html" title="NMRemoteSettings">NMRemoteSettings</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMRemoteSettings.html#nm-remote-settings-new" title="nm_remote_settings_new ()">nm_remote_settings_new</a>, function in <a class="link" href="NMRemoteSettings.html" title="NMRemoteSettings">NMRemoteSettings</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMRemoteSettings.html#NM-REMOTE-SETTINGS-NEW-CONNECTION:CAPS" title="NM_REMOTE_SETTINGS_NEW_CONNECTION">NM_REMOTE_SETTINGS_NEW_CONNECTION</a>, macro in <a class="link" href="NMRemoteSettings.html" title="NMRemoteSettings">NMRemoteSettings</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMRemoteSettings.html#nm-remote-settings-save-hostname" title="nm_remote_settings_save_hostname ()">nm_remote_settings_save_hostname</a>, function in <a class="link" href="NMRemoteSettings.html" title="NMRemoteSettings">NMRemoteSettings</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMRemoteSettings.html#NM-REMOTE-SETTINGS-SERVICE-RUNNING:CAPS" title="NM_REMOTE_SETTINGS_SERVICE_RUNNING">NM_REMOTE_SETTINGS_SERVICE_RUNNING</a>, macro in <a class="link" href="NMRemoteSettings.html" title="NMRemoteSettings">NMRemoteSettings</a>
+</dt>
+<dd></dd>
+<a name="idxS"></a><h3 class="title">S</h3>
+<dt>
+<a class="link" href="NMSecretAgent.html#NMSecretAgent-struct" title="NMSecretAgent">NMSecretAgent</a>, struct in <a class="link" href="NMSecretAgent.html" title="NMSecretAgent">NMSecretAgent</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSecretAgent.html#NMSecretAgent-registration-result" title='The "registration-result" signal'>NMSecretAgent::registration-result</a>, object signal in <a class="link" href="NMSecretAgent.html" title="NMSecretAgent">NMSecretAgent</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSecretAgent.html#NMSecretAgent--auto-register" title='The "auto-register" property'>NMSecretAgent:auto-register</a>, object property in <a class="link" href="NMSecretAgent.html" title="NMSecretAgent">NMSecretAgent</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSecretAgent.html#NMSecretAgent--identifier" title='The "identifier" property'>NMSecretAgent:identifier</a>, object property in <a class="link" href="NMSecretAgent.html" title="NMSecretAgent">NMSecretAgent</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSecretAgent.html#NMSecretAgentClass" title="NMSecretAgentClass">NMSecretAgentClass</a>, struct in <a class="link" href="NMSecretAgent.html" title="NMSecretAgent">NMSecretAgent</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSecretAgent.html#NMSecretAgentDeleteSecretsFunc" title="NMSecretAgentDeleteSecretsFunc ()">NMSecretAgentDeleteSecretsFunc</a>, user_function in <a class="link" href="NMSecretAgent.html" title="NMSecretAgent">NMSecretAgent</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSecretAgent.html#NMSecretAgentError" title="enum NMSecretAgentError">NMSecretAgentError</a>, enum in <a class="link" href="NMSecretAgent.html" title="NMSecretAgent">NMSecretAgent</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSecretAgent.html#NMSecretAgentGetSecretsFlags" title="enum NMSecretAgentGetSecretsFlags">NMSecretAgentGetSecretsFlags</a>, enum in <a class="link" href="NMSecretAgent.html" title="NMSecretAgent">NMSecretAgent</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSecretAgent.html#NMSecretAgentGetSecretsFunc" title="NMSecretAgentGetSecretsFunc ()">NMSecretAgentGetSecretsFunc</a>, user_function in <a class="link" href="NMSecretAgent.html" title="NMSecretAgent">NMSecretAgent</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSecretAgent.html#NMSecretAgentSaveSecretsFunc" title="NMSecretAgentSaveSecretsFunc ()">NMSecretAgentSaveSecretsFunc</a>, user_function in <a class="link" href="NMSecretAgent.html" title="NMSecretAgent">NMSecretAgent</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSecretAgent.html#NM-SECRET-AGENT-AUTO-REGISTER:CAPS" title="NM_SECRET_AGENT_AUTO_REGISTER">NM_SECRET_AGENT_AUTO_REGISTER</a>, macro in <a class="link" href="NMSecretAgent.html" title="NMSecretAgent">NMSecretAgent</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSecretAgent.html#nm-secret-agent-delete-secrets" title="nm_secret_agent_delete_secrets ()">nm_secret_agent_delete_secrets</a>, function in <a class="link" href="NMSecretAgent.html" title="NMSecretAgent">NMSecretAgent</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSecretAgent.html#NM-SECRET-AGENT-ERROR:CAPS" title="NM_SECRET_AGENT_ERROR">NM_SECRET_AGENT_ERROR</a>, macro in <a class="link" href="NMSecretAgent.html" title="NMSecretAgent">NMSecretAgent</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSecretAgent.html#nm-secret-agent-error-quark" title="nm_secret_agent_error_quark ()">nm_secret_agent_error_quark</a>, function in <a class="link" href="NMSecretAgent.html" title="NMSecretAgent">NMSecretAgent</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSecretAgent.html#nm-secret-agent-get-secrets" title="nm_secret_agent_get_secrets ()">nm_secret_agent_get_secrets</a>, function in <a class="link" href="NMSecretAgent.html" title="NMSecretAgent">NMSecretAgent</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSecretAgent.html#nm-secret-agent-get-type" title="nm_secret_agent_get_type ()">nm_secret_agent_get_type</a>, function in <a class="link" href="NMSecretAgent.html" title="NMSecretAgent">NMSecretAgent</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSecretAgent.html#NM-SECRET-AGENT-IDENTIFIER:CAPS" title="NM_SECRET_AGENT_IDENTIFIER">NM_SECRET_AGENT_IDENTIFIER</a>, macro in <a class="link" href="NMSecretAgent.html" title="NMSecretAgent">NMSecretAgent</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSecretAgent.html#nm-secret-agent-register" title="nm_secret_agent_register ()">nm_secret_agent_register</a>, function in <a class="link" href="NMSecretAgent.html" title="NMSecretAgent">NMSecretAgent</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSecretAgent.html#NM-SECRET-AGENT-REGISTRATION-RESULT:CAPS" title="NM_SECRET_AGENT_REGISTRATION_RESULT">NM_SECRET_AGENT_REGISTRATION_RESULT</a>, macro in <a class="link" href="NMSecretAgent.html" title="NMSecretAgent">NMSecretAgent</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSecretAgent.html#nm-secret-agent-save-secrets" title="nm_secret_agent_save_secrets ()">nm_secret_agent_save_secrets</a>, function in <a class="link" href="NMSecretAgent.html" title="NMSecretAgent">NMSecretAgent</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSecretAgent.html#nm-secret-agent-unregister" title="nm_secret_agent_unregister ()">nm_secret_agent_unregister</a>, function in <a class="link" href="NMSecretAgent.html" title="NMSecretAgent">NMSecretAgent</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libnm-glib-nm-types.html#nm-ssid-get-type" title="nm_ssid_get_type ()">nm_ssid_get_type</a>, function in <a class="link" href="libnm-glib-nm-types.html" title="nm-types">nm-types</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libnm-glib-nm-types.html#nm-string-array-get-type" title="nm_string_array_get_type ()">nm_string_array_get_type</a>, function in <a class="link" href="libnm-glib-nm-types.html" title="nm-types">nm-types</a>
+</dt>
+<dd></dd>
+<a name="idxT"></a><h3 class="title">T</h3>
+<dt>
+<a class="link" href="libnm-glib-nm-types.html#NM-TYPE-IP6-ADDRESS-ARRAY:CAPS" title="NM_TYPE_IP6_ADDRESS_ARRAY">NM_TYPE_IP6_ADDRESS_ARRAY</a>, macro in <a class="link" href="libnm-glib-nm-types.html" title="nm-types">nm-types</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libnm-glib-nm-types.html#NM-TYPE-IP6-ADDRESS-OBJECT-ARRAY:CAPS" title="NM_TYPE_IP6_ADDRESS_OBJECT_ARRAY">NM_TYPE_IP6_ADDRESS_OBJECT_ARRAY</a>, macro in <a class="link" href="libnm-glib-nm-types.html" title="nm-types">nm-types</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libnm-glib-nm-types.html#NM-TYPE-IP6-ROUTE-OBJECT-ARRAY:CAPS" title="NM_TYPE_IP6_ROUTE_OBJECT_ARRAY">NM_TYPE_IP6_ROUTE_OBJECT_ARRAY</a>, macro in <a class="link" href="libnm-glib-nm-types.html" title="nm-types">nm-types</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libnm-glib-nm-types.html#NM-TYPE-OBJECT-ARRAY:CAPS" title="NM_TYPE_OBJECT_ARRAY">NM_TYPE_OBJECT_ARRAY</a>, macro in <a class="link" href="libnm-glib-nm-types.html" title="nm-types">nm-types</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMRemoteSettings.html#NM-TYPE-REMOTE-SETTINGS-ERROR:CAPS" title="NM_TYPE_REMOTE_SETTINGS_ERROR">NM_TYPE_REMOTE_SETTINGS_ERROR</a>, macro in <a class="link" href="NMRemoteSettings.html" title="NMRemoteSettings">NMRemoteSettings</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSecretAgent.html#NM-TYPE-SECRET-AGENT-ERROR:CAPS" title="NM_TYPE_SECRET_AGENT_ERROR">NM_TYPE_SECRET_AGENT_ERROR</a>, macro in <a class="link" href="NMSecretAgent.html" title="NMSecretAgent">NMSecretAgent</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libnm-glib-nm-types.html#NM-TYPE-SSID:CAPS" title="NM_TYPE_SSID">NM_TYPE_SSID</a>, macro in <a class="link" href="libnm-glib-nm-types.html" title="nm-types">nm-types</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libnm-glib-nm-types.html#NM-TYPE-STRING-ARRAY:CAPS" title="NM_TYPE_STRING_ARRAY">NM_TYPE_STRING_ARRAY</a>, macro in <a class="link" href="libnm-glib-nm-types.html" title="nm-types">nm-types</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libnm-glib-nm-types.html#NM-TYPE-UINT-ARRAY:CAPS" title="NM_TYPE_UINT_ARRAY">NM_TYPE_UINT_ARRAY</a>, macro in <a class="link" href="libnm-glib-nm-types.html" title="nm-types">nm-types</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libnm-glib-NMVPNPlugin.html#NM-TYPE-VPN-PLUGIN-ERROR:CAPS" title="NM_TYPE_VPN_PLUGIN_ERROR">NM_TYPE_VPN_PLUGIN_ERROR</a>, macro in <a class="link" href="libnm-glib-NMVPNPlugin.html" title="NMVPNPlugin">NMVPNPlugin</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libnm-glib-NMVpnPluginUi.html#NM-TYPE-VPN-PLUGIN-UI-WIDGET-INTERFACE:CAPS" title="NM_TYPE_VPN_PLUGIN_UI_WIDGET_INTERFACE">NM_TYPE_VPN_PLUGIN_UI_WIDGET_INTERFACE</a>, macro in <a class="link" href="libnm-glib-NMVpnPluginUi.html" title="NMVpnPluginUi">NMVpnPluginUi</a>
+</dt>
+<dd></dd>
+<a name="idxU"></a><h3 class="title">U</h3>
+<dt>
+<a class="link" href="libnm-glib-nm-types.html#nm-uint-array-get-type" title="nm_uint_array_get_type ()">nm_uint_array_get_type</a>, function in <a class="link" href="libnm-glib-nm-types.html" title="nm-types">nm-types</a>
+</dt>
+<dd></dd>
+<a name="idxV"></a><h3 class="title">V</h3>
+<dt>
+<a class="link" href="NMVPNConnection.html#NMVPNConnection-struct" title="NMVPNConnection">NMVPNConnection</a>, struct in <a class="link" href="NMVPNConnection.html" title="NMVPNConnection">NMVPNConnection</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMVPNConnection.html#NMVPNConnection-vpn-state-changed" title='The "vpn-state-changed" signal'>NMVPNConnection::vpn-state-changed</a>, object signal in <a class="link" href="NMVPNConnection.html" title="NMVPNConnection">NMVPNConnection</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMVPNConnection.html#NMVPNConnection--banner" title='The "banner" property'>NMVPNConnection:banner</a>, object property in <a class="link" href="NMVPNConnection.html" title="NMVPNConnection">NMVPNConnection</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMVPNConnection.html#NMVPNConnection--vpn-state" title='The "vpn-state" property'>NMVPNConnection:vpn-state</a>, object property in <a class="link" href="NMVPNConnection.html" title="NMVPNConnection">NMVPNConnection</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMVPNConnection.html#NMVPNConnectionClass" title="NMVPNConnectionClass">NMVPNConnectionClass</a>, struct in <a class="link" href="NMVPNConnection.html" title="NMVPNConnection">NMVPNConnection</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libnm-glib-NMVPNPlugin.html#NMVPNPlugin" title="NMVPNPlugin">NMVPNPlugin</a>, struct in <a class="link" href="libnm-glib-NMVPNPlugin.html" title="NMVPNPlugin">NMVPNPlugin</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libnm-glib-NMVPNPlugin.html#NMVPNPluginClass" title="NMVPNPluginClass">NMVPNPluginClass</a>, struct in <a class="link" href="libnm-glib-NMVPNPlugin.html" title="NMVPNPlugin">NMVPNPlugin</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libnm-glib-NMVPNPlugin.html#NMVPNPluginError" title="enum NMVPNPluginError">NMVPNPluginError</a>, enum in <a class="link" href="libnm-glib-NMVPNPlugin.html" title="NMVPNPlugin">NMVPNPlugin</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiFactory" title="NMVpnPluginUiFactory ()">NMVpnPluginUiFactory</a>, user_function in <a class="link" href="libnm-glib-NMVpnPluginUi.html" title="NMVpnPluginUi">NMVpnPluginUi</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiInterface" title="struct NMVpnPluginUiInterface">NMVpnPluginUiInterface</a>, struct in <a class="link" href="libnm-glib-NMVpnPluginUi.html" title="NMVpnPluginUi">NMVpnPluginUi</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiInterfaceProp" title="enum NMVpnPluginUiInterfaceProp">NMVpnPluginUiInterfaceProp</a>, enum in <a class="link" href="libnm-glib-NMVpnPluginUi.html" title="NMVpnPluginUi">NMVpnPluginUi</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiWidgetInterface" title="struct NMVpnPluginUiWidgetInterface">NMVpnPluginUiWidgetInterface</a>, struct in <a class="link" href="libnm-glib-NMVpnPluginUi.html" title="NMVpnPluginUi">NMVpnPluginUi</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMVPNConnection.html#NM-VPN-CONNECTION-BANNER:CAPS" title="NM_VPN_CONNECTION_BANNER">NM_VPN_CONNECTION_BANNER</a>, macro in <a class="link" href="NMVPNConnection.html" title="NMVPNConnection">NMVPNConnection</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMVPNConnection.html#nm-vpn-connection-get-banner" title="nm_vpn_connection_get_banner ()">nm_vpn_connection_get_banner</a>, function in <a class="link" href="NMVPNConnection.html" title="NMVPNConnection">NMVPNConnection</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMVPNConnection.html#nm-vpn-connection-get-vpn-state" title="nm_vpn_connection_get_vpn_state ()">nm_vpn_connection_get_vpn_state</a>, function in <a class="link" href="NMVPNConnection.html" title="NMVPNConnection">NMVPNConnection</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMVPNConnection.html#nm-vpn-connection-new" title="nm_vpn_connection_new ()">nm_vpn_connection_new</a>, function in <a class="link" href="NMVPNConnection.html" title="NMVPNConnection">NMVPNConnection</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMVPNConnection.html#NM-VPN-CONNECTION-VPN-STATE:CAPS" title="NM_VPN_CONNECTION_VPN_STATE">NM_VPN_CONNECTION_VPN_STATE</a>, macro in <a class="link" href="NMVPNConnection.html" title="NMVPNConnection">NMVPNConnection</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libnm-glib-NMVPNPlugin.html#NM-VPN-PLUGIN-DBUS-SERVICE-NAME:CAPS" title="NM_VPN_PLUGIN_DBUS_SERVICE_NAME">NM_VPN_PLUGIN_DBUS_SERVICE_NAME</a>, macro in <a class="link" href="libnm-glib-NMVPNPlugin.html" title="NMVPNPlugin">NMVPNPlugin</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libnm-glib-NMVPNPlugin.html#nm-vpn-plugin-disconnect" title="nm_vpn_plugin_disconnect ()">nm_vpn_plugin_disconnect</a>, function in <a class="link" href="libnm-glib-NMVPNPlugin.html" title="NMVPNPlugin">NMVPNPlugin</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libnm-glib-NMVPNPlugin.html#NM-VPN-PLUGIN-ERROR:CAPS" title="NM_VPN_PLUGIN_ERROR">NM_VPN_PLUGIN_ERROR</a>, macro in <a class="link" href="libnm-glib-NMVPNPlugin.html" title="NMVPNPlugin">NMVPNPlugin</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libnm-glib-NMVPNPlugin.html#nm-vpn-plugin-error-get-type" title="nm_vpn_plugin_error_get_type ()">nm_vpn_plugin_error_get_type</a>, function in <a class="link" href="libnm-glib-NMVPNPlugin.html" title="NMVPNPlugin">NMVPNPlugin</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libnm-glib-NMVPNPlugin.html#nm-vpn-plugin-error-quark" title="nm_vpn_plugin_error_quark ()">nm_vpn_plugin_error_quark</a>, function in <a class="link" href="libnm-glib-NMVPNPlugin.html" title="NMVPNPlugin">NMVPNPlugin</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libnm-glib-NMVPNPlugin.html#nm-vpn-plugin-failure" title="nm_vpn_plugin_failure ()">nm_vpn_plugin_failure</a>, function in <a class="link" href="libnm-glib-NMVPNPlugin.html" title="NMVPNPlugin">NMVPNPlugin</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libnm-glib-NMVPNPlugin.html#nm-vpn-plugin-get-connection" title="nm_vpn_plugin_get_connection ()">nm_vpn_plugin_get_connection</a>, function in <a class="link" href="libnm-glib-NMVPNPlugin.html" title="NMVPNPlugin">NMVPNPlugin</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libnm-glib-NMVPNPlugin.html#nm-vpn-plugin-get-state" title="nm_vpn_plugin_get_state ()">nm_vpn_plugin_get_state</a>, function in <a class="link" href="libnm-glib-NMVPNPlugin.html" title="NMVPNPlugin">NMVPNPlugin</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libnm-glib-NMVPNPlugin.html#nm-vpn-plugin-set-ip4-config" title="nm_vpn_plugin_set_ip4_config ()">nm_vpn_plugin_set_ip4_config</a>, function in <a class="link" href="libnm-glib-NMVPNPlugin.html" title="NMVPNPlugin">NMVPNPlugin</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libnm-glib-NMVPNPlugin.html#nm-vpn-plugin-set-login-banner" title="nm_vpn_plugin_set_login_banner ()">nm_vpn_plugin_set_login_banner</a>, function in <a class="link" href="libnm-glib-NMVPNPlugin.html" title="NMVPNPlugin">NMVPNPlugin</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libnm-glib-NMVPNPlugin.html#nm-vpn-plugin-set-state" title="nm_vpn_plugin_set_state ()">nm_vpn_plugin_set_state</a>, function in <a class="link" href="libnm-glib-NMVPNPlugin.html" title="NMVPNPlugin">NMVPNPlugin</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libnm-glib-NMVPNPlugin.html#NM-VPN-PLUGIN-STATE:CAPS" title="NM_VPN_PLUGIN_STATE">NM_VPN_PLUGIN_STATE</a>, macro in <a class="link" href="libnm-glib-NMVPNPlugin.html" title="NMVPNPlugin">NMVPNPlugin</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libnm-glib-NMVpnPluginUi.html#NM-VPN-PLUGIN-UI-CAPABILITY-EXPORT:CAPS" title="NM_VPN_PLUGIN_UI_CAPABILITY_EXPORT">NM_VPN_PLUGIN_UI_CAPABILITY_EXPORT</a>, macro in <a class="link" href="libnm-glib-NMVpnPluginUi.html" title="NMVpnPluginUi">NMVpnPluginUi</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libnm-glib-NMVpnPluginUi.html#NM-VPN-PLUGIN-UI-CAPABILITY-IMPORT:CAPS" title="NM_VPN_PLUGIN_UI_CAPABILITY_IMPORT">NM_VPN_PLUGIN_UI_CAPABILITY_IMPORT</a>, macro in <a class="link" href="libnm-glib-NMVpnPluginUi.html" title="NMVpnPluginUi">NMVpnPluginUi</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libnm-glib-NMVpnPluginUi.html#NM-VPN-PLUGIN-UI-CAPABILITY-NONE:CAPS" title="NM_VPN_PLUGIN_UI_CAPABILITY_NONE">NM_VPN_PLUGIN_UI_CAPABILITY_NONE</a>, macro in <a class="link" href="libnm-glib-NMVpnPluginUi.html" title="NMVpnPluginUi">NMVpnPluginUi</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libnm-glib-NMVpnPluginUi.html#nm-vpn-plugin-ui-factory" title="nm_vpn_plugin_ui_factory ()">nm_vpn_plugin_ui_factory</a>, function in <a class="link" href="libnm-glib-NMVpnPluginUi.html" title="NMVpnPluginUi">NMVpnPluginUi</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libnm-glib-NMVpnPluginUi.html#nm-vpn-plugin-ui-interface-delete-connection" title="nm_vpn_plugin_ui_interface_delete_connection ()">nm_vpn_plugin_ui_interface_delete_connection</a>, function in <a class="link" href="libnm-glib-NMVpnPluginUi.html" title="NMVpnPluginUi">NMVpnPluginUi</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libnm-glib-NMVpnPluginUi.html#NM-VPN-PLUGIN-UI-INTERFACE-DESC:CAPS" title="NM_VPN_PLUGIN_UI_INTERFACE_DESC">NM_VPN_PLUGIN_UI_INTERFACE_DESC</a>, macro in <a class="link" href="libnm-glib-NMVpnPluginUi.html" title="NMVpnPluginUi">NMVpnPluginUi</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libnm-glib-NMVpnPluginUi.html#nm-vpn-plugin-ui-interface-export" title="nm_vpn_plugin_ui_interface_export ()">nm_vpn_plugin_ui_interface_export</a>, function in <a class="link" href="libnm-glib-NMVpnPluginUi.html" title="NMVpnPluginUi">NMVpnPluginUi</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libnm-glib-NMVpnPluginUi.html#nm-vpn-plugin-ui-interface-get-capabilities" title="nm_vpn_plugin_ui_interface_get_capabilities ()">nm_vpn_plugin_ui_interface_get_capabilities</a>, function in <a class="link" href="libnm-glib-NMVpnPluginUi.html" title="NMVpnPluginUi">NMVpnPluginUi</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libnm-glib-NMVpnPluginUi.html#nm-vpn-plugin-ui-interface-get-suggested-name" title="nm_vpn_plugin_ui_interface_get_suggested_name ()">nm_vpn_plugin_ui_interface_get_suggested_name</a>, function in <a class="link" href="libnm-glib-NMVpnPluginUi.html" title="NMVpnPluginUi">NMVpnPluginUi</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libnm-glib-NMVpnPluginUi.html#nm-vpn-plugin-ui-interface-import" title="nm_vpn_plugin_ui_interface_import ()">nm_vpn_plugin_ui_interface_import</a>, function in <a class="link" href="libnm-glib-NMVpnPluginUi.html" title="NMVpnPluginUi">NMVpnPluginUi</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libnm-glib-NMVpnPluginUi.html#NM-VPN-PLUGIN-UI-INTERFACE-NAME:CAPS" title="NM_VPN_PLUGIN_UI_INTERFACE_NAME">NM_VPN_PLUGIN_UI_INTERFACE_NAME</a>, macro in <a class="link" href="libnm-glib-NMVpnPluginUi.html" title="NMVpnPluginUi">NMVpnPluginUi</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libnm-glib-NMVpnPluginUi.html#NM-VPN-PLUGIN-UI-INTERFACE-SERVICE:CAPS" title="NM_VPN_PLUGIN_UI_INTERFACE_SERVICE">NM_VPN_PLUGIN_UI_INTERFACE_SERVICE</a>, macro in <a class="link" href="libnm-glib-NMVpnPluginUi.html" title="NMVpnPluginUi">NMVpnPluginUi</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libnm-glib-NMVpnPluginUi.html#nm-vpn-plugin-ui-interface-ui-factory" title="nm_vpn_plugin_ui_interface_ui_factory ()">nm_vpn_plugin_ui_interface_ui_factory</a>, function in <a class="link" href="libnm-glib-NMVpnPluginUi.html" title="NMVpnPluginUi">NMVpnPluginUi</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libnm-glib-NMVpnPluginUi.html#NM-VPN-PLUGIN-UI-WIDGET-INTERFACE:CAPS" title="NM_VPN_PLUGIN_UI_WIDGET_INTERFACE()">NM_VPN_PLUGIN_UI_WIDGET_INTERFACE</a>, macro in <a class="link" href="libnm-glib-NMVpnPluginUi.html" title="NMVpnPluginUi">NMVpnPluginUi</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libnm-glib-NMVpnPluginUi.html#NM-VPN-PLUGIN-UI-WIDGET-INTERFACE-GET-INTERFACE:CAPS" title="NM_VPN_PLUGIN_UI_WIDGET_INTERFACE_GET_INTERFACE()">NM_VPN_PLUGIN_UI_WIDGET_INTERFACE_GET_INTERFACE</a>, macro in <a class="link" href="libnm-glib-NMVpnPluginUi.html" title="NMVpnPluginUi">NMVpnPluginUi</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libnm-glib-NMVpnPluginUi.html#nm-vpn-plugin-ui-widget-interface-get-type" title="nm_vpn_plugin_ui_widget_interface_get_type ()">nm_vpn_plugin_ui_widget_interface_get_type</a>, function in <a class="link" href="libnm-glib-NMVpnPluginUi.html" title="NMVpnPluginUi">NMVpnPluginUi</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libnm-glib-NMVpnPluginUi.html#nm-vpn-plugin-ui-widget-interface-get-widget" title="nm_vpn_plugin_ui_widget_interface_get_widget ()">nm_vpn_plugin_ui_widget_interface_get_widget</a>, function in <a class="link" href="libnm-glib-NMVpnPluginUi.html" title="NMVpnPluginUi">NMVpnPluginUi</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libnm-glib-NMVpnPluginUi.html#nm-vpn-plugin-ui-widget-interface-save-secrets" title="nm_vpn_plugin_ui_widget_interface_save_secrets ()">nm_vpn_plugin_ui_widget_interface_save_secrets</a>, function in <a class="link" href="libnm-glib-NMVpnPluginUi.html" title="NMVpnPluginUi">NMVpnPluginUi</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libnm-glib-NMVpnPluginUi.html#nm-vpn-plugin-ui-widget-interface-update-connection" title="nm_vpn_plugin_ui_widget_interface_update_connection ()">nm_vpn_plugin_ui_widget_interface_update_connection</a>, function in <a class="link" href="libnm-glib-NMVpnPluginUi.html" title="NMVpnPluginUi">NMVpnPluginUi</a>
+</dt>
+<dd></dd>
+<dt>
+nm_vpn_plugin_utils_get_secret_flags, function in nm-vpn-plugin-utils
+</dt>
+<dd></dd>
+<dt>
+nm_vpn_plugin_utils_read_vpn_details, function in nm-vpn-plugin-utils
+</dt>
+<dd></dd>
+<a name="idxW"></a><h3 class="title">W</h3>
+<dt>
+<a class="link" href="NMWimaxNsp.html#NMWimaxNsp-struct" title="NMWimaxNsp">NMWimaxNsp</a>, struct in <a class="link" href="NMWimaxNsp.html" title="NMWimaxNsp">NMWimaxNsp</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMWimaxNsp.html#NMWimaxNsp--name" title='The "name" property'>NMWimaxNsp:name</a>, object property in <a class="link" href="NMWimaxNsp.html" title="NMWimaxNsp">NMWimaxNsp</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMWimaxNsp.html#NMWimaxNsp--network-type" title='The "network-type" property'>NMWimaxNsp:network-type</a>, object property in <a class="link" href="NMWimaxNsp.html" title="NMWimaxNsp">NMWimaxNsp</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMWimaxNsp.html#NMWimaxNsp--signal-quality" title='The "signal-quality" property'>NMWimaxNsp:signal-quality</a>, object property in <a class="link" href="NMWimaxNsp.html" title="NMWimaxNsp">NMWimaxNsp</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMWimaxNsp.html#NMWimaxNspClass" title="NMWimaxNspClass">NMWimaxNspClass</a>, struct in <a class="link" href="NMWimaxNsp.html" title="NMWimaxNsp">NMWimaxNsp</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMWimaxNsp.html#NMWimaxNspNetworkType" title="enum NMWimaxNspNetworkType">NMWimaxNspNetworkType</a>, enum in <a class="link" href="NMWimaxNsp.html" title="NMWimaxNsp">NMWimaxNsp</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMWimaxNsp.html#nm-wimax-nsp-filter-connections" title="nm_wimax_nsp_filter_connections ()">nm_wimax_nsp_filter_connections</a>, function in <a class="link" href="NMWimaxNsp.html" title="NMWimaxNsp">NMWimaxNsp</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMWimaxNsp.html#nm-wimax-nsp-get-name" title="nm_wimax_nsp_get_name ()">nm_wimax_nsp_get_name</a>, function in <a class="link" href="NMWimaxNsp.html" title="NMWimaxNsp">NMWimaxNsp</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMWimaxNsp.html#nm-wimax-nsp-get-network-type" title="nm_wimax_nsp_get_network_type ()">nm_wimax_nsp_get_network_type</a>, function in <a class="link" href="NMWimaxNsp.html" title="NMWimaxNsp">NMWimaxNsp</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMWimaxNsp.html#nm-wimax-nsp-get-signal-quality" title="nm_wimax_nsp_get_signal_quality ()">nm_wimax_nsp_get_signal_quality</a>, function in <a class="link" href="NMWimaxNsp.html" title="NMWimaxNsp">NMWimaxNsp</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMWimaxNsp.html#NM-WIMAX-NSP-NAME:CAPS" title="NM_WIMAX_NSP_NAME">NM_WIMAX_NSP_NAME</a>, macro in <a class="link" href="NMWimaxNsp.html" title="NMWimaxNsp">NMWimaxNsp</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMWimaxNsp.html#NM-WIMAX-NSP-NETWORK-TYPE:CAPS" title="NM_WIMAX_NSP_NETWORK_TYPE">NM_WIMAX_NSP_NETWORK_TYPE</a>, macro in <a class="link" href="NMWimaxNsp.html" title="NMWimaxNsp">NMWimaxNsp</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMWimaxNsp.html#nm-wimax-nsp-new" title="nm_wimax_nsp_new ()">nm_wimax_nsp_new</a>, function in <a class="link" href="NMWimaxNsp.html" title="NMWimaxNsp">NMWimaxNsp</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMWimaxNsp.html#NM-WIMAX-NSP-SIGNAL-QUALITY:CAPS" title="NM_WIMAX_NSP_SIGNAL_QUALITY">NM_WIMAX_NSP_SIGNAL_QUALITY</a>, macro in <a class="link" href="NMWimaxNsp.html" title="NMWimaxNsp">NMWimaxNsp</a>
+</dt>
+<dd></dd>
+</div>
+<div class="footer">
+<hr>
+          Generated by GTK-Doc V1.17</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/ch01.html b/docs/libnm-glib/html/ch02.html
index 8a1a05e0b..929c4cab3 100644
--- a/docs/libnm-glib/html/ch01.html
+++ b/docs/libnm-glib/html/ch02.html
@@ -2,26 +2,26 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm-glib Objects</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<title>libnm-glib API Reference</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="libnm-glib Reference Manual">
 <link rel="up" href="index.html" title="libnm-glib Reference Manual">
-<link rel="prev" href="index.html" title="libnm-glib Reference Manual">
+<link rel="prev" href="ref-overview.html" title="Object Overview">
 <link rel="next" href="NMClient.html" title="NMClient">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td><a accesskey="p" href="index.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
+<td><a accesskey="p" href="ref-overview.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
 <td> </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
 <th width="100%" align="center">libnm-glib Reference Manual</th>
 <td><a accesskey="n" href="NMClient.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
 </tr></table>
-<div class="chapter" title="libnm-glib Objects">
+<div class="chapter">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="id2910172"></a>libnm-glib Objects</h2></div></div></div>
+<a name="id487737"></a>libnm-glib API Reference</h2></div></div></div>
 <div class="toc"><dl>
 <dt>
 <span class="refentrytitle"><a href="NMClient.html">NMClient</a></span><span class="refpurpose"></span>
@@ -39,16 +39,16 @@
 <span class="refentrytitle"><a href="NMDeviceWifi.html">NMDeviceWifi</a></span><span class="refpurpose"></span>
 </dt>
 <dt>
-<span class="refentrytitle"><a href="NMSerialDevice.html">NMSerialDevice</a></span><span class="refpurpose"></span>
+<span class="refentrytitle"><a href="NMDeviceModem.html">NMDeviceModem</a></span><span class="refpurpose"></span>
 </dt>
 <dt>
-<span class="refentrytitle"><a href="NMGsmDevice.html">NMGsmDevice</a></span><span class="refpurpose"></span>
+<span class="refentrytitle"><a href="NMDeviceBt.html">NMDeviceBt</a></span><span class="refpurpose"></span>
 </dt>
 <dt>
-<span class="refentrytitle"><a href="NMCdmaDevice.html">NMCdmaDevice</a></span><span class="refpurpose"></span>
+<span class="refentrytitle"><a href="NMDeviceWimax.html">NMDeviceWimax</a></span><span class="refpurpose"></span>
 </dt>
 <dt>
-<span class="refentrytitle"><a href="NMDeviceBt.html">NMDeviceBt</a></span><span class="refpurpose"></span>
+<span class="refentrytitle"><a href="NMWimaxNsp.html">NMWimaxNsp</a></span><span class="refpurpose"></span>
 </dt>
 <dt>
 <span class="refentrytitle"><a href="NMAccessPoint.html">NMAccessPoint</a></span><span class="refpurpose"></span>
@@ -66,9 +66,6 @@
 <span class="refentrytitle"><a href="NMDHCP6Config.html">NMDHCP6Config</a></span><span class="refpurpose"></span>
 </dt>
 <dt>
-<span class="refentrytitle"><a href="NMExportedConnection.html">NMExportedConnection</a></span><span class="refpurpose"></span>
-</dt>
-<dt>
 <span class="refentrytitle"><a href="NMObject.html">NMObject</a></span><span class="refpurpose"></span>
 </dt>
 <dt>
@@ -78,22 +75,10 @@
 <span class="refentrytitle"><a href="NMRemoteSettings.html">NMRemoteSettings</a></span><span class="refpurpose"></span>
 </dt>
 <dt>
-<span class="refentrytitle"><a href="libnm-glib-NMRemoteSettingsSystem.html">NMRemoteSettingsSystem</a></span><span class="refpurpose"></span>
-</dt>
-<dt>
-<span class="refentrytitle"><a href="libnm-glib-NMSettingsConnection.html">NMSettingsConnection</a></span><span class="refpurpose"></span>
-</dt>
-<dt>
-<span class="refentrytitle"><a href="libnm-glib-NMSettings.html">NMSettings</a></span><span class="refpurpose"></span>
-</dt>
-<dt>
-<span class="refentrytitle"><a href="libnm-glib-NMSettingsService.html">NMSettingsService</a></span><span class="refpurpose"></span>
-</dt>
-<dt>
-<span class="refentrytitle"><a href="libnm-glib-NMSettingsSystem.html">NMSettingsSystem</a></span><span class="refpurpose"></span>
+<span class="refentrytitle"><a href="libnm-glib-nm-types.html">nm-types</a></span><span class="refpurpose"></span>
 </dt>
 <dt>
-<span class="refentrytitle"><a href="libnm-glib-nm-types.html">nm-types</a></span><span class="refpurpose"></span>
+<span class="refentrytitle"><a href="NMSecretAgent.html">NMSecretAgent</a></span><span class="refpurpose"></span>
 </dt>
 <dt>
 <span class="refentrytitle"><a href="NMVPNConnection.html">NMVPNConnection</a></span><span class="refpurpose"></span>
@@ -108,6 +93,6 @@
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.15</div>
+          Generated by GTK-Doc V1.17</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/index.html b/docs/libnm-glib/html/index.html
index 02d33be82..2d64c2f82 100644
--- a/docs/libnm-glib/html/index.html
+++ b/docs/libnm-glib/html/index.html
@@ -3,27 +3,66 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>libnm-glib Reference Manual</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="libnm-glib Reference Manual">
-<link rel="next" href="ch01.html" title="libnm-glib Objects">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
+<link rel="next" href="ref-overview.html" title="Object Overview">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<div class="book" title="libnm-glib Reference Manual">
+<div class="book">
 <div class="titlepage">
 <div>
 <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">libnm-glib Reference Manual</p></th></tr></table></div>
+<div><div class="authorgroup"><div class="author">
+<h3 class="author">
+<span class="firstname">Dan</span> <span class="surname">Williams</span>
+</h3>
+<div class="affiliation"><div class="address"><p><br>
+	    <code class="email">&lt;<a class="email" href="mailto:dcbw@redhat.com">dcbw@redhat.com</a>&gt;</code><br>
+	  </p></div></div>
+</div></div></div>
 <div><p class="releaseinfo">
-      for libnm-glib 0.8
+      for libnm-glib 0.9
       The latest version of this documentation can be found on-line at
-      <a class="ulink" href="http://projects.gnome.org/NetworkManager/developers/libnm-glib/08/" target="_top">http://projects.gnome.org/NetworkManager/developers/libnm-glib/08/</a>.
+      <a class="ulink" href="http://projects.gnome.org/NetworkManager/developers/libnm-glib/09/" target="_top">http://projects.gnome.org/NetworkManager/developers/libnm-glib/09/</a>.
     </p></div>
+<div><p class="copyright">Copyright © 2011 The NetworkManager Authors</p></div>
+<div><div class="legalnotice">
+<a name="id458140"></a><p>
+	Permission is granted to copy, distribute and/or modify this
+	document under the terms of the <em class="citetitle">GNU Free
+	Documentation License</em>, Version 1.1 or any later
+	version published by the Free Software Foundation with no
+	Invariant Sections, no Front-Cover Texts, and no Back-Cover
+	Texts. You may obtain a copy of the <em class="citetitle">GNU Free
+	Documentation License</em> from the Free Software
+	Foundation by visiting <a class="ulink" href="http://www.fsf.org" target="_top">their Web site</a> or by writing
+	to:
+
+	</p>
+<div class="address"><p><br>
+	  The Free Software Foundation, Inc.,<br>
+	  <span class="street">59 Temple Place</span> - Suite 330,<br>
+	  <span class="city">Boston</span>, <span class="state">MA</span> <span class="postcode">02111-1307</span>,<br>
+	  <span class="country">USA</span><br>
+	</p></div>
+<p>
+      </p>
+<p>
+	Many of the names used by companies to distinguish their
+	products and services are claimed as trademarks. Where those
+	names appear in any GNOME documentation, and those trademarks
+	are made aware to the members of the GNOME Documentation
+	Project, the names have been printed in caps or initial caps.
+      </p>
+</div></div>
 </div>
 <hr>
 </div>
 <div class="toc"><dl>
-<dt><span class="chapter"><a href="ch01.html">libnm-glib Objects</a></span></dt>
+<dt><span class="chapter"><a href="ref-overview.html">Object Overview</a></span></dt>
+<dt><span class="chapter"><a href="ch02.html">libnm-glib API Reference</a></span></dt>
 <dd><dl>
 <dt>
 <span class="refentrytitle"><a href="NMClient.html">NMClient</a></span><span class="refpurpose"></span>
@@ -41,16 +80,16 @@
 <span class="refentrytitle"><a href="NMDeviceWifi.html">NMDeviceWifi</a></span><span class="refpurpose"></span>
 </dt>
 <dt>
-<span class="refentrytitle"><a href="NMSerialDevice.html">NMSerialDevice</a></span><span class="refpurpose"></span>
+<span class="refentrytitle"><a href="NMDeviceModem.html">NMDeviceModem</a></span><span class="refpurpose"></span>
 </dt>
 <dt>
-<span class="refentrytitle"><a href="NMGsmDevice.html">NMGsmDevice</a></span><span class="refpurpose"></span>
+<span class="refentrytitle"><a href="NMDeviceBt.html">NMDeviceBt</a></span><span class="refpurpose"></span>
 </dt>
 <dt>
-<span class="refentrytitle"><a href="NMCdmaDevice.html">NMCdmaDevice</a></span><span class="refpurpose"></span>
+<span class="refentrytitle"><a href="NMDeviceWimax.html">NMDeviceWimax</a></span><span class="refpurpose"></span>
 </dt>
 <dt>
-<span class="refentrytitle"><a href="NMDeviceBt.html">NMDeviceBt</a></span><span class="refpurpose"></span>
+<span class="refentrytitle"><a href="NMWimaxNsp.html">NMWimaxNsp</a></span><span class="refpurpose"></span>
 </dt>
 <dt>
 <span class="refentrytitle"><a href="NMAccessPoint.html">NMAccessPoint</a></span><span class="refpurpose"></span>
@@ -68,9 +107,6 @@
 <span class="refentrytitle"><a href="NMDHCP6Config.html">NMDHCP6Config</a></span><span class="refpurpose"></span>
 </dt>
 <dt>
-<span class="refentrytitle"><a href="NMExportedConnection.html">NMExportedConnection</a></span><span class="refpurpose"></span>
-</dt>
-<dt>
 <span class="refentrytitle"><a href="NMObject.html">NMObject</a></span><span class="refpurpose"></span>
 </dt>
 <dt>
@@ -80,22 +116,10 @@
 <span class="refentrytitle"><a href="NMRemoteSettings.html">NMRemoteSettings</a></span><span class="refpurpose"></span>
 </dt>
 <dt>
-<span class="refentrytitle"><a href="libnm-glib-NMRemoteSettingsSystem.html">NMRemoteSettingsSystem</a></span><span class="refpurpose"></span>
-</dt>
-<dt>
-<span class="refentrytitle"><a href="libnm-glib-NMSettingsConnection.html">NMSettingsConnection</a></span><span class="refpurpose"></span>
-</dt>
-<dt>
-<span class="refentrytitle"><a href="libnm-glib-NMSettings.html">NMSettings</a></span><span class="refpurpose"></span>
-</dt>
-<dt>
-<span class="refentrytitle"><a href="libnm-glib-NMSettingsService.html">NMSettingsService</a></span><span class="refpurpose"></span>
-</dt>
-<dt>
-<span class="refentrytitle"><a href="libnm-glib-NMSettingsSystem.html">NMSettingsSystem</a></span><span class="refpurpose"></span>
+<span class="refentrytitle"><a href="libnm-glib-nm-types.html">nm-types</a></span><span class="refpurpose"></span>
 </dt>
 <dt>
-<span class="refentrytitle"><a href="libnm-glib-nm-types.html">nm-types</a></span><span class="refpurpose"></span>
+<span class="refentrytitle"><a href="NMSecretAgent.html">NMSecretAgent</a></span><span class="refpurpose"></span>
 </dt>
 <dt>
 <span class="refentrytitle"><a href="NMVPNConnection.html">NMVPNConnection</a></span><span class="refpurpose"></span>
@@ -107,10 +131,13 @@
 <span class="refentrytitle"><a href="libnm-glib-NMVpnPluginUi.html">NMVpnPluginUi</a></span><span class="refpurpose"></span>
 </dt>
 </dl></dd>
+<dt><span class="chapter"><a href="object-tree.html">Object Hierarchy</a></span></dt>
+<dt><span class="index"><a href="api-index-full.html">API Index</a></span></dt>
+<dt><span class="glossary"><a href="annotation-glossary.html">Annotation Glossary</a></span></dt>
 </dl></div>
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.15</div>
+          Generated by GTK-Doc V1.17</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/index.sgml b/docs/libnm-glib/html/index.sgml
index e3c76b217..ee6b8c0ae 100644
--- a/docs/libnm-glib/html/index.sgml
+++ b/docs/libnm-glib/html/index.sgml
@@ -1,4 +1,4 @@
-<ONLINE href="http://projects.gnome.org/NetworkManager/developers/libnm-glib/08/">
+<ONLINE href="http://projects.gnome.org/NetworkManager/developers/libnm-glib/09/">
 <ANCHOR id="NMClient" href="libnm-glib/NMClient.html">
 <ANCHOR id="NMClient.synopsis" href="libnm-glib/NMClient.html#NMClient.synopsis">
 <ANCHOR id="NMClient.object-hierarchy" href="libnm-glib/NMClient.html#NMClient.object-hierarchy">
@@ -6,6 +6,7 @@
 <ANCHOR id="NMClient.signals" href="libnm-glib/NMClient.html#NMClient.signals">
 <ANCHOR id="NMClient.description" href="libnm-glib/NMClient.html#NMClient.description">
 <ANCHOR id="NMClient.details" href="libnm-glib/NMClient.html#NMClient.details">
+<ANCHOR id="NM-CLIENT-VERSION:CAPS" href="libnm-glib/NMClient.html#NM-CLIENT-VERSION:CAPS">
 <ANCHOR id="NM-CLIENT-STATE:CAPS" href="libnm-glib/NMClient.html#NM-CLIENT-STATE:CAPS">
 <ANCHOR id="NM-CLIENT-MANAGER-RUNNING:CAPS" href="libnm-glib/NMClient.html#NM-CLIENT-MANAGER-RUNNING:CAPS">
 <ANCHOR id="NM-CLIENT-NETWORKING-ENABLED:CAPS" href="libnm-glib/NMClient.html#NM-CLIENT-NETWORKING-ENABLED:CAPS">
@@ -13,6 +14,8 @@
 <ANCHOR id="NM-CLIENT-WIRELESS-HARDWARE-ENABLED:CAPS" href="libnm-glib/NMClient.html#NM-CLIENT-WIRELESS-HARDWARE-ENABLED:CAPS">
 <ANCHOR id="NM-CLIENT-WWAN-ENABLED:CAPS" href="libnm-glib/NMClient.html#NM-CLIENT-WWAN-ENABLED:CAPS">
 <ANCHOR id="NM-CLIENT-WWAN-HARDWARE-ENABLED:CAPS" href="libnm-glib/NMClient.html#NM-CLIENT-WWAN-HARDWARE-ENABLED:CAPS">
+<ANCHOR id="NM-CLIENT-WIMAX-ENABLED:CAPS" href="libnm-glib/NMClient.html#NM-CLIENT-WIMAX-ENABLED:CAPS">
+<ANCHOR id="NM-CLIENT-WIMAX-HARDWARE-ENABLED:CAPS" href="libnm-glib/NMClient.html#NM-CLIENT-WIMAX-HARDWARE-ENABLED:CAPS">
 <ANCHOR id="NM-CLIENT-ACTIVE-CONNECTIONS:CAPS" href="libnm-glib/NMClient.html#NM-CLIENT-ACTIVE-CONNECTIONS:CAPS">
 <ANCHOR id="NMClientPermission" href="libnm-glib/NMClient.html#NMClientPermission">
 <ANCHOR id="NMClientPermissionResult" href="libnm-glib/NMClient.html#NMClientPermissionResult">
@@ -21,8 +24,10 @@
 <ANCHOR id="nm-client-new" href="libnm-glib/NMClient.html#nm-client-new">
 <ANCHOR id="nm-client-get-devices" href="libnm-glib/NMClient.html#nm-client-get-devices">
 <ANCHOR id="nm-client-get-device-by-path" href="libnm-glib/NMClient.html#nm-client-get-device-by-path">
-<ANCHOR id="NMClientActivateDeviceFn" href="libnm-glib/NMClient.html#NMClientActivateDeviceFn">
+<ANCHOR id="NMClientActivateFn" href="libnm-glib/NMClient.html#NMClientActivateFn">
 <ANCHOR id="nm-client-activate-connection" href="libnm-glib/NMClient.html#nm-client-activate-connection">
+<ANCHOR id="NMClientAddActivateFn" href="libnm-glib/NMClient.html#NMClientAddActivateFn">
+<ANCHOR id="nm-client-add-and-activate-connection" href="libnm-glib/NMClient.html#nm-client-add-and-activate-connection">
 <ANCHOR id="nm-client-deactivate-connection" href="libnm-glib/NMClient.html#nm-client-deactivate-connection">
 <ANCHOR id="nm-client-networking-get-enabled" href="libnm-glib/NMClient.html#nm-client-networking-get-enabled">
 <ANCHOR id="nm-client-networking-set-enabled" href="libnm-glib/NMClient.html#nm-client-networking-set-enabled">
@@ -32,6 +37,10 @@
 <ANCHOR id="nm-client-wwan-get-enabled" href="libnm-glib/NMClient.html#nm-client-wwan-get-enabled">
 <ANCHOR id="nm-client-wwan-set-enabled" href="libnm-glib/NMClient.html#nm-client-wwan-set-enabled">
 <ANCHOR id="nm-client-wwan-hardware-get-enabled" href="libnm-glib/NMClient.html#nm-client-wwan-hardware-get-enabled">
+<ANCHOR id="nm-client-wimax-get-enabled" href="libnm-glib/NMClient.html#nm-client-wimax-get-enabled">
+<ANCHOR id="nm-client-wimax-set-enabled" href="libnm-glib/NMClient.html#nm-client-wimax-set-enabled">
+<ANCHOR id="nm-client-wimax-hardware-get-enabled" href="libnm-glib/NMClient.html#nm-client-wimax-hardware-get-enabled">
+<ANCHOR id="nm-client-get-version" href="libnm-glib/NMClient.html#nm-client-get-version">
 <ANCHOR id="nm-client-get-state" href="libnm-glib/NMClient.html#nm-client-get-state">
 <ANCHOR id="nm-client-get-manager-running" href="libnm-glib/NMClient.html#nm-client-get-manager-running">
 <ANCHOR id="nm-client-get-active-connections" href="libnm-glib/NMClient.html#nm-client-get-active-connections">
@@ -42,6 +51,9 @@
 <ANCHOR id="NMClient--manager-running" href="libnm-glib/NMClient.html#NMClient--manager-running">
 <ANCHOR id="NMClient--networking-enabled" href="libnm-glib/NMClient.html#NMClient--networking-enabled">
 <ANCHOR id="NMClient--state" href="libnm-glib/NMClient.html#NMClient--state">
+<ANCHOR id="NMClient--version" href="libnm-glib/NMClient.html#NMClient--version">
+<ANCHOR id="NMClient--wimax-enabled" href="libnm-glib/NMClient.html#NMClient--wimax-enabled">
+<ANCHOR id="NMClient--wimax-hardware-enabled" href="libnm-glib/NMClient.html#NMClient--wimax-hardware-enabled">
 <ANCHOR id="NMClient--wireless-enabled" href="libnm-glib/NMClient.html#NMClient--wireless-enabled">
 <ANCHOR id="NMClient--wireless-hardware-enabled" href="libnm-glib/NMClient.html#NMClient--wireless-hardware-enabled">
 <ANCHOR id="NMClient--wwan-enabled" href="libnm-glib/NMClient.html#NMClient--wwan-enabled">
@@ -56,7 +68,6 @@
 <ANCHOR id="NMActiveConnection.properties" href="libnm-glib/NMActiveConnection.html#NMActiveConnection.properties">
 <ANCHOR id="NMActiveConnection.description" href="libnm-glib/NMActiveConnection.html#NMActiveConnection.description">
 <ANCHOR id="NMActiveConnection.details" href="libnm-glib/NMActiveConnection.html#NMActiveConnection.details">
-<ANCHOR id="NM-ACTIVE-CONNECTION-SERVICE-NAME:CAPS" href="libnm-glib/NMActiveConnection.html#NM-ACTIVE-CONNECTION-SERVICE-NAME:CAPS">
 <ANCHOR id="NM-ACTIVE-CONNECTION-CONNECTION:CAPS" href="libnm-glib/NMActiveConnection.html#NM-ACTIVE-CONNECTION-CONNECTION:CAPS">
 <ANCHOR id="NM-ACTIVE-CONNECTION-SPECIFIC-OBJECT:CAPS" href="libnm-glib/NMActiveConnection.html#NM-ACTIVE-CONNECTION-SPECIFIC-OBJECT:CAPS">
 <ANCHOR id="NM-ACTIVE-CONNECTION-DEVICES:CAPS" href="libnm-glib/NMActiveConnection.html#NM-ACTIVE-CONNECTION-DEVICES:CAPS">
@@ -66,8 +77,6 @@
 <ANCHOR id="NMActiveConnection-struct" href="libnm-glib/NMActiveConnection.html#NMActiveConnection-struct">
 <ANCHOR id="NMActiveConnectionClass" href="libnm-glib/NMActiveConnection.html#NMActiveConnectionClass">
 <ANCHOR id="nm-active-connection-new" href="libnm-glib/NMActiveConnection.html#nm-active-connection-new">
-<ANCHOR id="nm-active-connection-get-service-name" href="libnm-glib/NMActiveConnection.html#nm-active-connection-get-service-name">
-<ANCHOR id="nm-active-connection-get-scope" href="libnm-glib/NMActiveConnection.html#nm-active-connection-get-scope">
 <ANCHOR id="nm-active-connection-get-connection" href="libnm-glib/NMActiveConnection.html#nm-active-connection-get-connection">
 <ANCHOR id="nm-active-connection-get-specific-object" href="libnm-glib/NMActiveConnection.html#nm-active-connection-get-specific-object">
 <ANCHOR id="nm-active-connection-get-devices" href="libnm-glib/NMActiveConnection.html#nm-active-connection-get-devices">
@@ -79,7 +88,6 @@
 <ANCHOR id="NMActiveConnection--default" href="libnm-glib/NMActiveConnection.html#NMActiveConnection--default">
 <ANCHOR id="NMActiveConnection--default6" href="libnm-glib/NMActiveConnection.html#NMActiveConnection--default6">
 <ANCHOR id="NMActiveConnection--devices" href="libnm-glib/NMActiveConnection.html#NMActiveConnection--devices">
-<ANCHOR id="NMActiveConnection--service-name" href="libnm-glib/NMActiveConnection.html#NMActiveConnection--service-name">
 <ANCHOR id="NMActiveConnection--specific-object" href="libnm-glib/NMActiveConnection.html#NMActiveConnection--specific-object">
 <ANCHOR id="NMActiveConnection--state" href="libnm-glib/NMActiveConnection.html#NMActiveConnection--state">
 <ANCHOR id="NMDevice" href="libnm-glib/NMDevice.html">
@@ -89,6 +97,7 @@
 <ANCHOR id="NMDevice.signals" href="libnm-glib/NMDevice.html#NMDevice.signals">
 <ANCHOR id="NMDevice.description" href="libnm-glib/NMDevice.html#NMDevice.description">
 <ANCHOR id="NMDevice.details" href="libnm-glib/NMDevice.html#NMDevice.details">
+<ANCHOR id="NM-DEVICE-DEVICE-TYPE:CAPS" href="libnm-glib/NMDevice.html#NM-DEVICE-DEVICE-TYPE:CAPS">
 <ANCHOR id="NM-DEVICE-UDI:CAPS" href="libnm-glib/NMDevice.html#NM-DEVICE-UDI:CAPS">
 <ANCHOR id="NM-DEVICE-INTERFACE:CAPS" href="libnm-glib/NMDevice.html#NM-DEVICE-INTERFACE:CAPS">
 <ANCHOR id="NM-DEVICE-IP-INTERFACE:CAPS" href="libnm-glib/NMDevice.html#NM-DEVICE-IP-INTERFACE:CAPS">
@@ -108,6 +117,7 @@
 <ANCHOR id="nm-device-new" href="libnm-glib/NMDevice.html#nm-device-new">
 <ANCHOR id="nm-device-get-iface" href="libnm-glib/NMDevice.html#nm-device-get-iface">
 <ANCHOR id="nm-device-get-ip-iface" href="libnm-glib/NMDevice.html#nm-device-get-ip-iface">
+<ANCHOR id="nm-device-get-device-type" href="libnm-glib/NMDevice.html#nm-device-get-device-type">
 <ANCHOR id="nm-device-get-udi" href="libnm-glib/NMDevice.html#nm-device-get-udi">
 <ANCHOR id="nm-device-get-driver" href="libnm-glib/NMDevice.html#nm-device-get-driver">
 <ANCHOR id="nm-device-get-capabilities" href="libnm-glib/NMDevice.html#nm-device-get-capabilities">
@@ -122,8 +132,10 @@
 <ANCHOR id="nm-device-get-vendor" href="libnm-glib/NMDevice.html#nm-device-get-vendor">
 <ANCHOR id="NMDeviceDeactivateFn" href="libnm-glib/NMDevice.html#NMDeviceDeactivateFn">
 <ANCHOR id="nm-device-disconnect" href="libnm-glib/NMDevice.html#nm-device-disconnect">
+<ANCHOR id="nm-device-filter-connections" href="libnm-glib/NMDevice.html#nm-device-filter-connections">
 <ANCHOR id="NMDevice.property-details" href="libnm-glib/NMDevice.html#NMDevice.property-details">
 <ANCHOR id="NMDevice--capabilities" href="libnm-glib/NMDevice.html#NMDevice--capabilities">
+<ANCHOR id="NMDevice--device-type" href="libnm-glib/NMDevice.html#NMDevice--device-type">
 <ANCHOR id="NMDevice--dhcp4-config" href="libnm-glib/NMDevice.html#NMDevice--dhcp4-config">
 <ANCHOR id="NMDevice--dhcp6-config" href="libnm-glib/NMDevice.html#NMDevice--dhcp6-config">
 <ANCHOR id="NMDevice--driver" href="libnm-glib/NMDevice.html#NMDevice--driver">
@@ -195,34 +207,21 @@
 <ANCHOR id="NMDeviceWifi.signal-details" href="libnm-glib/NMDeviceWifi.html#NMDeviceWifi.signal-details">
 <ANCHOR id="NMDeviceWifi-access-point-added" href="libnm-glib/NMDeviceWifi.html#NMDeviceWifi-access-point-added">
 <ANCHOR id="NMDeviceWifi-access-point-removed" href="libnm-glib/NMDeviceWifi.html#NMDeviceWifi-access-point-removed">
-<ANCHOR id="NMSerialDevice" href="libnm-glib/NMSerialDevice.html">
-<ANCHOR id="NMSerialDevice.synopsis" href="libnm-glib/NMSerialDevice.html#NMSerialDevice.synopsis">
-<ANCHOR id="NMSerialDevice.object-hierarchy" href="libnm-glib/NMSerialDevice.html#NMSerialDevice.object-hierarchy">
-<ANCHOR id="NMSerialDevice.signals" href="libnm-glib/NMSerialDevice.html#NMSerialDevice.signals">
-<ANCHOR id="NMSerialDevice.description" href="libnm-glib/NMSerialDevice.html#NMSerialDevice.description">
-<ANCHOR id="NMSerialDevice.details" href="libnm-glib/NMSerialDevice.html#NMSerialDevice.details">
-<ANCHOR id="NMSerialDevice-struct" href="libnm-glib/NMSerialDevice.html#NMSerialDevice-struct">
-<ANCHOR id="NMSerialDeviceClass" href="libnm-glib/NMSerialDevice.html#NMSerialDeviceClass">
-<ANCHOR id="nm-serial-device-get-bytes-received" href="libnm-glib/NMSerialDevice.html#nm-serial-device-get-bytes-received">
-<ANCHOR id="nm-serial-device-get-bytes-sent" href="libnm-glib/NMSerialDevice.html#nm-serial-device-get-bytes-sent">
-<ANCHOR id="NMSerialDevice.signal-details" href="libnm-glib/NMSerialDevice.html#NMSerialDevice.signal-details">
-<ANCHOR id="NMSerialDevice-ppp-stats" href="libnm-glib/NMSerialDevice.html#NMSerialDevice-ppp-stats">
-<ANCHOR id="NMGsmDevice" href="libnm-glib/NMGsmDevice.html">
-<ANCHOR id="NMGsmDevice.synopsis" href="libnm-glib/NMGsmDevice.html#NMGsmDevice.synopsis">
-<ANCHOR id="NMGsmDevice.object-hierarchy" href="libnm-glib/NMGsmDevice.html#NMGsmDevice.object-hierarchy">
-<ANCHOR id="NMGsmDevice.description" href="libnm-glib/NMGsmDevice.html#NMGsmDevice.description">
-<ANCHOR id="NMGsmDevice.details" href="libnm-glib/NMGsmDevice.html#NMGsmDevice.details">
-<ANCHOR id="NMGsmDevice-struct" href="libnm-glib/NMGsmDevice.html#NMGsmDevice-struct">
-<ANCHOR id="NMGsmDeviceClass" href="libnm-glib/NMGsmDevice.html#NMGsmDeviceClass">
-<ANCHOR id="nm-gsm-device-new" href="libnm-glib/NMGsmDevice.html#nm-gsm-device-new">
-<ANCHOR id="NMCdmaDevice" href="libnm-glib/NMCdmaDevice.html">
-<ANCHOR id="NMCdmaDevice.synopsis" href="libnm-glib/NMCdmaDevice.html#NMCdmaDevice.synopsis">
-<ANCHOR id="NMCdmaDevice.object-hierarchy" href="libnm-glib/NMCdmaDevice.html#NMCdmaDevice.object-hierarchy">
-<ANCHOR id="NMCdmaDevice.description" href="libnm-glib/NMCdmaDevice.html#NMCdmaDevice.description">
-<ANCHOR id="NMCdmaDevice.details" href="libnm-glib/NMCdmaDevice.html#NMCdmaDevice.details">
-<ANCHOR id="NMCdmaDevice-struct" href="libnm-glib/NMCdmaDevice.html#NMCdmaDevice-struct">
-<ANCHOR id="NMCdmaDeviceClass" href="libnm-glib/NMCdmaDevice.html#NMCdmaDeviceClass">
-<ANCHOR id="nm-cdma-device-new" href="libnm-glib/NMCdmaDevice.html#nm-cdma-device-new">
+<ANCHOR id="NMDeviceModem" href="libnm-glib/NMDeviceModem.html">
+<ANCHOR id="NMDeviceModem.synopsis" href="libnm-glib/NMDeviceModem.html#NMDeviceModem.synopsis">
+<ANCHOR id="NMDeviceModem.object-hierarchy" href="libnm-glib/NMDeviceModem.html#NMDeviceModem.object-hierarchy">
+<ANCHOR id="NMDeviceModem.properties" href="libnm-glib/NMDeviceModem.html#NMDeviceModem.properties">
+<ANCHOR id="NMDeviceModem.description" href="libnm-glib/NMDeviceModem.html#NMDeviceModem.description">
+<ANCHOR id="NMDeviceModem.details" href="libnm-glib/NMDeviceModem.html#NMDeviceModem.details">
+<ANCHOR id="NM-DEVICE-MODEM-MODEM-CAPABILITIES:CAPS" href="libnm-glib/NMDeviceModem.html#NM-DEVICE-MODEM-MODEM-CAPABILITIES:CAPS">
+<ANCHOR id="NM-DEVICE-MODEM-CURRENT-CAPABILITIES:CAPS" href="libnm-glib/NMDeviceModem.html#NM-DEVICE-MODEM-CURRENT-CAPABILITIES:CAPS">
+<ANCHOR id="NMDeviceModem-struct" href="libnm-glib/NMDeviceModem.html#NMDeviceModem-struct">
+<ANCHOR id="NMDeviceModemClass" href="libnm-glib/NMDeviceModem.html#NMDeviceModemClass">
+<ANCHOR id="nm-device-modem-get-modem-capabilities" href="libnm-glib/NMDeviceModem.html#nm-device-modem-get-modem-capabilities">
+<ANCHOR id="nm-device-modem-get-current-capabilities" href="libnm-glib/NMDeviceModem.html#nm-device-modem-get-current-capabilities">
+<ANCHOR id="NMDeviceModem.property-details" href="libnm-glib/NMDeviceModem.html#NMDeviceModem.property-details">
+<ANCHOR id="NMDeviceModem--current-capabilities" href="libnm-glib/NMDeviceModem.html#NMDeviceModem--current-capabilities">
+<ANCHOR id="NMDeviceModem--modem-capabilities" href="libnm-glib/NMDeviceModem.html#NMDeviceModem--modem-capabilities">
 <ANCHOR id="NMDeviceBt" href="libnm-glib/NMDeviceBt.html">
 <ANCHOR id="NMDeviceBt.synopsis" href="libnm-glib/NMDeviceBt.html#NMDeviceBt.synopsis">
 <ANCHOR id="NMDeviceBt.object-hierarchy" href="libnm-glib/NMDeviceBt.html#NMDeviceBt.object-hierarchy">
@@ -242,6 +241,64 @@
 <ANCHOR id="NMDeviceBt--bt-capabilities" href="libnm-glib/NMDeviceBt.html#NMDeviceBt--bt-capabilities">
 <ANCHOR id="NMDeviceBt--hw-address" href="libnm-glib/NMDeviceBt.html#NMDeviceBt--hw-address">
 <ANCHOR id="NMDeviceBt--name" href="libnm-glib/NMDeviceBt.html#NMDeviceBt--name">
+<ANCHOR id="NMDeviceWimax" href="libnm-glib/NMDeviceWimax.html">
+<ANCHOR id="NMDeviceWimax.synopsis" href="libnm-glib/NMDeviceWimax.html#NMDeviceWimax.synopsis">
+<ANCHOR id="NMDeviceWimax.object-hierarchy" href="libnm-glib/NMDeviceWimax.html#NMDeviceWimax.object-hierarchy">
+<ANCHOR id="NMDeviceWimax.properties" href="libnm-glib/NMDeviceWimax.html#NMDeviceWimax.properties">
+<ANCHOR id="NMDeviceWimax.signals" href="libnm-glib/NMDeviceWimax.html#NMDeviceWimax.signals">
+<ANCHOR id="NMDeviceWimax.description" href="libnm-glib/NMDeviceWimax.html#NMDeviceWimax.description">
+<ANCHOR id="NMDeviceWimax.details" href="libnm-glib/NMDeviceWimax.html#NMDeviceWimax.details">
+<ANCHOR id="NM-DEVICE-WIMAX-HW-ADDRESS:CAPS" href="libnm-glib/NMDeviceWimax.html#NM-DEVICE-WIMAX-HW-ADDRESS:CAPS">
+<ANCHOR id="NM-DEVICE-WIMAX-ACTIVE-NSP:CAPS" href="libnm-glib/NMDeviceWimax.html#NM-DEVICE-WIMAX-ACTIVE-NSP:CAPS">
+<ANCHOR id="NM-DEVICE-WIMAX-CENTER-FREQUENCY:CAPS" href="libnm-glib/NMDeviceWimax.html#NM-DEVICE-WIMAX-CENTER-FREQUENCY:CAPS">
+<ANCHOR id="NM-DEVICE-WIMAX-RSSI:CAPS" href="libnm-glib/NMDeviceWimax.html#NM-DEVICE-WIMAX-RSSI:CAPS">
+<ANCHOR id="NM-DEVICE-WIMAX-CINR:CAPS" href="libnm-glib/NMDeviceWimax.html#NM-DEVICE-WIMAX-CINR:CAPS">
+<ANCHOR id="NM-DEVICE-WIMAX-TX-POWER:CAPS" href="libnm-glib/NMDeviceWimax.html#NM-DEVICE-WIMAX-TX-POWER:CAPS">
+<ANCHOR id="NM-DEVICE-WIMAX-BSID:CAPS" href="libnm-glib/NMDeviceWimax.html#NM-DEVICE-WIMAX-BSID:CAPS">
+<ANCHOR id="NMDeviceWimax-struct" href="libnm-glib/NMDeviceWimax.html#NMDeviceWimax-struct">
+<ANCHOR id="NMDeviceWimaxClass" href="libnm-glib/NMDeviceWimax.html#NMDeviceWimaxClass">
+<ANCHOR id="nm-device-wimax-new" href="libnm-glib/NMDeviceWimax.html#nm-device-wimax-new">
+<ANCHOR id="nm-device-wimax-get-hw-address" href="libnm-glib/NMDeviceWimax.html#nm-device-wimax-get-hw-address">
+<ANCHOR id="nm-device-wimax-get-active-nsp" href="libnm-glib/NMDeviceWimax.html#nm-device-wimax-get-active-nsp">
+<ANCHOR id="nm-device-wimax-get-nsp-by-path" href="libnm-glib/NMDeviceWimax.html#nm-device-wimax-get-nsp-by-path">
+<ANCHOR id="nm-device-wimax-get-nsps" href="libnm-glib/NMDeviceWimax.html#nm-device-wimax-get-nsps">
+<ANCHOR id="nm-device-wimax-get-center-frequency" href="libnm-glib/NMDeviceWimax.html#nm-device-wimax-get-center-frequency">
+<ANCHOR id="nm-device-wimax-get-rssi" href="libnm-glib/NMDeviceWimax.html#nm-device-wimax-get-rssi">
+<ANCHOR id="nm-device-wimax-get-cinr" href="libnm-glib/NMDeviceWimax.html#nm-device-wimax-get-cinr">
+<ANCHOR id="nm-device-wimax-get-tx-power" href="libnm-glib/NMDeviceWimax.html#nm-device-wimax-get-tx-power">
+<ANCHOR id="nm-device-wimax-get-bsid" href="libnm-glib/NMDeviceWimax.html#nm-device-wimax-get-bsid">
+<ANCHOR id="NMDeviceWimax.property-details" href="libnm-glib/NMDeviceWimax.html#NMDeviceWimax.property-details">
+<ANCHOR id="NMDeviceWimax--active-nsp" href="libnm-glib/NMDeviceWimax.html#NMDeviceWimax--active-nsp">
+<ANCHOR id="NMDeviceWimax--bsid" href="libnm-glib/NMDeviceWimax.html#NMDeviceWimax--bsid">
+<ANCHOR id="NMDeviceWimax--center-frequency" href="libnm-glib/NMDeviceWimax.html#NMDeviceWimax--center-frequency">
+<ANCHOR id="NMDeviceWimax--cinr" href="libnm-glib/NMDeviceWimax.html#NMDeviceWimax--cinr">
+<ANCHOR id="NMDeviceWimax--hw-address" href="libnm-glib/NMDeviceWimax.html#NMDeviceWimax--hw-address">
+<ANCHOR id="NMDeviceWimax--rssi" href="libnm-glib/NMDeviceWimax.html#NMDeviceWimax--rssi">
+<ANCHOR id="NMDeviceWimax--tx-power" href="libnm-glib/NMDeviceWimax.html#NMDeviceWimax--tx-power">
+<ANCHOR id="NMDeviceWimax.signal-details" href="libnm-glib/NMDeviceWimax.html#NMDeviceWimax.signal-details">
+<ANCHOR id="NMDeviceWimax-nsp-added" href="libnm-glib/NMDeviceWimax.html#NMDeviceWimax-nsp-added">
+<ANCHOR id="NMDeviceWimax-nsp-removed" href="libnm-glib/NMDeviceWimax.html#NMDeviceWimax-nsp-removed">
+<ANCHOR id="NMWimaxNsp" href="libnm-glib/NMWimaxNsp.html">
+<ANCHOR id="NMWimaxNsp.synopsis" href="libnm-glib/NMWimaxNsp.html#NMWimaxNsp.synopsis">
+<ANCHOR id="NMWimaxNsp.object-hierarchy" href="libnm-glib/NMWimaxNsp.html#NMWimaxNsp.object-hierarchy">
+<ANCHOR id="NMWimaxNsp.properties" href="libnm-glib/NMWimaxNsp.html#NMWimaxNsp.properties">
+<ANCHOR id="NMWimaxNsp.description" href="libnm-glib/NMWimaxNsp.html#NMWimaxNsp.description">
+<ANCHOR id="NMWimaxNsp.details" href="libnm-glib/NMWimaxNsp.html#NMWimaxNsp.details">
+<ANCHOR id="NM-WIMAX-NSP-NAME:CAPS" href="libnm-glib/NMWimaxNsp.html#NM-WIMAX-NSP-NAME:CAPS">
+<ANCHOR id="NM-WIMAX-NSP-SIGNAL-QUALITY:CAPS" href="libnm-glib/NMWimaxNsp.html#NM-WIMAX-NSP-SIGNAL-QUALITY:CAPS">
+<ANCHOR id="NM-WIMAX-NSP-NETWORK-TYPE:CAPS" href="libnm-glib/NMWimaxNsp.html#NM-WIMAX-NSP-NETWORK-TYPE:CAPS">
+<ANCHOR id="NMWimaxNspNetworkType" href="libnm-glib/NMWimaxNsp.html#NMWimaxNspNetworkType">
+<ANCHOR id="NMWimaxNsp-struct" href="libnm-glib/NMWimaxNsp.html#NMWimaxNsp-struct">
+<ANCHOR id="NMWimaxNspClass" href="libnm-glib/NMWimaxNsp.html#NMWimaxNspClass">
+<ANCHOR id="nm-wimax-nsp-new" href="libnm-glib/NMWimaxNsp.html#nm-wimax-nsp-new">
+<ANCHOR id="nm-wimax-nsp-get-name" href="libnm-glib/NMWimaxNsp.html#nm-wimax-nsp-get-name">
+<ANCHOR id="nm-wimax-nsp-get-signal-quality" href="libnm-glib/NMWimaxNsp.html#nm-wimax-nsp-get-signal-quality">
+<ANCHOR id="nm-wimax-nsp-get-network-type" href="libnm-glib/NMWimaxNsp.html#nm-wimax-nsp-get-network-type">
+<ANCHOR id="nm-wimax-nsp-filter-connections" href="libnm-glib/NMWimaxNsp.html#nm-wimax-nsp-filter-connections">
+<ANCHOR id="NMWimaxNsp.property-details" href="libnm-glib/NMWimaxNsp.html#NMWimaxNsp.property-details">
+<ANCHOR id="NMWimaxNsp--name" href="libnm-glib/NMWimaxNsp.html#NMWimaxNsp--name">
+<ANCHOR id="NMWimaxNsp--network-type" href="libnm-glib/NMWimaxNsp.html#NMWimaxNsp--network-type">
+<ANCHOR id="NMWimaxNsp--signal-quality" href="libnm-glib/NMWimaxNsp.html#NMWimaxNsp--signal-quality">
 <ANCHOR id="NMAccessPoint" href="libnm-glib/NMAccessPoint.html">
 <ANCHOR id="NMAccessPoint.synopsis" href="libnm-glib/NMAccessPoint.html#NMAccessPoint.synopsis">
 <ANCHOR id="NMAccessPoint.object-hierarchy" href="libnm-glib/NMAccessPoint.html#NMAccessPoint.object-hierarchy">
@@ -252,11 +309,12 @@
 <ANCHOR id="NM-ACCESS-POINT-WPA-FLAGS:CAPS" href="libnm-glib/NMAccessPoint.html#NM-ACCESS-POINT-WPA-FLAGS:CAPS">
 <ANCHOR id="NM-ACCESS-POINT-RSN-FLAGS:CAPS" href="libnm-glib/NMAccessPoint.html#NM-ACCESS-POINT-RSN-FLAGS:CAPS">
 <ANCHOR id="NM-ACCESS-POINT-SSID:CAPS" href="libnm-glib/NMAccessPoint.html#NM-ACCESS-POINT-SSID:CAPS">
+<ANCHOR id="NM-ACCESS-POINT-BSSID:CAPS" href="libnm-glib/NMAccessPoint.html#NM-ACCESS-POINT-BSSID:CAPS">
 <ANCHOR id="NM-ACCESS-POINT-FREQUENCY:CAPS" href="libnm-glib/NMAccessPoint.html#NM-ACCESS-POINT-FREQUENCY:CAPS">
-<ANCHOR id="NM-ACCESS-POINT-HW-ADDRESS:CAPS" href="libnm-glib/NMAccessPoint.html#NM-ACCESS-POINT-HW-ADDRESS:CAPS">
 <ANCHOR id="NM-ACCESS-POINT-MODE:CAPS" href="libnm-glib/NMAccessPoint.html#NM-ACCESS-POINT-MODE:CAPS">
 <ANCHOR id="NM-ACCESS-POINT-MAX-BITRATE:CAPS" href="libnm-glib/NMAccessPoint.html#NM-ACCESS-POINT-MAX-BITRATE:CAPS">
 <ANCHOR id="NM-ACCESS-POINT-STRENGTH:CAPS" href="libnm-glib/NMAccessPoint.html#NM-ACCESS-POINT-STRENGTH:CAPS">
+<ANCHOR id="NM-ACCESS-POINT-HW-ADDRESS:CAPS" href="libnm-glib/NMAccessPoint.html#NM-ACCESS-POINT-HW-ADDRESS:CAPS">
 <ANCHOR id="NMAccessPoint-struct" href="libnm-glib/NMAccessPoint.html#NMAccessPoint-struct">
 <ANCHOR id="NMAccessPointClass" href="libnm-glib/NMAccessPoint.html#NMAccessPointClass">
 <ANCHOR id="nm-access-point-new" href="libnm-glib/NMAccessPoint.html#nm-access-point-new">
@@ -264,12 +322,15 @@
 <ANCHOR id="nm-access-point-get-wpa-flags" href="libnm-glib/NMAccessPoint.html#nm-access-point-get-wpa-flags">
 <ANCHOR id="nm-access-point-get-rsn-flags" href="libnm-glib/NMAccessPoint.html#nm-access-point-get-rsn-flags">
 <ANCHOR id="nm-access-point-get-ssid" href="libnm-glib/NMAccessPoint.html#nm-access-point-get-ssid">
+<ANCHOR id="nm-access-point-get-bssid" href="libnm-glib/NMAccessPoint.html#nm-access-point-get-bssid">
 <ANCHOR id="nm-access-point-get-frequency" href="libnm-glib/NMAccessPoint.html#nm-access-point-get-frequency">
-<ANCHOR id="nm-access-point-get-hw-address" href="libnm-glib/NMAccessPoint.html#nm-access-point-get-hw-address">
 <ANCHOR id="nm-access-point-get-mode" href="libnm-glib/NMAccessPoint.html#nm-access-point-get-mode">
 <ANCHOR id="nm-access-point-get-max-bitrate" href="libnm-glib/NMAccessPoint.html#nm-access-point-get-max-bitrate">
 <ANCHOR id="nm-access-point-get-strength" href="libnm-glib/NMAccessPoint.html#nm-access-point-get-strength">
+<ANCHOR id="nm-access-point-filter-connections" href="libnm-glib/NMAccessPoint.html#nm-access-point-filter-connections">
+<ANCHOR id="nm-access-point-get-hw-address" href="libnm-glib/NMAccessPoint.html#nm-access-point-get-hw-address">
 <ANCHOR id="NMAccessPoint.property-details" href="libnm-glib/NMAccessPoint.html#NMAccessPoint.property-details">
+<ANCHOR id="NMAccessPoint--bssid" href="libnm-glib/NMAccessPoint.html#NMAccessPoint--bssid">
 <ANCHOR id="NMAccessPoint--flags" href="libnm-glib/NMAccessPoint.html#NMAccessPoint--flags">
 <ANCHOR id="NMAccessPoint--frequency" href="libnm-glib/NMAccessPoint.html#NMAccessPoint--frequency">
 <ANCHOR id="NMAccessPoint--hw-address" href="libnm-glib/NMAccessPoint.html#NMAccessPoint--hw-address">
@@ -288,14 +349,12 @@
 <ANCHOR id="NMIP4Config-struct" href="libnm-glib/NMIP4Config.html#NMIP4Config-struct">
 <ANCHOR id="NMIP4ConfigClass" href="libnm-glib/NMIP4Config.html#NMIP4ConfigClass">
 <ANCHOR id="NM-IP4-CONFIG-ADDRESSES:CAPS" href="libnm-glib/NMIP4Config.html#NM-IP4-CONFIG-ADDRESSES:CAPS">
-<ANCHOR id="NM-IP4-CONFIG-HOSTNAME:CAPS" href="libnm-glib/NMIP4Config.html#NM-IP4-CONFIG-HOSTNAME:CAPS">
 <ANCHOR id="NM-IP4-CONFIG-NAMESERVERS:CAPS" href="libnm-glib/NMIP4Config.html#NM-IP4-CONFIG-NAMESERVERS:CAPS">
 <ANCHOR id="NM-IP4-CONFIG-DOMAINS:CAPS" href="libnm-glib/NMIP4Config.html#NM-IP4-CONFIG-DOMAINS:CAPS">
 <ANCHOR id="NM-IP4-CONFIG-ROUTES:CAPS" href="libnm-glib/NMIP4Config.html#NM-IP4-CONFIG-ROUTES:CAPS">
 <ANCHOR id="NM-IP4-CONFIG-WINS-SERVERS:CAPS" href="libnm-glib/NMIP4Config.html#NM-IP4-CONFIG-WINS-SERVERS:CAPS">
 <ANCHOR id="nm-ip4-config-new" href="libnm-glib/NMIP4Config.html#nm-ip4-config-new">
 <ANCHOR id="nm-ip4-config-get-addresses" href="libnm-glib/NMIP4Config.html#nm-ip4-config-get-addresses">
-<ANCHOR id="nm-ip4-config-get-hostname" href="libnm-glib/NMIP4Config.html#nm-ip4-config-get-hostname">
 <ANCHOR id="nm-ip4-config-get-nameservers" href="libnm-glib/NMIP4Config.html#nm-ip4-config-get-nameservers">
 <ANCHOR id="nm-ip4-config-get-domains" href="libnm-glib/NMIP4Config.html#nm-ip4-config-get-domains">
 <ANCHOR id="nm-ip4-config-get-routes" href="libnm-glib/NMIP4Config.html#nm-ip4-config-get-routes">
@@ -303,7 +362,6 @@
 <ANCHOR id="NMIP4Config.property-details" href="libnm-glib/NMIP4Config.html#NMIP4Config.property-details">
 <ANCHOR id="NMIP4Config--addresses" href="libnm-glib/NMIP4Config.html#NMIP4Config--addresses">
 <ANCHOR id="NMIP4Config--domains" href="libnm-glib/NMIP4Config.html#NMIP4Config--domains">
-<ANCHOR id="NMIP4Config--hostname" href="libnm-glib/NMIP4Config.html#NMIP4Config--hostname">
 <ANCHOR id="NMIP4Config--nameservers" href="libnm-glib/NMIP4Config.html#NMIP4Config--nameservers">
 <ANCHOR id="NMIP4Config--routes" href="libnm-glib/NMIP4Config.html#NMIP4Config--routes">
 <ANCHOR id="NMIP4Config--wins-servers" href="libnm-glib/NMIP4Config.html#NMIP4Config--wins-servers">
@@ -357,15 +415,6 @@
 <ANCHOR id="nm-dhcp6-config-get-one-option" href="libnm-glib/NMDHCP6Config.html#nm-dhcp6-config-get-one-option">
 <ANCHOR id="NMDHCP6Config.property-details" href="libnm-glib/NMDHCP6Config.html#NMDHCP6Config.property-details">
 <ANCHOR id="NMDHCP6Config--options" href="libnm-glib/NMDHCP6Config.html#NMDHCP6Config--options">
-<ANCHOR id="NMExportedConnection" href="libnm-glib/NMExportedConnection.html">
-<ANCHOR id="NMExportedConnection.synopsis" href="libnm-glib/NMExportedConnection.html#NMExportedConnection.synopsis">
-<ANCHOR id="NMExportedConnection.object-hierarchy" href="libnm-glib/NMExportedConnection.html#NMExportedConnection.object-hierarchy">
-<ANCHOR id="NMExportedConnection.implemented-interfaces" href="libnm-glib/NMExportedConnection.html#NMExportedConnection.implemented-interfaces">
-<ANCHOR id="NMExportedConnection.description" href="libnm-glib/NMExportedConnection.html#NMExportedConnection.description">
-<ANCHOR id="NMExportedConnection.details" href="libnm-glib/NMExportedConnection.html#NMExportedConnection.details">
-<ANCHOR id="NMExportedConnection-struct" href="libnm-glib/NMExportedConnection.html#NMExportedConnection-struct">
-<ANCHOR id="NMExportedConnectionClass" href="libnm-glib/NMExportedConnection.html#NMExportedConnectionClass">
-<ANCHOR id="nm-exported-connection-new" href="libnm-glib/NMExportedConnection.html#nm-exported-connection-new">
 <ANCHOR id="NMObject" href="libnm-glib/NMObject.html">
 <ANCHOR id="NMObject.synopsis" href="libnm-glib/NMObject.html#NMObject.synopsis">
 <ANCHOR id="NMObject.object-hierarchy" href="libnm-glib/NMObject.html#NMObject.object-hierarchy">
@@ -384,103 +433,66 @@
 <ANCHOR id="NMRemoteConnection" href="libnm-glib/NMRemoteConnection.html">
 <ANCHOR id="NMRemoteConnection.synopsis" href="libnm-glib/NMRemoteConnection.html#NMRemoteConnection.synopsis">
 <ANCHOR id="NMRemoteConnection.object-hierarchy" href="libnm-glib/NMRemoteConnection.html#NMRemoteConnection.object-hierarchy">
-<ANCHOR id="NMRemoteConnection.implemented-interfaces" href="libnm-glib/NMRemoteConnection.html#NMRemoteConnection.implemented-interfaces">
 <ANCHOR id="NMRemoteConnection.properties" href="libnm-glib/NMRemoteConnection.html#NMRemoteConnection.properties">
+<ANCHOR id="NMRemoteConnection.signals" href="libnm-glib/NMRemoteConnection.html#NMRemoteConnection.signals">
 <ANCHOR id="NMRemoteConnection.description" href="libnm-glib/NMRemoteConnection.html#NMRemoteConnection.description">
 <ANCHOR id="NMRemoteConnection.details" href="libnm-glib/NMRemoteConnection.html#NMRemoteConnection.details">
+<ANCHOR id="NM-REMOTE-CONNECTION-UPDATED:CAPS" href="libnm-glib/NMRemoteConnection.html#NM-REMOTE-CONNECTION-UPDATED:CAPS">
+<ANCHOR id="NM-REMOTE-CONNECTION-REMOVED:CAPS" href="libnm-glib/NMRemoteConnection.html#NM-REMOTE-CONNECTION-REMOVED:CAPS">
 <ANCHOR id="NMRemoteConnection-struct" href="libnm-glib/NMRemoteConnection.html#NMRemoteConnection-struct">
 <ANCHOR id="NMRemoteConnectionClass" href="libnm-glib/NMRemoteConnection.html#NMRemoteConnectionClass">
+<ANCHOR id="NMRemoteConnectionCommitFunc" href="libnm-glib/NMRemoteConnection.html#NMRemoteConnectionCommitFunc">
+<ANCHOR id="NMRemoteConnectionDeleteFunc" href="libnm-glib/NMRemoteConnection.html#NMRemoteConnectionDeleteFunc">
+<ANCHOR id="NMRemoteConnectionGetSecretsFunc" href="libnm-glib/NMRemoteConnection.html#NMRemoteConnectionGetSecretsFunc">
 <ANCHOR id="nm-remote-connection-new" href="libnm-glib/NMRemoteConnection.html#nm-remote-connection-new">
+<ANCHOR id="nm-remote-connection-commit-changes" href="libnm-glib/NMRemoteConnection.html#nm-remote-connection-commit-changes">
+<ANCHOR id="nm-remote-connection-delete" href="libnm-glib/NMRemoteConnection.html#nm-remote-connection-delete">
+<ANCHOR id="nm-remote-connection-get-secrets" href="libnm-glib/NMRemoteConnection.html#nm-remote-connection-get-secrets">
 <ANCHOR id="NMRemoteConnection.property-details" href="libnm-glib/NMRemoteConnection.html#NMRemoteConnection.property-details">
 <ANCHOR id="NMRemoteConnection--bus" href="libnm-glib/NMRemoteConnection.html#NMRemoteConnection--bus">
 <ANCHOR id="NMRemoteConnection--init-result" href="libnm-glib/NMRemoteConnection.html#NMRemoteConnection--init-result">
+<ANCHOR id="NMRemoteConnection.signal-details" href="libnm-glib/NMRemoteConnection.html#NMRemoteConnection.signal-details">
+<ANCHOR id="NMRemoteConnection-removed" href="libnm-glib/NMRemoteConnection.html#NMRemoteConnection-removed">
+<ANCHOR id="NMRemoteConnection-updated" href="libnm-glib/NMRemoteConnection.html#NMRemoteConnection-updated">
+<ANCHOR id="NMRemoteConnection-visible" href="libnm-glib/NMRemoteConnection.html#NMRemoteConnection-visible">
 <ANCHOR id="NMRemoteSettings" href="libnm-glib/NMRemoteSettings.html">
 <ANCHOR id="NMRemoteSettings.synopsis" href="libnm-glib/NMRemoteSettings.html#NMRemoteSettings.synopsis">
 <ANCHOR id="NMRemoteSettings.object-hierarchy" href="libnm-glib/NMRemoteSettings.html#NMRemoteSettings.object-hierarchy">
-<ANCHOR id="NMRemoteSettings.implemented-interfaces" href="libnm-glib/NMRemoteSettings.html#NMRemoteSettings.implemented-interfaces">
 <ANCHOR id="NMRemoteSettings.properties" href="libnm-glib/NMRemoteSettings.html#NMRemoteSettings.properties">
+<ANCHOR id="NMRemoteSettings.signals" href="libnm-glib/NMRemoteSettings.html#NMRemoteSettings.signals">
 <ANCHOR id="NMRemoteSettings.description" href="libnm-glib/NMRemoteSettings.html#NMRemoteSettings.description">
 <ANCHOR id="NMRemoteSettings.details" href="libnm-glib/NMRemoteSettings.html#NMRemoteSettings.details">
+<ANCHOR id="NMRemoteSettingsError" href="libnm-glib/NMRemoteSettings.html#NMRemoteSettingsError">
+<ANCHOR id="NM-REMOTE-SETTINGS-ERROR-UNKNOWN:CAPS" href="libnm-glib/NMRemoteSettings.html#NM-REMOTE-SETTINGS-ERROR-UNKNOWN:CAPS">
+<ANCHOR id="NM-REMOTE-SETTINGS-ERROR-CONNECTION-REMOVED:CAPS" href="libnm-glib/NMRemoteSettings.html#NM-REMOTE-SETTINGS-ERROR-CONNECTION-REMOVED:CAPS">
+<ANCHOR id="NM-REMOTE-SETTINGS-ERROR-CONNECTION-UNAVAILABLE:CAPS" href="libnm-glib/NMRemoteSettings.html#NM-REMOTE-SETTINGS-ERROR-CONNECTION-UNAVAILABLE:CAPS">
+<ANCHOR id="NM-TYPE-REMOTE-SETTINGS-ERROR:CAPS" href="libnm-glib/NMRemoteSettings.html#NM-TYPE-REMOTE-SETTINGS-ERROR:CAPS">
+<ANCHOR id="NM-REMOTE-SETTINGS-ERROR:CAPS" href="libnm-glib/NMRemoteSettings.html#NM-REMOTE-SETTINGS-ERROR:CAPS">
+<ANCHOR id="nm-remote-settings-error-quark" href="libnm-glib/NMRemoteSettings.html#nm-remote-settings-error-quark">
 <ANCHOR id="NM-REMOTE-SETTINGS-BUS:CAPS" href="libnm-glib/NMRemoteSettings.html#NM-REMOTE-SETTINGS-BUS:CAPS">
-<ANCHOR id="NM-REMOTE-SETTINGS-SCOPE:CAPS" href="libnm-glib/NMRemoteSettings.html#NM-REMOTE-SETTINGS-SCOPE:CAPS">
 <ANCHOR id="NM-REMOTE-SETTINGS-SERVICE-RUNNING:CAPS" href="libnm-glib/NMRemoteSettings.html#NM-REMOTE-SETTINGS-SERVICE-RUNNING:CAPS">
+<ANCHOR id="NM-REMOTE-SETTINGS-HOSTNAME:CAPS" href="libnm-glib/NMRemoteSettings.html#NM-REMOTE-SETTINGS-HOSTNAME:CAPS">
+<ANCHOR id="NM-REMOTE-SETTINGS-CAN-MODIFY:CAPS" href="libnm-glib/NMRemoteSettings.html#NM-REMOTE-SETTINGS-CAN-MODIFY:CAPS">
+<ANCHOR id="NM-REMOTE-SETTINGS-NEW-CONNECTION:CAPS" href="libnm-glib/NMRemoteSettings.html#NM-REMOTE-SETTINGS-NEW-CONNECTION:CAPS">
+<ANCHOR id="NM-REMOTE-SETTINGS-CONNECTIONS-READ:CAPS" href="libnm-glib/NMRemoteSettings.html#NM-REMOTE-SETTINGS-CONNECTIONS-READ:CAPS">
+<ANCHOR id="NMRemoteSettingsAddConnectionFunc" href="libnm-glib/NMRemoteSettings.html#NMRemoteSettingsAddConnectionFunc">
+<ANCHOR id="NMRemoteSettingsSaveHostnameFunc" href="libnm-glib/NMRemoteSettings.html#NMRemoteSettingsSaveHostnameFunc">
 <ANCHOR id="NMRemoteSettings-struct" href="libnm-glib/NMRemoteSettings.html#NMRemoteSettings-struct">
 <ANCHOR id="NMRemoteSettingsClass" href="libnm-glib/NMRemoteSettings.html#NMRemoteSettingsClass">
+<ANCHOR id="nm-remote-settings-get-type" href="libnm-glib/NMRemoteSettings.html#nm-remote-settings-get-type">
 <ANCHOR id="nm-remote-settings-new" href="libnm-glib/NMRemoteSettings.html#nm-remote-settings-new">
+<ANCHOR id="nm-remote-settings-list-connections" href="libnm-glib/NMRemoteSettings.html#nm-remote-settings-list-connections">
+<ANCHOR id="nm-remote-settings-get-connection-by-path" href="libnm-glib/NMRemoteSettings.html#nm-remote-settings-get-connection-by-path">
+<ANCHOR id="nm-remote-settings-add-connection" href="libnm-glib/NMRemoteSettings.html#nm-remote-settings-add-connection">
+<ANCHOR id="nm-remote-settings-save-hostname" href="libnm-glib/NMRemoteSettings.html#nm-remote-settings-save-hostname">
 <ANCHOR id="NMRemoteSettings.property-details" href="libnm-glib/NMRemoteSettings.html#NMRemoteSettings.property-details">
 <ANCHOR id="NMRemoteSettings--bus" href="libnm-glib/NMRemoteSettings.html#NMRemoteSettings--bus">
-<ANCHOR id="NMRemoteSettings--scope" href="libnm-glib/NMRemoteSettings.html#NMRemoteSettings--scope">
+<ANCHOR id="NMRemoteSettings--can-modify" href="libnm-glib/NMRemoteSettings.html#NMRemoteSettings--can-modify">
+<ANCHOR id="NMRemoteSettings--hostname" href="libnm-glib/NMRemoteSettings.html#NMRemoteSettings--hostname">
 <ANCHOR id="NMRemoteSettings--service-running" href="libnm-glib/NMRemoteSettings.html#NMRemoteSettings--service-running">
-<ANCHOR id="libnm-glib-NMRemoteSettingsSystem" href="libnm-glib/libnm-glib-NMRemoteSettingsSystem.html">
-<ANCHOR id="libnm-glib-NMRemoteSettingsSystem.synopsis" href="libnm-glib/libnm-glib-NMRemoteSettingsSystem.html#libnm-glib-NMRemoteSettingsSystem.synopsis">
-<ANCHOR id="libnm-glib-NMRemoteSettingsSystem.description" href="libnm-glib/libnm-glib-NMRemoteSettingsSystem.html#libnm-glib-NMRemoteSettingsSystem.description">
-<ANCHOR id="libnm-glib-NMRemoteSettingsSystem.details" href="libnm-glib/libnm-glib-NMRemoteSettingsSystem.html#libnm-glib-NMRemoteSettingsSystem.details">
-<ANCHOR id="NMRemoteSettingsSystem" href="libnm-glib/libnm-glib-NMRemoteSettingsSystem.html#NMRemoteSettingsSystem">
-<ANCHOR id="NMRemoteSettingsSystemClass" href="libnm-glib/libnm-glib-NMRemoteSettingsSystem.html#NMRemoteSettingsSystemClass">
-<ANCHOR id="nm-remote-settings-system-new" href="libnm-glib/libnm-glib-NMRemoteSettingsSystem.html#nm-remote-settings-system-new">
-<ANCHOR id="libnm-glib-NMSettingsConnection" href="libnm-glib/libnm-glib-NMSettingsConnection.html">
-<ANCHOR id="libnm-glib-NMSettingsConnection.synopsis" href="libnm-glib/libnm-glib-NMSettingsConnection.html#libnm-glib-NMSettingsConnection.synopsis">
-<ANCHOR id="NMSettingsConnectionInterface" href="libnm-glib/libnm-glib-NMSettingsConnection.html#NMSettingsConnectionInterface">
-<ANCHOR id="libnm-glib-NMSettingsConnection.object-hierarchy" href="libnm-glib/libnm-glib-NMSettingsConnection.html#libnm-glib-NMSettingsConnection.object-hierarchy">
-<ANCHOR id="libnm-glib-NMSettingsConnection.prerequisites" href="libnm-glib/libnm-glib-NMSettingsConnection.html#libnm-glib-NMSettingsConnection.prerequisites">
-<ANCHOR id="libnm-glib-NMSettingsConnection.implementations" href="libnm-glib/libnm-glib-NMSettingsConnection.html#libnm-glib-NMSettingsConnection.implementations">
-<ANCHOR id="libnm-glib-NMSettingsConnection.description" href="libnm-glib/libnm-glib-NMSettingsConnection.html#libnm-glib-NMSettingsConnection.description">
-<ANCHOR id="libnm-glib-NMSettingsConnection.details" href="libnm-glib/libnm-glib-NMSettingsConnection.html#libnm-glib-NMSettingsConnection.details">
-<ANCHOR id="NM-SETTINGS-CONNECTION-INTERFACE-UPDATED:CAPS" href="libnm-glib/libnm-glib-NMSettingsConnection.html#NM-SETTINGS-CONNECTION-INTERFACE-UPDATED:CAPS">
-<ANCHOR id="NM-SETTINGS-CONNECTION-INTERFACE-REMOVED:CAPS" href="libnm-glib/libnm-glib-NMSettingsConnection.html#NM-SETTINGS-CONNECTION-INTERFACE-REMOVED:CAPS">
-<ANCHOR id="NMSettingsConnectionInterface-struct" href="libnm-glib/libnm-glib-NMSettingsConnection.html#NMSettingsConnectionInterface-struct">
-<ANCHOR id="NMSettingsConnectionInterfaceUpdateFunc" href="libnm-glib/libnm-glib-NMSettingsConnection.html#NMSettingsConnectionInterfaceUpdateFunc">
-<ANCHOR id="NMSettingsConnectionInterfaceDeleteFunc" href="libnm-glib/libnm-glib-NMSettingsConnection.html#NMSettingsConnectionInterfaceDeleteFunc">
-<ANCHOR id="NMSettingsConnectionInterfaceGetSecretsFunc" href="libnm-glib/libnm-glib-NMSettingsConnection.html#NMSettingsConnectionInterfaceGetSecretsFunc">
-<ANCHOR id="nm-settings-connection-interface-update" href="libnm-glib/libnm-glib-NMSettingsConnection.html#nm-settings-connection-interface-update">
-<ANCHOR id="nm-settings-connection-interface-delete" href="libnm-glib/libnm-glib-NMSettingsConnection.html#nm-settings-connection-interface-delete">
-<ANCHOR id="nm-settings-connection-interface-get-secrets" href="libnm-glib/libnm-glib-NMSettingsConnection.html#nm-settings-connection-interface-get-secrets">
-<ANCHOR id="nm-settings-connection-interface-emit-updated" href="libnm-glib/libnm-glib-NMSettingsConnection.html#nm-settings-connection-interface-emit-updated">
-<ANCHOR id="libnm-glib-NMSettings" href="libnm-glib/libnm-glib-NMSettings.html">
-<ANCHOR id="libnm-glib-NMSettings.synopsis" href="libnm-glib/libnm-glib-NMSettings.html#libnm-glib-NMSettings.synopsis">
-<ANCHOR id="NMSettingsInterface" href="libnm-glib/libnm-glib-NMSettings.html#NMSettingsInterface">
-<ANCHOR id="libnm-glib-NMSettings.object-hierarchy" href="libnm-glib/libnm-glib-NMSettings.html#libnm-glib-NMSettings.object-hierarchy">
-<ANCHOR id="libnm-glib-NMSettings.prerequisites" href="libnm-glib/libnm-glib-NMSettings.html#libnm-glib-NMSettings.prerequisites">
-<ANCHOR id="libnm-glib-NMSettings.implementations" href="libnm-glib/libnm-glib-NMSettings.html#libnm-glib-NMSettings.implementations">
-<ANCHOR id="libnm-glib-NMSettings.description" href="libnm-glib/libnm-glib-NMSettings.html#libnm-glib-NMSettings.description">
-<ANCHOR id="libnm-glib-NMSettings.details" href="libnm-glib/libnm-glib-NMSettings.html#libnm-glib-NMSettings.details">
-<ANCHOR id="NMSettingsInterfaceError" href="libnm-glib/libnm-glib-NMSettings.html#NMSettingsInterfaceError">
-<ANCHOR id="NM-SETTINGS-INTERFACE-ERROR:CAPS" href="libnm-glib/libnm-glib-NMSettings.html#NM-SETTINGS-INTERFACE-ERROR:CAPS">
-<ANCHOR id="nm-settings-interface-error-quark" href="libnm-glib/libnm-glib-NMSettings.html#nm-settings-interface-error-quark">
-<ANCHOR id="NM-TYPE-SETTINGS-INTERFACE-ERROR:CAPS" href="libnm-glib/libnm-glib-NMSettings.html#NM-TYPE-SETTINGS-INTERFACE-ERROR:CAPS">
-<ANCHOR id="NM-SETTINGS-INTERFACE-NEW-CONNECTION:CAPS" href="libnm-glib/libnm-glib-NMSettings.html#NM-SETTINGS-INTERFACE-NEW-CONNECTION:CAPS">
-<ANCHOR id="NM-SETTINGS-INTERFACE-CONNECTIONS-READ:CAPS" href="libnm-glib/libnm-glib-NMSettings.html#NM-SETTINGS-INTERFACE-CONNECTIONS-READ:CAPS">
-<ANCHOR id="NMSettingsInterface-struct" href="libnm-glib/libnm-glib-NMSettings.html#NMSettingsInterface-struct">
-<ANCHOR id="NMSettingsAddConnectionFunc" href="libnm-glib/libnm-glib-NMSettings.html#NMSettingsAddConnectionFunc">
-<ANCHOR id="nm-settings-interface-get-type" href="libnm-glib/libnm-glib-NMSettings.html#nm-settings-interface-get-type">
-<ANCHOR id="nm-settings-interface-list-connections" href="libnm-glib/libnm-glib-NMSettings.html#nm-settings-interface-list-connections">
-<ANCHOR id="nm-settings-interface-get-connection-by-path" href="libnm-glib/libnm-glib-NMSettings.html#nm-settings-interface-get-connection-by-path">
-<ANCHOR id="nm-settings-interface-add-connection" href="libnm-glib/libnm-glib-NMSettings.html#nm-settings-interface-add-connection">
-<ANCHOR id="libnm-glib-NMSettingsService" href="libnm-glib/libnm-glib-NMSettingsService.html">
-<ANCHOR id="libnm-glib-NMSettingsService.synopsis" href="libnm-glib/libnm-glib-NMSettingsService.html#libnm-glib-NMSettingsService.synopsis">
-<ANCHOR id="libnm-glib-NMSettingsService.description" href="libnm-glib/libnm-glib-NMSettingsService.html#libnm-glib-NMSettingsService.description">
-<ANCHOR id="libnm-glib-NMSettingsService.details" href="libnm-glib/libnm-glib-NMSettingsService.html#libnm-glib-NMSettingsService.details">
-<ANCHOR id="NM-SETTINGS-SERVICE-BUS:CAPS" href="libnm-glib/libnm-glib-NMSettingsService.html#NM-SETTINGS-SERVICE-BUS:CAPS">
-<ANCHOR id="NM-SETTINGS-SERVICE-SCOPE:CAPS" href="libnm-glib/libnm-glib-NMSettingsService.html#NM-SETTINGS-SERVICE-SCOPE:CAPS">
-<ANCHOR id="NMSettingsService" href="libnm-glib/libnm-glib-NMSettingsService.html#NMSettingsService">
-<ANCHOR id="NMSettingsServiceClass" href="libnm-glib/libnm-glib-NMSettingsService.html#NMSettingsServiceClass">
-<ANCHOR id="nm-settings-service-get-connection-by-path" href="libnm-glib/libnm-glib-NMSettingsService.html#nm-settings-service-get-connection-by-path">
-<ANCHOR id="nm-settings-service-export" href="libnm-glib/libnm-glib-NMSettingsService.html#nm-settings-service-export">
-<ANCHOR id="nm-settings-service-export-connection" href="libnm-glib/libnm-glib-NMSettingsService.html#nm-settings-service-export-connection">
-<ANCHOR id="libnm-glib-NMSettingsSystem" href="libnm-glib/libnm-glib-NMSettingsSystem.html">
-<ANCHOR id="libnm-glib-NMSettingsSystem.synopsis" href="libnm-glib/libnm-glib-NMSettingsSystem.html#libnm-glib-NMSettingsSystem.synopsis">
-<ANCHOR id="libnm-glib-NMSettingsSystem.description" href="libnm-glib/libnm-glib-NMSettingsSystem.html#libnm-glib-NMSettingsSystem.description">
-<ANCHOR id="libnm-glib-NMSettingsSystem.details" href="libnm-glib/libnm-glib-NMSettingsSystem.html#libnm-glib-NMSettingsSystem.details">
-<ANCHOR id="NMSettingsSystemPermissions" href="libnm-glib/libnm-glib-NMSettingsSystem.html#NMSettingsSystemPermissions">
-<ANCHOR id="NM-SETTINGS-SYSTEM-INTERFACE-HOSTNAME:CAPS" href="libnm-glib/libnm-glib-NMSettingsSystem.html#NM-SETTINGS-SYSTEM-INTERFACE-HOSTNAME:CAPS">
-<ANCHOR id="NM-SETTINGS-SYSTEM-INTERFACE-CAN-MODIFY:CAPS" href="libnm-glib/libnm-glib-NMSettingsSystem.html#NM-SETTINGS-SYSTEM-INTERFACE-CAN-MODIFY:CAPS">
-<ANCHOR id="NM-SETTINGS-SYSTEM-INTERFACE-CHECK-PERMISSIONS:CAPS" href="libnm-glib/libnm-glib-NMSettingsSystem.html#NM-SETTINGS-SYSTEM-INTERFACE-CHECK-PERMISSIONS:CAPS">
-<ANCHOR id="NMSettingsSystemInterfaceProp" href="libnm-glib/libnm-glib-NMSettingsSystem.html#NMSettingsSystemInterfaceProp">
-<ANCHOR id="NMSettingsSystemInterface" href="libnm-glib/libnm-glib-NMSettingsSystem.html#NMSettingsSystemInterface">
-<ANCHOR id="NMSettingsSystemSaveHostnameFunc" href="libnm-glib/libnm-glib-NMSettingsSystem.html#NMSettingsSystemSaveHostnameFunc">
-<ANCHOR id="NMSettingsSystemGetPermissionsFunc" href="libnm-glib/libnm-glib-NMSettingsSystem.html#NMSettingsSystemGetPermissionsFunc">
-<ANCHOR id="nm-settings-system-interface-save-hostname" href="libnm-glib/libnm-glib-NMSettingsSystem.html#nm-settings-system-interface-save-hostname">
-<ANCHOR id="nm-settings-system-interface-get-permissions" href="libnm-glib/libnm-glib-NMSettingsSystem.html#nm-settings-system-interface-get-permissions">
+<ANCHOR id="NMRemoteSettings.signal-details" href="libnm-glib/NMRemoteSettings.html#NMRemoteSettings.signal-details">
+<ANCHOR id="NMRemoteSettings-connections-read" href="libnm-glib/NMRemoteSettings.html#NMRemoteSettings-connections-read">
+<ANCHOR id="NMRemoteSettings-new-connection" href="libnm-glib/NMRemoteSettings.html#NMRemoteSettings-new-connection">
 <ANCHOR id="libnm-glib-nm-types" href="libnm-glib/libnm-glib-nm-types.html">
 <ANCHOR id="libnm-glib-nm-types.synopsis" href="libnm-glib/libnm-glib-nm-types.html#libnm-glib-nm-types.synopsis">
 <ANCHOR id="libnm-glib-nm-types.description" href="libnm-glib/libnm-glib-nm-types.html#libnm-glib-nm-types.description">
@@ -499,6 +511,40 @@
 <ANCHOR id="nm-ip6-address-array-get-type" href="libnm-glib/libnm-glib-nm-types.html#nm-ip6-address-array-get-type">
 <ANCHOR id="NM-TYPE-IP6-ROUTE-OBJECT-ARRAY:CAPS" href="libnm-glib/libnm-glib-nm-types.html#NM-TYPE-IP6-ROUTE-OBJECT-ARRAY:CAPS">
 <ANCHOR id="nm-ip6-route-object-array-get-type" href="libnm-glib/libnm-glib-nm-types.html#nm-ip6-route-object-array-get-type">
+<ANCHOR id="NMSecretAgent" href="libnm-glib/NMSecretAgent.html">
+<ANCHOR id="NMSecretAgent.synopsis" href="libnm-glib/NMSecretAgent.html#NMSecretAgent.synopsis">
+<ANCHOR id="NMSecretAgent.object-hierarchy" href="libnm-glib/NMSecretAgent.html#NMSecretAgent.object-hierarchy">
+<ANCHOR id="NMSecretAgent.properties" href="libnm-glib/NMSecretAgent.html#NMSecretAgent.properties">
+<ANCHOR id="NMSecretAgent.signals" href="libnm-glib/NMSecretAgent.html#NMSecretAgent.signals">
+<ANCHOR id="NMSecretAgent.description" href="libnm-glib/NMSecretAgent.html#NMSecretAgent.description">
+<ANCHOR id="NMSecretAgent.details" href="libnm-glib/NMSecretAgent.html#NMSecretAgent.details">
+<ANCHOR id="NM-SECRET-AGENT-ERROR:CAPS" href="libnm-glib/NMSecretAgent.html#NM-SECRET-AGENT-ERROR:CAPS">
+<ANCHOR id="NM-TYPE-SECRET-AGENT-ERROR:CAPS" href="libnm-glib/NMSecretAgent.html#NM-TYPE-SECRET-AGENT-ERROR:CAPS">
+<ANCHOR id="nm-secret-agent-error-quark" href="libnm-glib/NMSecretAgent.html#nm-secret-agent-error-quark">
+<ANCHOR id="NMSecretAgentError" href="libnm-glib/NMSecretAgent.html#NMSecretAgentError">
+<ANCHOR id="NMSecretAgentGetSecretsFlags" href="libnm-glib/NMSecretAgent.html#NMSecretAgentGetSecretsFlags">
+<ANCHOR id="NM-SECRET-AGENT-GET-SECRETS-FLAG-NONE:CAPS" href="libnm-glib/NMSecretAgent.html#NM-SECRET-AGENT-GET-SECRETS-FLAG-NONE:CAPS">
+<ANCHOR id="NM-SECRET-AGENT-GET-SECRETS-FLAG-ALLOW-INTERACTION:CAPS" href="libnm-glib/NMSecretAgent.html#NM-SECRET-AGENT-GET-SECRETS-FLAG-ALLOW-INTERACTION:CAPS">
+<ANCHOR id="NM-SECRET-AGENT-GET-SECRETS-FLAG-REQUEST-NEW:CAPS" href="libnm-glib/NMSecretAgent.html#NM-SECRET-AGENT-GET-SECRETS-FLAG-REQUEST-NEW:CAPS">
+<ANCHOR id="NM-SECRET-AGENT-IDENTIFIER:CAPS" href="libnm-glib/NMSecretAgent.html#NM-SECRET-AGENT-IDENTIFIER:CAPS">
+<ANCHOR id="NM-SECRET-AGENT-AUTO-REGISTER:CAPS" href="libnm-glib/NMSecretAgent.html#NM-SECRET-AGENT-AUTO-REGISTER:CAPS">
+<ANCHOR id="NM-SECRET-AGENT-REGISTRATION-RESULT:CAPS" href="libnm-glib/NMSecretAgent.html#NM-SECRET-AGENT-REGISTRATION-RESULT:CAPS">
+<ANCHOR id="NMSecretAgent-struct" href="libnm-glib/NMSecretAgent.html#NMSecretAgent-struct">
+<ANCHOR id="NMSecretAgentGetSecretsFunc" href="libnm-glib/NMSecretAgent.html#NMSecretAgentGetSecretsFunc">
+<ANCHOR id="NMSecretAgentSaveSecretsFunc" href="libnm-glib/NMSecretAgent.html#NMSecretAgentSaveSecretsFunc">
+<ANCHOR id="NMSecretAgentDeleteSecretsFunc" href="libnm-glib/NMSecretAgent.html#NMSecretAgentDeleteSecretsFunc">
+<ANCHOR id="NMSecretAgentClass" href="libnm-glib/NMSecretAgent.html#NMSecretAgentClass">
+<ANCHOR id="nm-secret-agent-get-type" href="libnm-glib/NMSecretAgent.html#nm-secret-agent-get-type">
+<ANCHOR id="nm-secret-agent-register" href="libnm-glib/NMSecretAgent.html#nm-secret-agent-register">
+<ANCHOR id="nm-secret-agent-unregister" href="libnm-glib/NMSecretAgent.html#nm-secret-agent-unregister">
+<ANCHOR id="nm-secret-agent-get-secrets" href="libnm-glib/NMSecretAgent.html#nm-secret-agent-get-secrets">
+<ANCHOR id="nm-secret-agent-save-secrets" href="libnm-glib/NMSecretAgent.html#nm-secret-agent-save-secrets">
+<ANCHOR id="nm-secret-agent-delete-secrets" href="libnm-glib/NMSecretAgent.html#nm-secret-agent-delete-secrets">
+<ANCHOR id="NMSecretAgent.property-details" href="libnm-glib/NMSecretAgent.html#NMSecretAgent.property-details">
+<ANCHOR id="NMSecretAgent--auto-register" href="libnm-glib/NMSecretAgent.html#NMSecretAgent--auto-register">
+<ANCHOR id="NMSecretAgent--identifier" href="libnm-glib/NMSecretAgent.html#NMSecretAgent--identifier">
+<ANCHOR id="NMSecretAgent.signal-details" href="libnm-glib/NMSecretAgent.html#NMSecretAgent.signal-details">
+<ANCHOR id="NMSecretAgent-registration-result" href="libnm-glib/NMSecretAgent.html#NMSecretAgent-registration-result">
 <ANCHOR id="NMVPNConnection" href="libnm-glib/NMVPNConnection.html">
 <ANCHOR id="NMVPNConnection.synopsis" href="libnm-glib/NMVPNConnection.html#NMVPNConnection.synopsis">
 <ANCHOR id="NMVPNConnection.object-hierarchy" href="libnm-glib/NMVPNConnection.html#NMVPNConnection.object-hierarchy">
@@ -542,8 +588,6 @@
 <ANCHOR id="libnm-glib-NMVpnPluginUi.synopsis" href="libnm-glib/libnm-glib-NMVpnPluginUi.html#libnm-glib-NMVpnPluginUi.synopsis">
 <ANCHOR id="libnm-glib-NMVpnPluginUi.description" href="libnm-glib/libnm-glib-NMVpnPluginUi.html#libnm-glib-NMVpnPluginUi.description">
 <ANCHOR id="libnm-glib-NMVpnPluginUi.details" href="libnm-glib/libnm-glib-NMVpnPluginUi.html#libnm-glib-NMVpnPluginUi.details">
-<ANCHOR id="NMVpnPluginUiInterface" href="libnm-glib/libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiInterface">
-<ANCHOR id="NMVpnPluginUiWidgetInterface" href="libnm-glib/libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiWidgetInterface">
 <ANCHOR id="NMVpnPluginUiFactory" href="libnm-glib/libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiFactory">
 <ANCHOR id="nm-vpn-plugin-ui-factory" href="libnm-glib/libnm-glib-NMVpnPluginUi.html#nm-vpn-plugin-ui-factory">
 <ANCHOR id="NM-VPN-PLUGIN-UI-CAPABILITY-NONE:CAPS" href="libnm-glib/libnm-glib-NMVpnPluginUi.html#NM-VPN-PLUGIN-UI-CAPABILITY-NONE:CAPS">
@@ -553,6 +597,7 @@
 <ANCHOR id="NM-VPN-PLUGIN-UI-INTERFACE-DESC:CAPS" href="libnm-glib/libnm-glib-NMVpnPluginUi.html#NM-VPN-PLUGIN-UI-INTERFACE-DESC:CAPS">
 <ANCHOR id="NM-VPN-PLUGIN-UI-INTERFACE-SERVICE:CAPS" href="libnm-glib/libnm-glib-NMVpnPluginUi.html#NM-VPN-PLUGIN-UI-INTERFACE-SERVICE:CAPS">
 <ANCHOR id="NMVpnPluginUiInterfaceProp" href="libnm-glib/libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiInterfaceProp">
+<ANCHOR id="NMVpnPluginUiInterface" href="libnm-glib/libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiInterface">
 <ANCHOR id="nm-vpn-plugin-ui-interface-ui-factory" href="libnm-glib/libnm-glib-NMVpnPluginUi.html#nm-vpn-plugin-ui-interface-ui-factory">
 <ANCHOR id="nm-vpn-plugin-ui-interface-get-capabilities" href="libnm-glib/libnm-glib-NMVpnPluginUi.html#nm-vpn-plugin-ui-interface-get-capabilities">
 <ANCHOR id="nm-vpn-plugin-ui-interface-import" href="libnm-glib/libnm-glib-NMVpnPluginUi.html#nm-vpn-plugin-ui-interface-import">
@@ -563,7 +608,18 @@
 <ANCHOR id="NM-VPN-PLUGIN-UI-WIDGET-INTERFACE:CAPS" href="libnm-glib/libnm-glib-NMVpnPluginUi.html#NM-VPN-PLUGIN-UI-WIDGET-INTERFACE:CAPS">
 <ANCHOR id="NM-IS-VPN-PLUGIN-UI-WIDGET-INTERFACE:CAPS" href="libnm-glib/libnm-glib-NMVpnPluginUi.html#NM-IS-VPN-PLUGIN-UI-WIDGET-INTERFACE:CAPS">
 <ANCHOR id="NM-VPN-PLUGIN-UI-WIDGET-INTERFACE-GET-INTERFACE:CAPS" href="libnm-glib/libnm-glib-NMVpnPluginUi.html#NM-VPN-PLUGIN-UI-WIDGET-INTERFACE-GET-INTERFACE:CAPS">
+<ANCHOR id="NMVpnPluginUiWidgetInterface" href="libnm-glib/libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiWidgetInterface">
 <ANCHOR id="nm-vpn-plugin-ui-widget-interface-get-type" href="libnm-glib/libnm-glib-NMVpnPluginUi.html#nm-vpn-plugin-ui-widget-interface-get-type">
 <ANCHOR id="nm-vpn-plugin-ui-widget-interface-get-widget" href="libnm-glib/libnm-glib-NMVpnPluginUi.html#nm-vpn-plugin-ui-widget-interface-get-widget">
 <ANCHOR id="nm-vpn-plugin-ui-widget-interface-update-connection" href="libnm-glib/libnm-glib-NMVpnPluginUi.html#nm-vpn-plugin-ui-widget-interface-update-connection">
 <ANCHOR id="nm-vpn-plugin-ui-widget-interface-save-secrets" href="libnm-glib/libnm-glib-NMVpnPluginUi.html#nm-vpn-plugin-ui-widget-interface-save-secrets">
+<ANCHOR id="annotation-glossterm-out" href="libnm-glib/annotation-glossary.html#annotation-glossterm-out">
+<ANCHOR id="annotation-glossterm-scope async" href="libnm-glib/annotation-glossary.html#annotation-glossterm-scope async">
+<ANCHOR id="annotation-glossterm-allow-none" href="libnm-glib/annotation-glossary.html#annotation-glossterm-allow-none">
+<ANCHOR id="annotation-glossterm-closure" href="libnm-glib/annotation-glossary.html#annotation-glossterm-closure">
+<ANCHOR id="annotation-glossterm-transfer none" href="libnm-glib/annotation-glossary.html#annotation-glossterm-transfer none">
+<ANCHOR id="annotation-glossterm-array" href="libnm-glib/annotation-glossary.html#annotation-glossterm-array">
+<ANCHOR id="annotation-glossterm-element-type" href="libnm-glib/annotation-glossary.html#annotation-glossterm-element-type">
+<ANCHOR id="annotation-glossterm-transfer container" href="libnm-glib/annotation-glossary.html#annotation-glossterm-transfer container">
+<ANCHOR id="annotation-glossterm-transfer full" href="libnm-glib/annotation-glossary.html#annotation-glossterm-transfer full">
+<ANCHOR id="annotation-glossterm-type" href="libnm-glib/annotation-glossary.html#annotation-glossterm-type">
diff --git a/docs/libnm-glib/html/libnm-glib-NMRemoteSettingsSystem.html b/docs/libnm-glib/html/libnm-glib-NMRemoteSettingsSystem.html
deleted file mode 100644
index d87a2fd26..000000000
--- a/docs/libnm-glib/html/libnm-glib-NMRemoteSettingsSystem.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>NMRemoteSettingsSystem</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
-<link rel="home" href="index.html" title="libnm-glib Reference Manual">
-<link rel="up" href="ch01.html" title="libnm-glib Objects">
-<link rel="prev" href="NMRemoteSettings.html" title="NMRemoteSettings">
-<link rel="next" href="libnm-glib-NMSettingsConnection.html" title="NMSettingsConnection">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
-<link rel="stylesheet" href="style.css" type="text/css">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
-<tr valign="middle">
-<td><a accesskey="p" href="NMRemoteSettings.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="ch01.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">libnm-glib Reference Manual</th>
-<td><a accesskey="n" href="libnm-glib-NMSettingsConnection.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
-</tr>
-<tr><td colspan="5" class="shortcuts">
-<a href="#libnm-glib-NMRemoteSettingsSystem.synopsis" class="shortcut">Top</a>
-                   | 
-                  <a href="#libnm-glib-NMRemoteSettingsSystem.description" class="shortcut">Description</a>
-</td></tr>
-</table>
-<div class="refentry" title="NMRemoteSettingsSystem">
-<a name="libnm-glib-NMRemoteSettingsSystem"></a><div class="titlepage"></div>
-<div class="refnamediv"><table width="100%"><tr>
-<td valign="top">
-<h2><span class="refentrytitle"><a name="libnm-glib-NMRemoteSettingsSystem.top_of_page"></a>NMRemoteSettingsSystem</span></h2>
-<p>NMRemoteSettingsSystem</p>
-</td>
-<td valign="top" align="right"></td>
-</tr></table></div>
-<div class="refsynopsisdiv" title="Synopsis">
-<a name="libnm-glib-NMRemoteSettingsSystem.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">                    <a class="link" href="libnm-glib-NMRemoteSettingsSystem.html#NMRemoteSettingsSystem" title="NMRemoteSettingsSystem">NMRemoteSettingsSystem</a>;
-                    <a class="link" href="libnm-glib-NMRemoteSettingsSystem.html#NMRemoteSettingsSystemClass" title="NMRemoteSettingsSystemClass">NMRemoteSettingsSystemClass</a>;
-<a class="link" href="libnm-glib-NMRemoteSettingsSystem.html#NMRemoteSettingsSystem" title="NMRemoteSettingsSystem"><span class="returnvalue">NMRemoteSettingsSystem</span></a> * <a class="link" href="libnm-glib-NMRemoteSettingsSystem.html#nm-remote-settings-system-new" title="nm_remote_settings_system_new ()">nm_remote_settings_system_new</a>  (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGConnection.html#DBusGConnection"><span class="type">DBusGConnection</span></a> *bus</code></em>);
-</pre>
-</div>
-<div class="refsect1" title="Description">
-<a name="libnm-glib-NMRemoteSettingsSystem.description"></a><h2>Description</h2>
-<p>
-</p>
-</div>
-<div class="refsect1" title="Details">
-<a name="libnm-glib-NMRemoteSettingsSystem.details"></a><h2>Details</h2>
-<div class="refsect2" title="NMRemoteSettingsSystem">
-<a name="NMRemoteSettingsSystem"></a><h3>NMRemoteSettingsSystem</h3>
-<pre class="programlisting">typedef struct {
-	NMRemoteSettings parent;
-} NMRemoteSettingsSystem;
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="NMRemoteSettingsSystemClass">
-<a name="NMRemoteSettingsSystemClass"></a><h3>NMRemoteSettingsSystemClass</h3>
-<pre class="programlisting">typedef struct {
-	NMRemoteSettingsClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-	void (*_reserved5) (void);
-	void (*_reserved6) (void);
-} NMRemoteSettingsSystemClass;
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="nm_remote_settings_system_new ()">
-<a name="nm-remote-settings-system-new"></a><h3>nm_remote_settings_system_new ()</h3>
-<pre class="programlisting"><a class="link" href="libnm-glib-NMRemoteSettingsSystem.html#NMRemoteSettingsSystem" title="NMRemoteSettingsSystem"><span class="returnvalue">NMRemoteSettingsSystem</span></a> * nm_remote_settings_system_new  (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGConnection.html#DBusGConnection"><span class="type">DBusGConnection</span></a> *bus</code></em>);</pre>
-<p>
-Creates a new object representing the remote system settings service.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>bus</code></em> :</span></p></td>
-<td>a valid and connected D-Bus connection
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the new remote system settings object on success, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> on failure
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-</div>
-</div>
-<div class="footer">
-<hr>
-          Generated by GTK-Doc V1.15</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/libnm-glib-NMSettings.html b/docs/libnm-glib/html/libnm-glib-NMSettings.html
deleted file mode 100644
index e56ab8fc3..000000000
--- a/docs/libnm-glib/html/libnm-glib-NMSettings.html
+++ /dev/null
@@ -1,310 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>NMSettings</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
-<link rel="home" href="index.html" title="libnm-glib Reference Manual">
-<link rel="up" href="ch01.html" title="libnm-glib Objects">
-<link rel="prev" href="libnm-glib-NMSettingsConnection.html" title="NMSettingsConnection">
-<link rel="next" href="libnm-glib-NMSettingsService.html" title="NMSettingsService">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
-<link rel="stylesheet" href="style.css" type="text/css">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
-<tr valign="middle">
-<td><a accesskey="p" href="libnm-glib-NMSettingsConnection.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="ch01.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">libnm-glib Reference Manual</th>
-<td><a accesskey="n" href="libnm-glib-NMSettingsService.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
-</tr>
-<tr><td colspan="5" class="shortcuts">
-<a href="#libnm-glib-NMSettings.synopsis" class="shortcut">Top</a>
-                   | 
-                  <a href="#libnm-glib-NMSettings.description" class="shortcut">Description</a>
-                   | 
-                  <a href="#libnm-glib-NMSettings.object-hierarchy" class="shortcut">Object Hierarchy</a>
-                   | 
-                  <a href="#libnm-glib-NMSettings.prerequisites" class="shortcut">Prerequisites</a>
-                   | 
-                  <a href="#libnm-glib-NMSettings.implementations" class="shortcut">Known Implementations</a>
-</td></tr>
-</table>
-<div class="refentry" title="NMSettings">
-<a name="libnm-glib-NMSettings"></a><div class="titlepage"></div>
-<div class="refnamediv"><table width="100%"><tr>
-<td valign="top">
-<h2><span class="refentrytitle"><a name="libnm-glib-NMSettings.top_of_page"></a>NMSettings</span></h2>
-<p>NMSettings</p>
-</td>
-<td valign="top" align="right"></td>
-</tr></table></div>
-<div class="refsynopsisdiv" title="Synopsis">
-<a name="libnm-glib-NMSettings.synopsis"></a><h2>Synopsis</h2>
-<a name="NMSettingsInterface"></a><pre class="synopsis">enum                <a class="link" href="libnm-glib-NMSettings.html#NMSettingsInterfaceError" title="enum NMSettingsInterfaceError">NMSettingsInterfaceError</a>;
-#define             <a class="link" href="libnm-glib-NMSettings.html#NM-SETTINGS-INTERFACE-ERROR:CAPS" title="NM_SETTINGS_INTERFACE_ERROR">NM_SETTINGS_INTERFACE_ERROR</a>
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              <a class="link" href="libnm-glib-NMSettings.html#nm-settings-interface-error-quark" title="nm_settings_interface_error_quark ()">nm_settings_interface_error_quark</a>   (<em class="parameter"><code><span class="type">void</span></code></em>);
-#define             <a class="link" href="libnm-glib-NMSettings.html#NM-TYPE-SETTINGS-INTERFACE-ERROR:CAPS" title="NM_TYPE_SETTINGS_INTERFACE_ERROR">NM_TYPE_SETTINGS_INTERFACE_ERROR</a>
-#define             <a class="link" href="libnm-glib-NMSettings.html#NM-SETTINGS-INTERFACE-NEW-CONNECTION:CAPS" title="NM_SETTINGS_INTERFACE_NEW_CONNECTION">NM_SETTINGS_INTERFACE_NEW_CONNECTION</a>
-#define             <a class="link" href="libnm-glib-NMSettings.html#NM-SETTINGS-INTERFACE-CONNECTIONS-READ:CAPS" title="NM_SETTINGS_INTERFACE_CONNECTIONS_READ">NM_SETTINGS_INTERFACE_CONNECTIONS_READ</a>
-                    <a class="link" href="libnm-glib-NMSettings.html#NMSettingsInterface-struct" title="NMSettingsInterface">NMSettingsInterface</a>;
-<span class="returnvalue">void</span>                (<a class="link" href="libnm-glib-NMSettings.html#NMSettingsAddConnectionFunc" title="NMSettingsAddConnectionFunc ()">*NMSettingsAddConnectionFunc</a>)      (<em class="parameter"><code><a class="link" href="libnm-glib-NMSettings.html#NMSettingsInterface"><span class="type">NMSettingsInterface</span></a> *settings</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
-<a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               <a class="link" href="libnm-glib-NMSettings.html#nm-settings-interface-get-type" title="nm_settings_interface_get_type ()">nm_settings_interface_get_type</a>      (<em class="parameter"><code><span class="type">void</span></code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="returnvalue">GSList</span></a> *            <a class="link" href="libnm-glib-NMSettings.html#nm-settings-interface-list-connections" title="nm_settings_interface_list_connections ()">nm_settings_interface_list_connections</a>
-                                                        (<em class="parameter"><code><a class="link" href="libnm-glib-NMSettings.html#NMSettingsInterface"><span class="type">NMSettingsInterface</span></a> *settings</code></em>);
-<a class="link" href="libnm-glib-NMSettingsConnection.html#NMSettingsConnectionInterface"><span class="returnvalue">NMSettingsConnectionInterface</span></a> * <a class="link" href="libnm-glib-NMSettings.html#nm-settings-interface-get-connection-by-path" title="nm_settings_interface_get_connection_by_path ()">nm_settings_interface_get_connection_by_path</a>
-                                                        (<em class="parameter"><code><a class="link" href="libnm-glib-NMSettings.html#NMSettingsInterface"><span class="type">NMSettingsInterface</span></a> *settings</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> *path</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="libnm-glib-NMSettings.html#nm-settings-interface-add-connection" title="nm_settings_interface_add_connection ()">nm_settings_interface_add_connection</a>
-                                                        (<em class="parameter"><code><a class="link" href="libnm-glib-NMSettings.html#NMSettingsInterface"><span class="type">NMSettingsInterface</span></a> *settings</code></em>,
-                                                         <em class="parameter"><code><a href="http://projects.gnome.org/NetworkManager/developers/libnm-util/08/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="libnm-glib-NMSettings.html#NMSettingsAddConnectionFunc" title="NMSettingsAddConnectionFunc ()"><span class="type">NMSettingsAddConnectionFunc</span></a> callback</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
-</pre>
-</div>
-<div class="refsect1" title="Object Hierarchy">
-<a name="libnm-glib-NMSettings.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="synopsis">
-  GInterface
-   +----NMSettingsInterface
-</pre>
-</div>
-<div class="refsect1" title="Prerequisites">
-<a name="libnm-glib-NMSettings.prerequisites"></a><h2>Prerequisites</h2>
-<p>
-NMSettingsInterface requires
- <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>.</p>
-</div>
-<div class="refsect1" title="Known Implementations">
-<a name="libnm-glib-NMSettings.implementations"></a><h2>Known Implementations</h2>
-<p>
-NMSettingsInterface is implemented by
- <a class="link" href="NMRemoteSettings.html" title="NMRemoteSettings">NMRemoteSettings</a>.</p>
-</div>
-<div class="refsect1" title="Description">
-<a name="libnm-glib-NMSettings.description"></a><h2>Description</h2>
-<p>
-</p>
-</div>
-<div class="refsect1" title="Details">
-<a name="libnm-glib-NMSettings.details"></a><h2>Details</h2>
-<div class="refsect2" title="enum NMSettingsInterfaceError">
-<a name="NMSettingsInterfaceError"></a><h3>enum NMSettingsInterfaceError</h3>
-<pre class="programlisting">typedef enum {
-	NM_SETTINGS_INTERFACE_ERROR_INVALID_CONNECTION = 0,
-	NM_SETTINGS_INTERFACE_ERROR_READ_ONLY_CONNECTION,
-	NM_SETTINGS_INTERFACE_ERROR_INTERNAL_ERROR,
-	NM_SETTINGS_INTERFACE_ERROR_SECRETS_UNAVAILABLE,
-	NM_SETTINGS_INTERFACE_ERROR_SECRETS_REQUEST_CANCELED,
-	NM_SETTINGS_INTERFACE_ERROR_PERMISSION_DENIED,
-	NM_SETTINGS_INTERFACE_ERROR_INVALID_SETTING,
-} NMSettingsInterfaceError;
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="NM_SETTINGS_INTERFACE_ERROR">
-<a name="NM-SETTINGS-INTERFACE-ERROR:CAPS"></a><h3>NM_SETTINGS_INTERFACE_ERROR</h3>
-<pre class="programlisting">#define NM_SETTINGS_INTERFACE_ERROR (nm_settings_interface_error_quark ())
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="nm_settings_interface_error_quark ()">
-<a name="nm-settings-interface-error-quark"></a><h3>nm_settings_interface_error_quark ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              nm_settings_interface_error_quark   (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
-<p>
-Setting error quark.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the setting error quark
-</td>
-</tr></tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="NM_TYPE_SETTINGS_INTERFACE_ERROR">
-<a name="NM-TYPE-SETTINGS-INTERFACE-ERROR:CAPS"></a><h3>NM_TYPE_SETTINGS_INTERFACE_ERROR</h3>
-<pre class="programlisting">#define NM_TYPE_SETTINGS_INTERFACE_ERROR (nm_settings_interface_error_get_type ()) 
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="NM_SETTINGS_INTERFACE_NEW_CONNECTION">
-<a name="NM-SETTINGS-INTERFACE-NEW-CONNECTION:CAPS"></a><h3>NM_SETTINGS_INTERFACE_NEW_CONNECTION</h3>
-<pre class="programlisting">#define NM_SETTINGS_INTERFACE_NEW_CONNECTION   "new-connection"
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="NM_SETTINGS_INTERFACE_CONNECTIONS_READ">
-<a name="NM-SETTINGS-INTERFACE-CONNECTIONS-READ:CAPS"></a><h3>NM_SETTINGS_INTERFACE_CONNECTIONS_READ</h3>
-<pre class="programlisting">#define NM_SETTINGS_INTERFACE_CONNECTIONS_READ "connections-read"
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="NMSettingsInterface">
-<a name="NMSettingsInterface-struct"></a><h3>NMSettingsInterface</h3>
-<pre class="programlisting">typedef struct _NMSettingsInterface NMSettingsInterface;</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="NMSettingsAddConnectionFunc ()">
-<a name="NMSettingsAddConnectionFunc"></a><h3>NMSettingsAddConnectionFunc ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                (*NMSettingsAddConnectionFunc)      (<em class="parameter"><code><a class="link" href="libnm-glib-NMSettings.html#NMSettingsInterface"><span class="type">NMSettingsInterface</span></a> *settings</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>settings</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_settings_interface_get_type ()">
-<a name="nm-settings-interface-get-type"></a><h3>nm_settings_interface_get_type ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               nm_settings_interface_get_type      (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_settings_interface_list_connections ()">
-<a name="nm-settings-interface-list-connections"></a><h3>nm_settings_interface_list_connections ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="returnvalue">GSList</span></a> *            nm_settings_interface_list_connections
-                                                        (<em class="parameter"><code><a class="link" href="libnm-glib-NMSettings.html#NMSettingsInterface"><span class="type">NMSettingsInterface</span></a> *settings</code></em>);</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>settings</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_settings_interface_get_connection_by_path ()">
-<a name="nm-settings-interface-get-connection-by-path"></a><h3>nm_settings_interface_get_connection_by_path ()</h3>
-<pre class="programlisting"><a class="link" href="libnm-glib-NMSettingsConnection.html#NMSettingsConnectionInterface"><span class="returnvalue">NMSettingsConnectionInterface</span></a> * nm_settings_interface_get_connection_by_path
-                                                        (<em class="parameter"><code><a class="link" href="libnm-glib-NMSettings.html#NMSettingsInterface"><span class="type">NMSettingsInterface</span></a> *settings</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> *path</code></em>);</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>settings</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>path</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_settings_interface_add_connection ()">
-<a name="nm-settings-interface-add-connection"></a><h3>nm_settings_interface_add_connection ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_settings_interface_add_connection
-                                                        (<em class="parameter"><code><a class="link" href="libnm-glib-NMSettings.html#NMSettingsInterface"><span class="type">NMSettingsInterface</span></a> *settings</code></em>,
-                                                         <em class="parameter"><code><a href="http://projects.gnome.org/NetworkManager/developers/libnm-util/08/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="libnm-glib-NMSettings.html#NMSettingsAddConnectionFunc" title="NMSettingsAddConnectionFunc ()"><span class="type">NMSettingsAddConnectionFunc</span></a> callback</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
-<p>
-Requests that the settings service add the given settings to a new connection.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>settings</code></em> :</span></p></td>
-<td>a object implementing <a class="link" href="libnm-glib-NMSettings.html#NMSettingsInterface"><code class="literal">NMSettingsInterface</code></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
-<td>the settings to add; note that this object's settings will be
- added, not the object itself
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>callback</code></em> :</span></p></td>
-<td>callback to be called when the add operation completes
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
-<td>caller-specific data passed to <em class="parameter"><code>callback</code></em>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> TRUE if the request was successful, FALSE if it failed
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-</div>
-</div>
-<div class="footer">
-<hr>
-          Generated by GTK-Doc V1.15</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/libnm-glib-NMSettingsConnection.html b/docs/libnm-glib/html/libnm-glib-NMSettingsConnection.html
deleted file mode 100644
index dc4e4ffa9..000000000
--- a/docs/libnm-glib/html/libnm-glib-NMSettingsConnection.html
+++ /dev/null
@@ -1,375 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>NMSettingsConnection</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
-<link rel="home" href="index.html" title="libnm-glib Reference Manual">
-<link rel="up" href="ch01.html" title="libnm-glib Objects">
-<link rel="prev" href="libnm-glib-NMRemoteSettingsSystem.html" title="NMRemoteSettingsSystem">
-<link rel="next" href="libnm-glib-NMSettings.html" title="NMSettings">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
-<link rel="stylesheet" href="style.css" type="text/css">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
-<tr valign="middle">
-<td><a accesskey="p" href="libnm-glib-NMRemoteSettingsSystem.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="ch01.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">libnm-glib Reference Manual</th>
-<td><a accesskey="n" href="libnm-glib-NMSettings.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
-</tr>
-<tr><td colspan="5" class="shortcuts">
-<a href="#libnm-glib-NMSettingsConnection.synopsis" class="shortcut">Top</a>
-                   | 
-                  <a href="#libnm-glib-NMSettingsConnection.description" class="shortcut">Description</a>
-                   | 
-                  <a href="#libnm-glib-NMSettingsConnection.object-hierarchy" class="shortcut">Object Hierarchy</a>
-                   | 
-                  <a href="#libnm-glib-NMSettingsConnection.prerequisites" class="shortcut">Prerequisites</a>
-                   | 
-                  <a href="#libnm-glib-NMSettingsConnection.implementations" class="shortcut">Known Implementations</a>
-</td></tr>
-</table>
-<div class="refentry" title="NMSettingsConnection">
-<a name="libnm-glib-NMSettingsConnection"></a><div class="titlepage"></div>
-<div class="refnamediv"><table width="100%"><tr>
-<td valign="top">
-<h2><span class="refentrytitle"><a name="libnm-glib-NMSettingsConnection.top_of_page"></a>NMSettingsConnection</span></h2>
-<p>NMSettingsConnection</p>
-</td>
-<td valign="top" align="right"></td>
-</tr></table></div>
-<div class="refsynopsisdiv" title="Synopsis">
-<a name="libnm-glib-NMSettingsConnection.synopsis"></a><h2>Synopsis</h2>
-<a name="NMSettingsConnectionInterface"></a><pre class="synopsis">#define             <a class="link" href="libnm-glib-NMSettingsConnection.html#NM-SETTINGS-CONNECTION-INTERFACE-UPDATED:CAPS" title="NM_SETTINGS_CONNECTION_INTERFACE_UPDATED">NM_SETTINGS_CONNECTION_INTERFACE_UPDATED</a>
-#define             <a class="link" href="libnm-glib-NMSettingsConnection.html#NM-SETTINGS-CONNECTION-INTERFACE-REMOVED:CAPS" title="NM_SETTINGS_CONNECTION_INTERFACE_REMOVED">NM_SETTINGS_CONNECTION_INTERFACE_REMOVED</a>
-                    <a class="link" href="libnm-glib-NMSettingsConnection.html#NMSettingsConnectionInterface-struct" title="NMSettingsConnectionInterface">NMSettingsConnectionInterface</a>;
-<span class="returnvalue">void</span>                (<a class="link" href="libnm-glib-NMSettingsConnection.html#NMSettingsConnectionInterfaceUpdateFunc" title="NMSettingsConnectionInterfaceUpdateFunc ()">*NMSettingsConnectionInterfaceUpdateFunc</a>)
-                                                        (<em class="parameter"><code><a class="link" href="libnm-glib-NMSettingsConnection.html#NMSettingsConnectionInterface"><span class="type">NMSettingsConnectionInterface</span></a> *connection</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
-<span class="returnvalue">void</span>                (<a class="link" href="libnm-glib-NMSettingsConnection.html#NMSettingsConnectionInterfaceDeleteFunc" title="NMSettingsConnectionInterfaceDeleteFunc ()">*NMSettingsConnectionInterfaceDeleteFunc</a>)
-                                                        (<em class="parameter"><code><a class="link" href="libnm-glib-NMSettingsConnection.html#NMSettingsConnectionInterface"><span class="type">NMSettingsConnectionInterface</span></a> *connection</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
-<span class="returnvalue">void</span>                (<a class="link" href="libnm-glib-NMSettingsConnection.html#NMSettingsConnectionInterfaceGetSecretsFunc" title="NMSettingsConnectionInterfaceGetSecretsFunc ()">*NMSettingsConnectionInterfaceGetSecretsFunc</a>)
-                                                        (<em class="parameter"><code><a class="link" href="libnm-glib-NMSettingsConnection.html#NMSettingsConnectionInterface"><span class="type">NMSettingsConnectionInterface</span></a> *connection</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *secrets</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="libnm-glib-NMSettingsConnection.html#nm-settings-connection-interface-update" title="nm_settings_connection_interface_update ()">nm_settings_connection_interface_update</a>
-                                                        (<em class="parameter"><code><a class="link" href="libnm-glib-NMSettingsConnection.html#NMSettingsConnectionInterface"><span class="type">NMSettingsConnectionInterface</span></a> *connection</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="libnm-glib-NMSettingsConnection.html#NMSettingsConnectionInterfaceUpdateFunc" title="NMSettingsConnectionInterfaceUpdateFunc ()"><span class="type">NMSettingsConnectionInterfaceUpdateFunc</span></a> callback</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="libnm-glib-NMSettingsConnection.html#nm-settings-connection-interface-delete" title="nm_settings_connection_interface_delete ()">nm_settings_connection_interface_delete</a>
-                                                        (<em class="parameter"><code><a class="link" href="libnm-glib-NMSettingsConnection.html#NMSettingsConnectionInterface"><span class="type">NMSettingsConnectionInterface</span></a> *connection</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="libnm-glib-NMSettingsConnection.html#NMSettingsConnectionInterfaceDeleteFunc" title="NMSettingsConnectionInterfaceDeleteFunc ()"><span class="type">NMSettingsConnectionInterfaceDeleteFunc</span></a> callback</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="libnm-glib-NMSettingsConnection.html#nm-settings-connection-interface-get-secrets" title="nm_settings_connection_interface_get_secrets ()">nm_settings_connection_interface_get_secrets</a>
-                                                        (<em class="parameter"><code><a class="link" href="libnm-glib-NMSettingsConnection.html#NMSettingsConnectionInterface"><span class="type">NMSettingsConnectionInterface</span></a> *connection</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> *setting_name</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> **hints</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> request_new</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="libnm-glib-NMSettingsConnection.html#NMSettingsConnectionInterfaceGetSecretsFunc" title="NMSettingsConnectionInterfaceGetSecretsFunc ()"><span class="type">NMSettingsConnectionInterfaceGetSecretsFunc</span></a> callback</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="libnm-glib-NMSettingsConnection.html#nm-settings-connection-interface-emit-updated" title="nm_settings_connection_interface_emit_updated ()">nm_settings_connection_interface_emit_updated</a>
-                                                        (<em class="parameter"><code><a class="link" href="libnm-glib-NMSettingsConnection.html#NMSettingsConnectionInterface"><span class="type">NMSettingsConnectionInterface</span></a> *connection</code></em>);
-</pre>
-</div>
-<div class="refsect1" title="Object Hierarchy">
-<a name="libnm-glib-NMSettingsConnection.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="synopsis">
-  GInterface
-   +----NMSettingsConnectionInterface
-</pre>
-</div>
-<div class="refsect1" title="Prerequisites">
-<a name="libnm-glib-NMSettingsConnection.prerequisites"></a><h2>Prerequisites</h2>
-<p>
-NMSettingsConnectionInterface requires
- <a href="http://projects.gnome.org/NetworkManager/developers/libnm-util/08/NMConnection.html">NMConnection</a>.</p>
-</div>
-<div class="refsect1" title="Known Implementations">
-<a name="libnm-glib-NMSettingsConnection.implementations"></a><h2>Known Implementations</h2>
-<p>
-NMSettingsConnectionInterface is implemented by
- <a class="link" href="NMExportedConnection.html" title="NMExportedConnection">NMExportedConnection</a> and  <a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection">NMRemoteConnection</a>.</p>
-</div>
-<div class="refsect1" title="Description">
-<a name="libnm-glib-NMSettingsConnection.description"></a><h2>Description</h2>
-<p>
-</p>
-</div>
-<div class="refsect1" title="Details">
-<a name="libnm-glib-NMSettingsConnection.details"></a><h2>Details</h2>
-<div class="refsect2" title="NM_SETTINGS_CONNECTION_INTERFACE_UPDATED">
-<a name="NM-SETTINGS-CONNECTION-INTERFACE-UPDATED:CAPS"></a><h3>NM_SETTINGS_CONNECTION_INTERFACE_UPDATED</h3>
-<pre class="programlisting">#define NM_SETTINGS_CONNECTION_INTERFACE_UPDATED               "updated"
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="NM_SETTINGS_CONNECTION_INTERFACE_REMOVED">
-<a name="NM-SETTINGS-CONNECTION-INTERFACE-REMOVED:CAPS"></a><h3>NM_SETTINGS_CONNECTION_INTERFACE_REMOVED</h3>
-<pre class="programlisting">#define NM_SETTINGS_CONNECTION_INTERFACE_REMOVED               "removed"
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="NMSettingsConnectionInterface">
-<a name="NMSettingsConnectionInterface-struct"></a><h3>NMSettingsConnectionInterface</h3>
-<pre class="programlisting">typedef struct _NMSettingsConnectionInterface NMSettingsConnectionInterface;</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="NMSettingsConnectionInterfaceUpdateFunc ()">
-<a name="NMSettingsConnectionInterfaceUpdateFunc"></a><h3>NMSettingsConnectionInterfaceUpdateFunc ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                (*NMSettingsConnectionInterfaceUpdateFunc)
-                                                        (<em class="parameter"><code><a class="link" href="libnm-glib-NMSettingsConnection.html#NMSettingsConnectionInterface"><span class="type">NMSettingsConnectionInterface</span></a> *connection</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="NMSettingsConnectionInterfaceDeleteFunc ()">
-<a name="NMSettingsConnectionInterfaceDeleteFunc"></a><h3>NMSettingsConnectionInterfaceDeleteFunc ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                (*NMSettingsConnectionInterfaceDeleteFunc)
-                                                        (<em class="parameter"><code><a class="link" href="libnm-glib-NMSettingsConnection.html#NMSettingsConnectionInterface"><span class="type">NMSettingsConnectionInterface</span></a> *connection</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="NMSettingsConnectionInterfaceGetSecretsFunc ()">
-<a name="NMSettingsConnectionInterfaceGetSecretsFunc"></a><h3>NMSettingsConnectionInterfaceGetSecretsFunc ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                (*NMSettingsConnectionInterfaceGetSecretsFunc)
-                                                        (<em class="parameter"><code><a class="link" href="libnm-glib-NMSettingsConnection.html#NMSettingsConnectionInterface"><span class="type">NMSettingsConnectionInterface</span></a> *connection</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *secrets</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>secrets</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_settings_connection_interface_update ()">
-<a name="nm-settings-connection-interface-update"></a><h3>nm_settings_connection_interface_update ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_settings_connection_interface_update
-                                                        (<em class="parameter"><code><a class="link" href="libnm-glib-NMSettingsConnection.html#NMSettingsConnectionInterface"><span class="type">NMSettingsConnectionInterface</span></a> *connection</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="libnm-glib-NMSettingsConnection.html#NMSettingsConnectionInterfaceUpdateFunc" title="NMSettingsConnectionInterfaceUpdateFunc ()"><span class="type">NMSettingsConnectionInterfaceUpdateFunc</span></a> callback</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
-<p>
-Update the connection with current settings and properties.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
-<td>an object implementing <a class="link" href="libnm-glib-NMSettingsConnection.html#NMSettingsConnectionInterface"><span class="type">NMSettingsConnectionInterface</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>callback</code></em> :</span></p></td>
-<td>a function to be called when the update completes
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
-<td>caller-specific data to be passed to <em class="parameter"><code>callback</code></em>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> TRUE on success, FALSE on failure
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_settings_connection_interface_delete ()">
-<a name="nm-settings-connection-interface-delete"></a><h3>nm_settings_connection_interface_delete ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_settings_connection_interface_delete
-                                                        (<em class="parameter"><code><a class="link" href="libnm-glib-NMSettingsConnection.html#NMSettingsConnectionInterface"><span class="type">NMSettingsConnectionInterface</span></a> *connection</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="libnm-glib-NMSettingsConnection.html#NMSettingsConnectionInterfaceDeleteFunc" title="NMSettingsConnectionInterfaceDeleteFunc ()"><span class="type">NMSettingsConnectionInterfaceDeleteFunc</span></a> callback</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
-<p>
-Delete the connection.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
-<td>a objecting implementing <a class="link" href="libnm-glib-NMSettingsConnection.html#NMSettingsConnectionInterface"><span class="type">NMSettingsConnectionInterface</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>callback</code></em> :</span></p></td>
-<td>a function to be called when the delete completes
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
-<td>caller-specific data to be passed to <em class="parameter"><code>callback</code></em>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> TRUE on success, FALSE on failure
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_settings_connection_interface_get_secrets ()">
-<a name="nm-settings-connection-interface-get-secrets"></a><h3>nm_settings_connection_interface_get_secrets ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_settings_connection_interface_get_secrets
-                                                        (<em class="parameter"><code><a class="link" href="libnm-glib-NMSettingsConnection.html#NMSettingsConnectionInterface"><span class="type">NMSettingsConnectionInterface</span></a> *connection</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> *setting_name</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> **hints</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> request_new</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="libnm-glib-NMSettingsConnection.html#NMSettingsConnectionInterfaceGetSecretsFunc" title="NMSettingsConnectionInterfaceGetSecretsFunc ()"><span class="type">NMSettingsConnectionInterfaceGetSecretsFunc</span></a> callback</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
-<p>
-Request the connection's secrets.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
-<td>a object implementing <a class="link" href="libnm-glib-NMSettingsConnection.html#NMSettingsConnectionInterface"><span class="type">NMSettingsConnectionInterface</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting_name</code></em> :</span></p></td>
-<td>the <a href="http://projects.gnome.org/NetworkManager/developers/libnm-util/08/NMSetting.html"><span class="type">NMSetting</span></a> object name to get secrets for
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>hints</code></em> :</span></p></td>
-<td>
-<a href="http://projects.gnome.org/NetworkManager/developers/libnm-util/08/NMSetting.html"><span class="type">NMSetting</span></a> key names to get secrets for (optional)
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>request_new</code></em> :</span></p></td>
-<td>hint that new secrets (instead of cached or stored secrets) 
- should be returned
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>callback</code></em> :</span></p></td>
-<td>a function to be called when the update completes
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
-<td>caller-specific data to be passed to <em class="parameter"><code>callback</code></em>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> TRUE on success, FALSE on failure
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_settings_connection_interface_emit_updated ()">
-<a name="nm-settings-connection-interface-emit-updated"></a><h3>nm_settings_connection_interface_emit_updated ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                nm_settings_connection_interface_emit_updated
-                                                        (<em class="parameter"><code><a class="link" href="libnm-glib-NMSettingsConnection.html#NMSettingsConnectionInterface"><span class="type">NMSettingsConnectionInterface</span></a> *connection</code></em>);</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
-</div>
-</div>
-</div>
-<div class="footer">
-<hr>
-          Generated by GTK-Doc V1.15</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/libnm-glib-NMSettingsService.html b/docs/libnm-glib/html/libnm-glib-NMSettingsService.html
deleted file mode 100644
index 85c51a6b2..000000000
--- a/docs/libnm-glib/html/libnm-glib-NMSettingsService.html
+++ /dev/null
@@ -1,189 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>NMSettingsService</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
-<link rel="home" href="index.html" title="libnm-glib Reference Manual">
-<link rel="up" href="ch01.html" title="libnm-glib Objects">
-<link rel="prev" href="libnm-glib-NMSettings.html" title="NMSettings">
-<link rel="next" href="libnm-glib-NMSettingsSystem.html" title="NMSettingsSystem">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
-<link rel="stylesheet" href="style.css" type="text/css">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
-<tr valign="middle">
-<td><a accesskey="p" href="libnm-glib-NMSettings.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="ch01.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">libnm-glib Reference Manual</th>
-<td><a accesskey="n" href="libnm-glib-NMSettingsSystem.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
-</tr>
-<tr><td colspan="5" class="shortcuts">
-<a href="#libnm-glib-NMSettingsService.synopsis" class="shortcut">Top</a>
-                   | 
-                  <a href="#libnm-glib-NMSettingsService.description" class="shortcut">Description</a>
-</td></tr>
-</table>
-<div class="refentry" title="NMSettingsService">
-<a name="libnm-glib-NMSettingsService"></a><div class="titlepage"></div>
-<div class="refnamediv"><table width="100%"><tr>
-<td valign="top">
-<h2><span class="refentrytitle"><a name="libnm-glib-NMSettingsService.top_of_page"></a>NMSettingsService</span></h2>
-<p>NMSettingsService</p>
-</td>
-<td valign="top" align="right"></td>
-</tr></table></div>
-<div class="refsynopsisdiv" title="Synopsis">
-<a name="libnm-glib-NMSettingsService.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">#define             <a class="link" href="libnm-glib-NMSettingsService.html#NM-SETTINGS-SERVICE-BUS:CAPS" title="NM_SETTINGS_SERVICE_BUS">NM_SETTINGS_SERVICE_BUS</a>
-#define             <a class="link" href="libnm-glib-NMSettingsService.html#NM-SETTINGS-SERVICE-SCOPE:CAPS" title="NM_SETTINGS_SERVICE_SCOPE">NM_SETTINGS_SERVICE_SCOPE</a>
-                    <a class="link" href="libnm-glib-NMSettingsService.html#NMSettingsService" title="NMSettingsService">NMSettingsService</a>;
-                    <a class="link" href="libnm-glib-NMSettingsService.html#NMSettingsServiceClass" title="NMSettingsServiceClass">NMSettingsServiceClass</a>;
-<a class="link" href="NMExportedConnection.html" title="NMExportedConnection"><span class="returnvalue">NMExportedConnection</span></a> * <a class="link" href="libnm-glib-NMSettingsService.html#nm-settings-service-get-connection-by-path" title="nm_settings_service_get_connection_by_path ()">nm_settings_service_get_connection_by_path</a>
-                                                        (<em class="parameter"><code><a class="link" href="libnm-glib-NMSettingsService.html#NMSettingsService" title="NMSettingsService"><span class="type">NMSettingsService</span></a> *self</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> *path</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="libnm-glib-NMSettingsService.html#nm-settings-service-export" title="nm_settings_service_export ()">nm_settings_service_export</a>          (<em class="parameter"><code><a class="link" href="libnm-glib-NMSettingsService.html#NMSettingsService" title="NMSettingsService"><span class="type">NMSettingsService</span></a> *self</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="libnm-glib-NMSettingsService.html#nm-settings-service-export-connection" title="nm_settings_service_export_connection ()">nm_settings_service_export_connection</a>
-                                                        (<em class="parameter"><code><a class="link" href="libnm-glib-NMSettingsService.html#NMSettingsService" title="NMSettingsService"><span class="type">NMSettingsService</span></a> *self</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="libnm-glib-NMSettingsConnection.html#NMSettingsConnectionInterface"><span class="type">NMSettingsConnectionInterface</span></a> *exported</code></em>);
-</pre>
-</div>
-<div class="refsect1" title="Description">
-<a name="libnm-glib-NMSettingsService.description"></a><h2>Description</h2>
-<p>
-</p>
-</div>
-<div class="refsect1" title="Details">
-<a name="libnm-glib-NMSettingsService.details"></a><h2>Details</h2>
-<div class="refsect2" title="NM_SETTINGS_SERVICE_BUS">
-<a name="NM-SETTINGS-SERVICE-BUS:CAPS"></a><h3>NM_SETTINGS_SERVICE_BUS</h3>
-<pre class="programlisting">#define NM_SETTINGS_SERVICE_BUS "bus"
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="NM_SETTINGS_SERVICE_SCOPE">
-<a name="NM-SETTINGS-SERVICE-SCOPE:CAPS"></a><h3>NM_SETTINGS_SERVICE_SCOPE</h3>
-<pre class="programlisting">#define NM_SETTINGS_SERVICE_SCOPE "scope"
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="NMSettingsService">
-<a name="NMSettingsService"></a><h3>NMSettingsService</h3>
-<pre class="programlisting">typedef struct {
-	GObject parent;
-} NMSettingsService;
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="NMSettingsServiceClass">
-<a name="NMSettingsServiceClass"></a><h3>NMSettingsServiceClass</h3>
-<pre class="programlisting">typedef struct {
-	GObjectClass parent;
-
-	/* Returned list must contain all NMExportedConnection objects exported
-	 * by the settings service.  The list (but not the NMExportedConnection
-	 * objects) will be freed by caller.
-	 */
-	GSList * (*list_connections) (NMSettingsService *self);
-
-	void (*add_connection) (NMSettingsService *self,
-	                        NMConnection *connection,
-	                        DBusGMethodInvocation *context, /* Only present for D-Bus calls */
-	                        NMSettingsAddConnectionFunc callback,
-	                        gpointer user_data);
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-	void (*_reserved5) (void);
-	void (*_reserved6) (void);
-} NMSettingsServiceClass;
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="nm_settings_service_get_connection_by_path ()">
-<a name="nm-settings-service-get-connection-by-path"></a><h3>nm_settings_service_get_connection_by_path ()</h3>
-<pre class="programlisting"><a class="link" href="NMExportedConnection.html" title="NMExportedConnection"><span class="returnvalue">NMExportedConnection</span></a> * nm_settings_service_get_connection_by_path
-                                                        (<em class="parameter"><code><a class="link" href="libnm-glib-NMSettingsService.html#NMSettingsService" title="NMSettingsService"><span class="type">NMSettingsService</span></a> *self</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> *path</code></em>);</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>self</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>path</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_settings_service_export ()">
-<a name="nm-settings-service-export"></a><h3>nm_settings_service_export ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                nm_settings_service_export          (<em class="parameter"><code><a class="link" href="libnm-glib-NMSettingsService.html#NMSettingsService" title="NMSettingsService"><span class="type">NMSettingsService</span></a> *self</code></em>);</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>self</code></em> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_settings_service_export_connection ()">
-<a name="nm-settings-service-export-connection"></a><h3>nm_settings_service_export_connection ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                nm_settings_service_export_connection
-                                                        (<em class="parameter"><code><a class="link" href="libnm-glib-NMSettingsService.html#NMSettingsService" title="NMSettingsService"><span class="type">NMSettingsService</span></a> *self</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="libnm-glib-NMSettingsConnection.html#NMSettingsConnectionInterface"><span class="type">NMSettingsConnectionInterface</span></a> *exported</code></em>);</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>self</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>exported</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-</div>
-</div>
-<div class="footer">
-<hr>
-          Generated by GTK-Doc V1.15</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/libnm-glib-NMSettingsSystem.html b/docs/libnm-glib/html/libnm-glib-NMSettingsSystem.html
deleted file mode 100644
index 1be498be0..000000000
--- a/docs/libnm-glib/html/libnm-glib-NMSettingsSystem.html
+++ /dev/null
@@ -1,305 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>NMSettingsSystem</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
-<link rel="home" href="index.html" title="libnm-glib Reference Manual">
-<link rel="up" href="ch01.html" title="libnm-glib Objects">
-<link rel="prev" href="libnm-glib-NMSettingsService.html" title="NMSettingsService">
-<link rel="next" href="libnm-glib-nm-types.html" title="nm-types">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
-<link rel="stylesheet" href="style.css" type="text/css">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
-<tr valign="middle">
-<td><a accesskey="p" href="libnm-glib-NMSettingsService.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="ch01.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">libnm-glib Reference Manual</th>
-<td><a accesskey="n" href="libnm-glib-nm-types.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
-</tr>
-<tr><td colspan="5" class="shortcuts">
-<a href="#libnm-glib-NMSettingsSystem.synopsis" class="shortcut">Top</a>
-                   | 
-                  <a href="#libnm-glib-NMSettingsSystem.description" class="shortcut">Description</a>
-</td></tr>
-</table>
-<div class="refentry" title="NMSettingsSystem">
-<a name="libnm-glib-NMSettingsSystem"></a><div class="titlepage"></div>
-<div class="refnamediv"><table width="100%"><tr>
-<td valign="top">
-<h2><span class="refentrytitle"><a name="libnm-glib-NMSettingsSystem.top_of_page"></a>NMSettingsSystem</span></h2>
-<p>NMSettingsSystem</p>
-</td>
-<td valign="top" align="right"></td>
-</tr></table></div>
-<div class="refsynopsisdiv" title="Synopsis">
-<a name="libnm-glib-NMSettingsSystem.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">enum                <a class="link" href="libnm-glib-NMSettingsSystem.html#NMSettingsSystemPermissions" title="enum NMSettingsSystemPermissions">NMSettingsSystemPermissions</a>;
-#define             <a class="link" href="libnm-glib-NMSettingsSystem.html#NM-SETTINGS-SYSTEM-INTERFACE-HOSTNAME:CAPS" title="NM_SETTINGS_SYSTEM_INTERFACE_HOSTNAME">NM_SETTINGS_SYSTEM_INTERFACE_HOSTNAME</a>
-#define             <a class="link" href="libnm-glib-NMSettingsSystem.html#NM-SETTINGS-SYSTEM-INTERFACE-CAN-MODIFY:CAPS" title="NM_SETTINGS_SYSTEM_INTERFACE_CAN_MODIFY">NM_SETTINGS_SYSTEM_INTERFACE_CAN_MODIFY</a>
-#define             <a class="link" href="libnm-glib-NMSettingsSystem.html#NM-SETTINGS-SYSTEM-INTERFACE-CHECK-PERMISSIONS:CAPS" title="NM_SETTINGS_SYSTEM_INTERFACE_CHECK_PERMISSIONS">NM_SETTINGS_SYSTEM_INTERFACE_CHECK_PERMISSIONS</a>
-enum                <a class="link" href="libnm-glib-NMSettingsSystem.html#NMSettingsSystemInterfaceProp" title="enum NMSettingsSystemInterfaceProp">NMSettingsSystemInterfaceProp</a>;
-                    <a class="link" href="libnm-glib-NMSettingsSystem.html#NMSettingsSystemInterface" title="NMSettingsSystemInterface">NMSettingsSystemInterface</a>;
-<span class="returnvalue">void</span>                (<a class="link" href="libnm-glib-NMSettingsSystem.html#NMSettingsSystemSaveHostnameFunc" title="NMSettingsSystemSaveHostnameFunc ()">*NMSettingsSystemSaveHostnameFunc</a>) (<em class="parameter"><code><a class="link" href="libnm-glib-NMSettingsSystem.html#NMSettingsSystemInterface" title="NMSettingsSystemInterface"><span class="type">NMSettingsSystemInterface</span></a> *settings</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
-<span class="returnvalue">void</span>                (<a class="link" href="libnm-glib-NMSettingsSystem.html#NMSettingsSystemGetPermissionsFunc" title="NMSettingsSystemGetPermissionsFunc ()">*NMSettingsSystemGetPermissionsFunc</a>)
-                                                        (<em class="parameter"><code><a class="link" href="libnm-glib-NMSettingsSystem.html#NMSettingsSystemInterface" title="NMSettingsSystemInterface"><span class="type">NMSettingsSystemInterface</span></a> *settings</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="libnm-glib-NMSettingsSystem.html#NMSettingsSystemPermissions" title="enum NMSettingsSystemPermissions"><span class="type">NMSettingsSystemPermissions</span></a> permissions</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="libnm-glib-NMSettingsSystem.html#nm-settings-system-interface-save-hostname" title="nm_settings_system_interface_save_hostname ()">nm_settings_system_interface_save_hostname</a>
-                                                        (<em class="parameter"><code><a class="link" href="libnm-glib-NMSettingsSystem.html#NMSettingsSystemInterface" title="NMSettingsSystemInterface"><span class="type">NMSettingsSystemInterface</span></a> *settings</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> *hostname</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="libnm-glib-NMSettingsSystem.html#NMSettingsSystemSaveHostnameFunc" title="NMSettingsSystemSaveHostnameFunc ()"><span class="type">NMSettingsSystemSaveHostnameFunc</span></a> callback</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="libnm-glib-NMSettingsSystem.html#nm-settings-system-interface-get-permissions" title="nm_settings_system_interface_get_permissions ()">nm_settings_system_interface_get_permissions</a>
-                                                        (<em class="parameter"><code><a class="link" href="libnm-glib-NMSettingsSystem.html#NMSettingsSystemInterface" title="NMSettingsSystemInterface"><span class="type">NMSettingsSystemInterface</span></a> *settings</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="libnm-glib-NMSettingsSystem.html#NMSettingsSystemGetPermissionsFunc" title="NMSettingsSystemGetPermissionsFunc ()"><span class="type">NMSettingsSystemGetPermissionsFunc</span></a> callback</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
-</pre>
-</div>
-<div class="refsect1" title="Description">
-<a name="libnm-glib-NMSettingsSystem.description"></a><h2>Description</h2>
-<p>
-</p>
-</div>
-<div class="refsect1" title="Details">
-<a name="libnm-glib-NMSettingsSystem.details"></a><h2>Details</h2>
-<div class="refsect2" title="enum NMSettingsSystemPermissions">
-<a name="NMSettingsSystemPermissions"></a><h3>enum NMSettingsSystemPermissions</h3>
-<pre class="programlisting">typedef enum {
-	NM_SETTINGS_SYSTEM_PERMISSION_NONE = 0x0,
-	NM_SETTINGS_SYSTEM_PERMISSION_CONNECTION_MODIFY = 0x1,
-	NM_SETTINGS_SYSTEM_PERMISSION_WIFI_SHARE_PROTECTED = 0x2,
-	NM_SETTINGS_SYSTEM_PERMISSION_WIFI_SHARE_OPEN = 0x4,
-	NM_SETTINGS_SYSTEM_PERMISSION_HOSTNAME_MODIFY = 0x8
-} NMSettingsSystemPermissions;
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="NM_SETTINGS_SYSTEM_INTERFACE_HOSTNAME">
-<a name="NM-SETTINGS-SYSTEM-INTERFACE-HOSTNAME:CAPS"></a><h3>NM_SETTINGS_SYSTEM_INTERFACE_HOSTNAME</h3>
-<pre class="programlisting">#define NM_SETTINGS_SYSTEM_INTERFACE_HOSTNAME          "hostname"
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="NM_SETTINGS_SYSTEM_INTERFACE_CAN_MODIFY">
-<a name="NM-SETTINGS-SYSTEM-INTERFACE-CAN-MODIFY:CAPS"></a><h3>NM_SETTINGS_SYSTEM_INTERFACE_CAN_MODIFY</h3>
-<pre class="programlisting">#define NM_SETTINGS_SYSTEM_INTERFACE_CAN_MODIFY        "can-modify"
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="NM_SETTINGS_SYSTEM_INTERFACE_CHECK_PERMISSIONS">
-<a name="NM-SETTINGS-SYSTEM-INTERFACE-CHECK-PERMISSIONS:CAPS"></a><h3>NM_SETTINGS_SYSTEM_INTERFACE_CHECK_PERMISSIONS</h3>
-<pre class="programlisting">#define NM_SETTINGS_SYSTEM_INTERFACE_CHECK_PERMISSIONS "check-permissions"
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="enum NMSettingsSystemInterfaceProp">
-<a name="NMSettingsSystemInterfaceProp"></a><h3>enum NMSettingsSystemInterfaceProp</h3>
-<pre class="programlisting">typedef enum {
-	NM_SETTINGS_SYSTEM_INTERFACE_PROP_FIRST = 0x1000,
-
-	NM_SETTINGS_SYSTEM_INTERFACE_PROP_HOSTNAME = NM_SETTINGS_SYSTEM_INTERFACE_PROP_FIRST,
-	NM_SETTINGS_SYSTEM_INTERFACE_PROP_CAN_MODIFY
-} NMSettingsSystemInterfaceProp;
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="NMSettingsSystemInterface">
-<a name="NMSettingsSystemInterface"></a><h3>NMSettingsSystemInterface</h3>
-<pre class="programlisting">typedef struct {
-	GTypeInterface g_iface;
-
-	/* Methods */
-	gboolean (*save_hostname) (NMSettingsSystemInterface *settings,
-	                           const char *hostname,
-	                           NMSettingsSystemSaveHostnameFunc callback,
-	                           gpointer user_data);
-
-	gboolean (*get_permissions) (NMSettingsSystemInterface *settings,
-	                             NMSettingsSystemGetPermissionsFunc callback,
-	                             gpointer user_data);
-
-	/* Signals */
-	void (*check_permissions) (NMSettingsSystemInterface *settings);
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-	void (*_reserved5) (void);
-	void (*_reserved6) (void);
-} NMSettingsSystemInterface;
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="NMSettingsSystemSaveHostnameFunc ()">
-<a name="NMSettingsSystemSaveHostnameFunc"></a><h3>NMSettingsSystemSaveHostnameFunc ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                (*NMSettingsSystemSaveHostnameFunc) (<em class="parameter"><code><a class="link" href="libnm-glib-NMSettingsSystem.html#NMSettingsSystemInterface" title="NMSettingsSystemInterface"><span class="type">NMSettingsSystemInterface</span></a> *settings</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>settings</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="NMSettingsSystemGetPermissionsFunc ()">
-<a name="NMSettingsSystemGetPermissionsFunc"></a><h3>NMSettingsSystemGetPermissionsFunc ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                (*NMSettingsSystemGetPermissionsFunc)
-                                                        (<em class="parameter"><code><a class="link" href="libnm-glib-NMSettingsSystem.html#NMSettingsSystemInterface" title="NMSettingsSystemInterface"><span class="type">NMSettingsSystemInterface</span></a> *settings</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="libnm-glib-NMSettingsSystem.html#NMSettingsSystemPermissions" title="enum NMSettingsSystemPermissions"><span class="type">NMSettingsSystemPermissions</span></a> permissions</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>settings</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>permissions</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_settings_system_interface_save_hostname ()">
-<a name="nm-settings-system-interface-save-hostname"></a><h3>nm_settings_system_interface_save_hostname ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_settings_system_interface_save_hostname
-                                                        (<em class="parameter"><code><a class="link" href="libnm-glib-NMSettingsSystem.html#NMSettingsSystemInterface" title="NMSettingsSystemInterface"><span class="type">NMSettingsSystemInterface</span></a> *settings</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> *hostname</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="libnm-glib-NMSettingsSystem.html#NMSettingsSystemSaveHostnameFunc" title="NMSettingsSystemSaveHostnameFunc ()"><span class="type">NMSettingsSystemSaveHostnameFunc</span></a> callback</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
-<p>
-Requests that the machine's persistent hostname be set to the specified value
-or cleared.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>settings</code></em> :</span></p></td>
-<td>a object implementing <a class="link" href="libnm-glib-NMSettingsSystem.html#NMSettingsSystemInterface" title="NMSettingsSystemInterface"><code class="literal">NMSettingsSystemInterface</code></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>hostname</code></em> :</span></p></td>
-<td>the new persistent hostname to set, or NULL to clear any existing
- persistent hostname
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>callback</code></em> :</span></p></td>
-<td>callback to be called when the hostname operation completes
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
-<td>caller-specific data passed to <em class="parameter"><code>callback</code></em>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> TRUE if the request was successful, FALSE if it failed
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_settings_system_interface_get_permissions ()">
-<a name="nm-settings-system-interface-get-permissions"></a><h3>nm_settings_system_interface_get_permissions ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_settings_system_interface_get_permissions
-                                                        (<em class="parameter"><code><a class="link" href="libnm-glib-NMSettingsSystem.html#NMSettingsSystemInterface" title="NMSettingsSystemInterface"><span class="type">NMSettingsSystemInterface</span></a> *settings</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="libnm-glib-NMSettingsSystem.html#NMSettingsSystemGetPermissionsFunc" title="NMSettingsSystemGetPermissionsFunc ()"><span class="type">NMSettingsSystemGetPermissionsFunc</span></a> callback</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
-<p>
-Requests an indication of the operations the caller is permitted to perform
-including those that may require authorization.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>settings</code></em> :</span></p></td>
-<td>a object implementing <a class="link" href="libnm-glib-NMSettingsSystem.html#NMSettingsSystemInterface" title="NMSettingsSystemInterface"><code class="literal">NMSettingsSystemInterface</code></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>callback</code></em> :</span></p></td>
-<td>callback to be called when the permissions operation completes
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
-<td>caller-specific data passed to <em class="parameter"><code>callback</code></em>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> TRUE if the request was successful, FALSE if it failed
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-</div>
-</div>
-<div class="footer">
-<hr>
-          Generated by GTK-Doc V1.15</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html b/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html
index f085a2beb..74a989818 100644
--- a/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html
+++ b/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html
@@ -3,19 +3,19 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>NMVPNPlugin</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="libnm-glib Reference Manual">
-<link rel="up" href="ch01.html" title="libnm-glib Objects">
+<link rel="up" href="ch02.html" title="libnm-glib API Reference">
 <link rel="prev" href="NMVPNConnection.html" title="NMVPNConnection">
 <link rel="next" href="libnm-glib-NMVpnPluginUi.html" title="NMVpnPluginUi">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
 <tr valign="middle">
 <td><a accesskey="p" href="NMVPNConnection.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="ch01.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
+<td><a accesskey="u" href="ch02.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
 <th width="100%" align="center">libnm-glib Reference Manual</th>
 <td><a accesskey="n" href="libnm-glib-NMVpnPluginUi.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
@@ -26,7 +26,7 @@
                   <a href="#libnm-glib-NMVPNPlugin.description" class="shortcut">Description</a>
 </td></tr>
 </table>
-<div class="refentry" title="NMVPNPlugin">
+<div class="refentry">
 <a name="libnm-glib-NMVPNPlugin"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
@@ -35,7 +35,7 @@
 </td>
 <td valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv" title="Synopsis">
+<div class="refsynopsisdiv">
 <a name="libnm-glib-NMVPNPlugin.synopsis"></a><h2>Synopsis</h2>
 <pre class="synopsis">#define             <a class="link" href="libnm-glib-NMVPNPlugin.html#NM-VPN-PLUGIN-DBUS-SERVICE-NAME:CAPS" title="NM_VPN_PLUGIN_DBUS_SERVICE_NAME">NM_VPN_PLUGIN_DBUS_SERVICE_NAME</a>
 #define             <a class="link" href="libnm-glib-NMVPNPlugin.html#NM-VPN-PLUGIN-STATE:CAPS" title="NM_VPN_PLUGIN_STATE">NM_VPN_PLUGIN_STATE</a>
@@ -60,14 +60,14 @@ enum                <a class="link" href="libnm-glib-NMVPNPlugin.html#NMVPNPlugi
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **err</code></em>);
 </pre>
 </div>
-<div class="refsect1" title="Description">
+<div class="refsect1">
 <a name="libnm-glib-NMVPNPlugin.description"></a><h2>Description</h2>
 <p>
 </p>
 </div>
-<div class="refsect1" title="Details">
+<div class="refsect1">
 <a name="libnm-glib-NMVPNPlugin.details"></a><h2>Details</h2>
-<div class="refsect2" title="NM_VPN_PLUGIN_DBUS_SERVICE_NAME">
+<div class="refsect2">
 <a name="NM-VPN-PLUGIN-DBUS-SERVICE-NAME:CAPS"></a><h3>NM_VPN_PLUGIN_DBUS_SERVICE_NAME</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_DBUS_SERVICE_NAME "service-name"
 </pre>
@@ -75,7 +75,7 @@ enum                <a class="link" href="libnm-glib-NMVPNPlugin.html#NMVPNPlugi
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_VPN_PLUGIN_STATE">
+<div class="refsect2">
 <a name="NM-VPN-PLUGIN-STATE:CAPS"></a><h3>NM_VPN_PLUGIN_STATE</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_STATE             "state"
 </pre>
@@ -83,7 +83,7 @@ enum                <a class="link" href="libnm-glib-NMVPNPlugin.html#NMVPNPlugi
 </p>
 </div>
 <hr>
-<div class="refsect2" title="enum NMVPNPluginError">
+<div class="refsect2">
 <a name="NMVPNPluginError"></a><h3>enum NMVPNPluginError</h3>
 <pre class="programlisting">typedef enum {
 	NM_VPN_PLUGIN_ERROR_GENERAL,
@@ -101,7 +101,7 @@ enum                <a class="link" href="libnm-glib-NMVPNPlugin.html#NMVPNPlugi
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_VPN_PLUGIN_ERROR">
+<div class="refsect2">
 <a name="NM-VPN-PLUGIN-ERROR:CAPS"></a><h3>NM_VPN_PLUGIN_ERROR</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_ERROR      (nm_vpn_plugin_error_quark ())
 </pre>
@@ -109,7 +109,7 @@ enum                <a class="link" href="libnm-glib-NMVPNPlugin.html#NMVPNPlugi
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_TYPE_VPN_PLUGIN_ERROR">
+<div class="refsect2">
 <a name="NM-TYPE-VPN-PLUGIN-ERROR:CAPS"></a><h3>NM_TYPE_VPN_PLUGIN_ERROR</h3>
 <pre class="programlisting">#define NM_TYPE_VPN_PLUGIN_ERROR (nm_vpn_plugin_error_get_type ()) 
 </pre>
@@ -117,7 +117,7 @@ enum                <a class="link" href="libnm-glib-NMVPNPlugin.html#NMVPNPlugi
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMVPNPlugin">
+<div class="refsect2">
 <a name="NMVPNPlugin"></a><h3>NMVPNPlugin</h3>
 <pre class="programlisting">typedef struct {
 	GObject parent;
@@ -127,7 +127,7 @@ enum                <a class="link" href="libnm-glib-NMVPNPlugin.html#NMVPNPlugi
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMVPNPluginClass">
+<div class="refsect2">
 <a name="NMVPNPluginClass"></a><h3>NMVPNPluginClass</h3>
 <pre class="programlisting">typedef struct {
 	GObjectClass parent;
@@ -173,203 +173,77 @@ enum                <a class="link" href="libnm-glib-NMVPNPlugin.html#NMVPNPlugi
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_vpn_plugin_error_quark ()">
+<div class="refsect2">
 <a name="nm-vpn-plugin-error-quark"></a><h3>nm_vpn_plugin_error_quark ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              nm_vpn_plugin_error_quark           (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_vpn_plugin_error_get_type ()">
+<div class="refsect2">
 <a name="nm-vpn-plugin-error-get-type"></a><h3>nm_vpn_plugin_error_get_type ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               nm_vpn_plugin_error_get_type        (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_vpn_plugin_get_connection ()">
+<div class="refsect2">
 <a name="nm-vpn-plugin-get-connection"></a><h3>nm_vpn_plugin_get_connection ()</h3>
 <pre class="programlisting"><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGConnection.html#DBusGConnection"><span class="returnvalue">DBusGConnection</span></a> *   nm_vpn_plugin_get_connection        (<em class="parameter"><code><a class="link" href="libnm-glib-NMVPNPlugin.html#NMVPNPlugin" title="NMVPNPlugin"><span class="type">NMVPNPlugin</span></a> *plugin</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>plugin</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_vpn_plugin_get_state ()">
+<div class="refsect2">
 <a name="nm-vpn-plugin-get-state"></a><h3>nm_vpn_plugin_get_state ()</h3>
 <pre class="programlisting"><span class="returnvalue">NMVPNServiceState</span>   nm_vpn_plugin_get_state             (<em class="parameter"><code><a class="link" href="libnm-glib-NMVPNPlugin.html#NMVPNPlugin" title="NMVPNPlugin"><span class="type">NMVPNPlugin</span></a> *plugin</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>plugin</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_vpn_plugin_set_state ()">
+<div class="refsect2">
 <a name="nm-vpn-plugin-set-state"></a><h3>nm_vpn_plugin_set_state ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_vpn_plugin_set_state             (<em class="parameter"><code><a class="link" href="libnm-glib-NMVPNPlugin.html#NMVPNPlugin" title="NMVPNPlugin"><span class="type">NMVPNPlugin</span></a> *plugin</code></em>,
                                                          <em class="parameter"><code><span class="type">NMVPNServiceState</span> state</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>plugin</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>state</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_vpn_plugin_set_login_banner ()">
+<div class="refsect2">
 <a name="nm-vpn-plugin-set-login-banner"></a><h3>nm_vpn_plugin_set_login_banner ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_vpn_plugin_set_login_banner      (<em class="parameter"><code><a class="link" href="libnm-glib-NMVPNPlugin.html#NMVPNPlugin" title="NMVPNPlugin"><span class="type">NMVPNPlugin</span></a> *plugin</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *banner</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>plugin</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>banner</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_vpn_plugin_failure ()">
+<div class="refsect2">
 <a name="nm-vpn-plugin-failure"></a><h3>nm_vpn_plugin_failure ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_vpn_plugin_failure               (<em class="parameter"><code><a class="link" href="libnm-glib-NMVPNPlugin.html#NMVPNPlugin" title="NMVPNPlugin"><span class="type">NMVPNPlugin</span></a> *plugin</code></em>,
                                                          <em class="parameter"><code><span class="type">NMVPNPluginFailure</span> reason</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>plugin</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>reason</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_vpn_plugin_set_ip4_config ()">
+<div class="refsect2">
 <a name="nm-vpn-plugin-set-ip4-config"></a><h3>nm_vpn_plugin_set_ip4_config ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_vpn_plugin_set_ip4_config        (<em class="parameter"><code><a class="link" href="libnm-glib-NMVPNPlugin.html#NMVPNPlugin" title="NMVPNPlugin"><span class="type">NMVPNPlugin</span></a> *plugin</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *ip4_config</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>plugin</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>ip4_config</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_vpn_plugin_disconnect ()">
+<div class="refsect2">
 <a name="nm-vpn-plugin-disconnect"></a><h3>nm_vpn_plugin_disconnect ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_vpn_plugin_disconnect            (<em class="parameter"><code><a class="link" href="libnm-glib-NMVPNPlugin.html#NMVPNPlugin" title="NMVPNPlugin"><span class="type">NMVPNPlugin</span></a> *plugin</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **err</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>plugin</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>err</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 </div>
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.15</div>
+          Generated by GTK-Doc V1.17</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/libnm-glib-NMVpnPluginUi.html b/docs/libnm-glib/html/libnm-glib-NMVpnPluginUi.html
index 300170615..d517644e2 100644
--- a/docs/libnm-glib/html/libnm-glib-NMVpnPluginUi.html
+++ b/docs/libnm-glib/html/libnm-glib-NMVpnPluginUi.html
@@ -3,21 +3,22 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>NMVpnPluginUi</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="libnm-glib Reference Manual">
-<link rel="up" href="ch01.html" title="libnm-glib Objects">
+<link rel="up" href="ch02.html" title="libnm-glib API Reference">
 <link rel="prev" href="libnm-glib-NMVPNPlugin.html" title="NMVPNPlugin">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
+<link rel="next" href="object-tree.html" title="Object Hierarchy">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
 <tr valign="middle">
 <td><a accesskey="p" href="libnm-glib-NMVPNPlugin.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="ch01.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
+<td><a accesskey="u" href="ch02.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
 <th width="100%" align="center">libnm-glib Reference Manual</th>
-<td> </td>
+<td><a accesskey="n" href="object-tree.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
 </tr>
 <tr><td colspan="5" class="shortcuts">
 <a href="#libnm-glib-NMVpnPluginUi.synopsis" class="shortcut">Top</a>
@@ -25,7 +26,7 @@
                   <a href="#libnm-glib-NMVpnPluginUi.description" class="shortcut">Description</a>
 </td></tr>
 </table>
-<div class="refentry" title="NMVpnPluginUi">
+<div class="refentry">
 <a name="libnm-glib-NMVpnPluginUi"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
@@ -34,12 +35,10 @@
 </td>
 <td valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv" title="Synopsis">
+<div class="refsynopsisdiv">
 <a name="libnm-glib-NMVpnPluginUi.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">                    <a class="link" href="libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiInterface" title="NMVpnPluginUiInterface">NMVpnPluginUiInterface</a>;
-                    <a class="link" href="libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiWidgetInterface" title="NMVpnPluginUiWidgetInterface">NMVpnPluginUiWidgetInterface</a>;
-<a class="link" href="libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiInterface" title="NMVpnPluginUiInterface"><span class="returnvalue">NMVpnPluginUiInterface</span></a> * (<a class="link" href="libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiFactory" title="NMVpnPluginUiFactory ()">*NMVpnPluginUiFactory</a>)        (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
-<a class="link" href="libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiInterface" title="NMVpnPluginUiInterface"><span class="returnvalue">NMVpnPluginUiInterface</span></a> * <a class="link" href="libnm-glib-NMVpnPluginUi.html#nm-vpn-plugin-ui-factory" title="nm_vpn_plugin_ui_factory ()">nm_vpn_plugin_ui_factory</a>       (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
+<pre class="synopsis"><a class="link" href="libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiInterface" title="struct NMVpnPluginUiInterface"><span class="returnvalue">NMVpnPluginUiInterface</span></a> * (<a class="link" href="libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiFactory" title="NMVpnPluginUiFactory ()">*NMVpnPluginUiFactory</a>)        (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
+<a class="link" href="libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiInterface" title="struct NMVpnPluginUiInterface"><span class="returnvalue">NMVpnPluginUiInterface</span></a> * <a class="link" href="libnm-glib-NMVpnPluginUi.html#nm-vpn-plugin-ui-factory" title="nm_vpn_plugin_ui_factory ()">nm_vpn_plugin_ui_factory</a>       (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
 #define             <a class="link" href="libnm-glib-NMVpnPluginUi.html#NM-VPN-PLUGIN-UI-CAPABILITY-NONE:CAPS" title="NM_VPN_PLUGIN_UI_CAPABILITY_NONE">NM_VPN_PLUGIN_UI_CAPABILITY_NONE</a>
 #define             <a class="link" href="libnm-glib-NMVpnPluginUi.html#NM-VPN-PLUGIN-UI-CAPABILITY-IMPORT:CAPS" title="NM_VPN_PLUGIN_UI_CAPABILITY_IMPORT">NM_VPN_PLUGIN_UI_CAPABILITY_IMPORT</a>
 #define             <a class="link" href="libnm-glib-NMVpnPluginUi.html#NM-VPN-PLUGIN-UI-CAPABILITY-EXPORT:CAPS" title="NM_VPN_PLUGIN_UI_CAPABILITY_EXPORT">NM_VPN_PLUGIN_UI_CAPABILITY_EXPORT</a>
@@ -47,196 +46,68 @@
 #define             <a class="link" href="libnm-glib-NMVpnPluginUi.html#NM-VPN-PLUGIN-UI-INTERFACE-DESC:CAPS" title="NM_VPN_PLUGIN_UI_INTERFACE_DESC">NM_VPN_PLUGIN_UI_INTERFACE_DESC</a>
 #define             <a class="link" href="libnm-glib-NMVpnPluginUi.html#NM-VPN-PLUGIN-UI-INTERFACE-SERVICE:CAPS" title="NM_VPN_PLUGIN_UI_INTERFACE_SERVICE">NM_VPN_PLUGIN_UI_INTERFACE_SERVICE</a>
 enum                <a class="link" href="libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiInterfaceProp" title="enum NMVpnPluginUiInterfaceProp">NMVpnPluginUiInterfaceProp</a>;
-<a class="link" href="libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiWidgetInterface" title="NMVpnPluginUiWidgetInterface"><span class="returnvalue">NMVpnPluginUiWidgetInterface</span></a> * <a class="link" href="libnm-glib-NMVpnPluginUi.html#nm-vpn-plugin-ui-interface-ui-factory" title="nm_vpn_plugin_ui_interface_ui_factory ()">nm_vpn_plugin_ui_interface_ui_factory</a>
-                                                        (<em class="parameter"><code><a class="link" href="libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiInterface" title="NMVpnPluginUiInterface"><span class="type">NMVpnPluginUiInterface</span></a> *iface</code></em>,
-                                                         <em class="parameter"><code><a href="http://projects.gnome.org/NetworkManager/developers/libnm-util/08/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+struct              <a class="link" href="libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiInterface" title="struct NMVpnPluginUiInterface">NMVpnPluginUiInterface</a>;
+<a class="link" href="libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiWidgetInterface" title="struct NMVpnPluginUiWidgetInterface"><span class="returnvalue">NMVpnPluginUiWidgetInterface</span></a> * <a class="link" href="libnm-glib-NMVpnPluginUi.html#nm-vpn-plugin-ui-interface-ui-factory" title="nm_vpn_plugin_ui_interface_ui_factory ()">nm_vpn_plugin_ui_interface_ui_factory</a>
+                                                        (<em class="parameter"><code><a class="link" href="libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiInterface" title="struct NMVpnPluginUiInterface"><span class="type">NMVpnPluginUiInterface</span></a> *iface</code></em>,
+                                                         <em class="parameter"><code><span class="type">NMConnection</span> *connection</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             <a class="link" href="libnm-glib-NMVpnPluginUi.html#nm-vpn-plugin-ui-interface-get-capabilities" title="nm_vpn_plugin_ui_interface_get_capabilities ()">nm_vpn_plugin_ui_interface_get_capabilities</a>
-                                                        (<em class="parameter"><code><a class="link" href="libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiInterface" title="NMVpnPluginUiInterface"><span class="type">NMVpnPluginUiInterface</span></a> *iface</code></em>);
-<a href="http://projects.gnome.org/NetworkManager/developers/libnm-util/08/NMConnection.html"><span class="returnvalue">NMConnection</span></a> *      <a class="link" href="libnm-glib-NMVpnPluginUi.html#nm-vpn-plugin-ui-interface-import" title="nm_vpn_plugin_ui_interface_import ()">nm_vpn_plugin_ui_interface_import</a>   (<em class="parameter"><code><a class="link" href="libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiInterface" title="NMVpnPluginUiInterface"><span class="type">NMVpnPluginUiInterface</span></a> *iface</code></em>,
+                                                        (<em class="parameter"><code><a class="link" href="libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiInterface" title="struct NMVpnPluginUiInterface"><span class="type">NMVpnPluginUiInterface</span></a> *iface</code></em>);
+<span class="returnvalue">NMConnection</span> *      <a class="link" href="libnm-glib-NMVpnPluginUi.html#nm-vpn-plugin-ui-interface-import" title="nm_vpn_plugin_ui_interface_import ()">nm_vpn_plugin_ui_interface_import</a>   (<em class="parameter"><code><a class="link" href="libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiInterface" title="struct NMVpnPluginUiInterface"><span class="type">NMVpnPluginUiInterface</span></a> *iface</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *path</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="libnm-glib-NMVpnPluginUi.html#nm-vpn-plugin-ui-interface-export" title="nm_vpn_plugin_ui_interface_export ()">nm_vpn_plugin_ui_interface_export</a>   (<em class="parameter"><code><a class="link" href="libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiInterface" title="NMVpnPluginUiInterface"><span class="type">NMVpnPluginUiInterface</span></a> *iface</code></em>,
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="libnm-glib-NMVpnPluginUi.html#nm-vpn-plugin-ui-interface-export" title="nm_vpn_plugin_ui_interface_export ()">nm_vpn_plugin_ui_interface_export</a>   (<em class="parameter"><code><a class="link" href="libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiInterface" title="struct NMVpnPluginUiInterface"><span class="type">NMVpnPluginUiInterface</span></a> *iface</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *path</code></em>,
-                                                         <em class="parameter"><code><a href="http://projects.gnome.org/NetworkManager/developers/libnm-util/08/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+                                                         <em class="parameter"><code><span class="type">NMConnection</span> *connection</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
 <span class="returnvalue">char</span> *              <a class="link" href="libnm-glib-NMVpnPluginUi.html#nm-vpn-plugin-ui-interface-get-suggested-name" title="nm_vpn_plugin_ui_interface_get_suggested_name ()">nm_vpn_plugin_ui_interface_get_suggested_name</a>
-                                                        (<em class="parameter"><code><a class="link" href="libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiInterface" title="NMVpnPluginUiInterface"><span class="type">NMVpnPluginUiInterface</span></a> *iface</code></em>,
-                                                         <em class="parameter"><code><a href="http://projects.gnome.org/NetworkManager/developers/libnm-util/08/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);
+                                                        (<em class="parameter"><code><a class="link" href="libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiInterface" title="struct NMVpnPluginUiInterface"><span class="type">NMVpnPluginUiInterface</span></a> *iface</code></em>,
+                                                         <em class="parameter"><code><span class="type">NMConnection</span> *connection</code></em>);
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="libnm-glib-NMVpnPluginUi.html#nm-vpn-plugin-ui-interface-delete-connection" title="nm_vpn_plugin_ui_interface_delete_connection ()">nm_vpn_plugin_ui_interface_delete_connection</a>
-                                                        (<em class="parameter"><code><a class="link" href="libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiInterface" title="NMVpnPluginUiInterface"><span class="type">NMVpnPluginUiInterface</span></a> *iface</code></em>,
-                                                         <em class="parameter"><code><a href="http://projects.gnome.org/NetworkManager/developers/libnm-util/08/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+                                                        (<em class="parameter"><code><a class="link" href="libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiInterface" title="struct NMVpnPluginUiInterface"><span class="type">NMVpnPluginUiInterface</span></a> *iface</code></em>,
+                                                         <em class="parameter"><code><span class="type">NMConnection</span> *connection</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
 #define             <a class="link" href="libnm-glib-NMVpnPluginUi.html#NM-TYPE-VPN-PLUGIN-UI-WIDGET-INTERFACE:CAPS" title="NM_TYPE_VPN_PLUGIN_UI_WIDGET_INTERFACE">NM_TYPE_VPN_PLUGIN_UI_WIDGET_INTERFACE</a>
 #define             <a class="link" href="libnm-glib-NMVpnPluginUi.html#NM-VPN-PLUGIN-UI-WIDGET-INTERFACE:CAPS" title="NM_VPN_PLUGIN_UI_WIDGET_INTERFACE()">NM_VPN_PLUGIN_UI_WIDGET_INTERFACE</a>   (obj)
 #define             <a class="link" href="libnm-glib-NMVpnPluginUi.html#NM-IS-VPN-PLUGIN-UI-WIDGET-INTERFACE:CAPS" title="NM_IS_VPN_PLUGIN_UI_WIDGET_INTERFACE()">NM_IS_VPN_PLUGIN_UI_WIDGET_INTERFACE</a>(obj)
 #define             <a class="link" href="libnm-glib-NMVpnPluginUi.html#NM-VPN-PLUGIN-UI-WIDGET-INTERFACE-GET-INTERFACE:CAPS" title="NM_VPN_PLUGIN_UI_WIDGET_INTERFACE_GET_INTERFACE()">NM_VPN_PLUGIN_UI_WIDGET_INTERFACE_GET_INTERFACE</a>(obj)
+struct              <a class="link" href="libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiWidgetInterface" title="struct NMVpnPluginUiWidgetInterface">NMVpnPluginUiWidgetInterface</a>;
 <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               <a class="link" href="libnm-glib-NMVpnPluginUi.html#nm-vpn-plugin-ui-widget-interface-get-type" title="nm_vpn_plugin_ui_widget_interface_get_type ()">nm_vpn_plugin_ui_widget_interface_get_type</a>
                                                         (<em class="parameter"><code><span class="type">void</span></code></em>);
 <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="returnvalue">GObject</span></a> *           <a class="link" href="libnm-glib-NMVpnPluginUi.html#nm-vpn-plugin-ui-widget-interface-get-widget" title="nm_vpn_plugin_ui_widget_interface_get_widget ()">nm_vpn_plugin_ui_widget_interface_get_widget</a>
-                                                        (<em class="parameter"><code><a class="link" href="libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiWidgetInterface" title="NMVpnPluginUiWidgetInterface"><span class="type">NMVpnPluginUiWidgetInterface</span></a> *iface</code></em>);
+                                                        (<em class="parameter"><code><a class="link" href="libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiWidgetInterface" title="struct NMVpnPluginUiWidgetInterface"><span class="type">NMVpnPluginUiWidgetInterface</span></a> *iface</code></em>);
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="libnm-glib-NMVpnPluginUi.html#nm-vpn-plugin-ui-widget-interface-update-connection" title="nm_vpn_plugin_ui_widget_interface_update_connection ()">nm_vpn_plugin_ui_widget_interface_update_connection</a>
-                                                        (<em class="parameter"><code><a class="link" href="libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiWidgetInterface" title="NMVpnPluginUiWidgetInterface"><span class="type">NMVpnPluginUiWidgetInterface</span></a> *iface</code></em>,
-                                                         <em class="parameter"><code><a href="http://projects.gnome.org/NetworkManager/developers/libnm-util/08/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+                                                        (<em class="parameter"><code><a class="link" href="libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiWidgetInterface" title="struct NMVpnPluginUiWidgetInterface"><span class="type">NMVpnPluginUiWidgetInterface</span></a> *iface</code></em>,
+                                                         <em class="parameter"><code><span class="type">NMConnection</span> *connection</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="libnm-glib-NMVpnPluginUi.html#nm-vpn-plugin-ui-widget-interface-save-secrets" title="nm_vpn_plugin_ui_widget_interface_save_secrets ()">nm_vpn_plugin_ui_widget_interface_save_secrets</a>
-                                                        (<em class="parameter"><code><a class="link" href="libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiWidgetInterface" title="NMVpnPluginUiWidgetInterface"><span class="type">NMVpnPluginUiWidgetInterface</span></a> *iface</code></em>,
-                                                         <em class="parameter"><code><a href="http://projects.gnome.org/NetworkManager/developers/libnm-util/08/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+                                                        (<em class="parameter"><code><a class="link" href="libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiWidgetInterface" title="struct NMVpnPluginUiWidgetInterface"><span class="type">NMVpnPluginUiWidgetInterface</span></a> *iface</code></em>,
+                                                         <em class="parameter"><code><span class="type">NMConnection</span> *connection</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
 </pre>
 </div>
-<div class="refsect1" title="Description">
+<div class="refsect1">
 <a name="libnm-glib-NMVpnPluginUi.description"></a><h2>Description</h2>
 <p>
 </p>
 </div>
-<div class="refsect1" title="Details">
+<div class="refsect1">
 <a name="libnm-glib-NMVpnPluginUi.details"></a><h2>Details</h2>
-<div class="refsect2" title="NMVpnPluginUiInterface">
-<a name="NMVpnPluginUiInterface"></a><h3>NMVpnPluginUiInterface</h3>
-<pre class="programlisting">typedef struct {
-	GTypeInterface g_iface;
-
-	/* Plugin's factory function that returns a GObject that implements
-	 * NMVpnPluginUiWidgetInterface, pre-filled with values from 'connection'
-	 * if non-NULL.
-	 */
-	NMVpnPluginUiWidgetInterface * (*ui_factory) (NMVpnPluginUiInterface *iface,
-	                                              NMConnection *connection,
-	                                              GError **error);
-
-	/* Plugin's capabiltity function that returns a bitmask of capabilities
-	 * described by NM_VPN_PLUGIN_UI_CAPABILITY_* defines.
-	 */
-	guint32 (*get_capabilities) (NMVpnPluginUiInterface *iface);
-
-	/* Try to import a connection from the specified path.  On success, return a
-	 * partial NMConnection object.  On error, return NULL and set 'error' with
-	 * additional information.  Note that 'error' can be NULL, in which case no
-	 * additional error information should be provided.
-	 */
-	NMConnection * (*import_from_file) (NMVpnPluginUiInterface *iface,
-	                                    const char *path,
-	                                    GError **error);
-
-	/* Export the given connection to the specified path.  Return TRUE on success.
-	 * On error, return FALSE and set 'error' with additional error information.
-	 * Note that 'error' can be NULL, in which case no additional error information
-	 * should be provided.
-	 */
-	gboolean (*export_to_file) (NMVpnPluginUiInterface *iface,
-	                            const char *path,
-	                            NMConnection *connection,
-	                            GError **error);
-
-	/* For a given connection, return a suggested file name.  Returned value should
-	 * be NULL or a suggested file name allocated via g_malloc/g_new/etc to be freed
-	 * by the caller.
-	 */
-	char * (*get_suggested_name) (NMVpnPluginUiInterface *iface, NMConnection *connection);
-
-	/* Called when the user has chosen to remove the connection (for user
-	 * connections only; system connections are handled by the system
-	 * settings service).  Should clear out any VPN-specific secrets or data
-	 * related to the connection.
-	 */
-	gboolean (*delete_connection) (NMVpnPluginUiInterface *iface, NMConnection *connection, GError **error);
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-	void (*_reserved5) (void);
-	void (*_reserved6) (void);
-} NMVpnPluginUiInterface;
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="NMVpnPluginUiWidgetInterface">
-<a name="NMVpnPluginUiWidgetInterface"></a><h3>NMVpnPluginUiWidgetInterface</h3>
-<pre class="programlisting">typedef struct {
-	GTypeInterface g_iface;
-
-	/* Return the GtkWidget for the VPN's UI */
-	GObject * (*get_widget) (NMVpnPluginUiWidgetInterface *iface);
-
-	/* Called to save the user-entered options to the connection object.  Should
-	 * return FALSE and set 'error' if the current options are invalid.  'error'
-	 * should contain enough information for the plugin to determine which UI
-	 * widget is invalid at a later point in time.  For example, creating unique
-	 * error codes for what error occurred and populating the message field
-	 * of 'error' with the name of the invalid property.
-	 */
-	gboolean (*update_connection) (NMVpnPluginUiWidgetInterface *iface,
-	                               NMConnection *connection,
-	                               GError **error);
-
-	/* Called when the user has chosen to save the connection (for user
-	 * connections only; system connections are handled by the system
-	 * settings service).  Should save VPN-specific connection secrets in
-	 * a way that the auth-dialog can read them.
-	 */
-	gboolean (*save_secrets) (NMVpnPluginUiWidgetInterface *iface,
-	                          NMConnection *connection,
-	                          GError **error);
-
-	/* Emitted when the value of a UI widget changes.  May trigger a validity
-	 * check via update_connection() to write values to the connection */
-	void (*changed) (NMVpnPluginUiWidgetInterface *iface);
-} NMVpnPluginUiWidgetInterface;
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="NMVpnPluginUiFactory ()">
+<div class="refsect2">
 <a name="NMVpnPluginUiFactory"></a><h3>NMVpnPluginUiFactory ()</h3>
-<pre class="programlisting"><a class="link" href="libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiInterface" title="NMVpnPluginUiInterface"><span class="returnvalue">NMVpnPluginUiInterface</span></a> * (*NMVpnPluginUiFactory)        (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
+<pre class="programlisting"><a class="link" href="libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiInterface" title="struct NMVpnPluginUiInterface"><span class="returnvalue">NMVpnPluginUiInterface</span></a> * (*NMVpnPluginUiFactory)        (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_vpn_plugin_ui_factory ()">
+<div class="refsect2">
 <a name="nm-vpn-plugin-ui-factory"></a><h3>nm_vpn_plugin_ui_factory ()</h3>
-<pre class="programlisting"><a class="link" href="libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiInterface" title="NMVpnPluginUiInterface"><span class="returnvalue">NMVpnPluginUiInterface</span></a> * nm_vpn_plugin_ui_factory       (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
+<pre class="programlisting"><a class="link" href="libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiInterface" title="struct NMVpnPluginUiInterface"><span class="returnvalue">NMVpnPluginUiInterface</span></a> * nm_vpn_plugin_ui_factory       (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="NM_VPN_PLUGIN_UI_CAPABILITY_NONE">
+<div class="refsect2">
 <a name="NM-VPN-PLUGIN-UI-CAPABILITY-NONE:CAPS"></a><h3>NM_VPN_PLUGIN_UI_CAPABILITY_NONE</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_UI_CAPABILITY_NONE     0x00
 </pre>
@@ -244,7 +115,7 @@ enum                <a class="link" href="libnm-glib-NMVpnPluginUi.html#NMVpnPlu
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_VPN_PLUGIN_UI_CAPABILITY_IMPORT">
+<div class="refsect2">
 <a name="NM-VPN-PLUGIN-UI-CAPABILITY-IMPORT:CAPS"></a><h3>NM_VPN_PLUGIN_UI_CAPABILITY_IMPORT</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_UI_CAPABILITY_IMPORT   0x01
 </pre>
@@ -252,7 +123,7 @@ enum                <a class="link" href="libnm-glib-NMVpnPluginUi.html#NMVpnPlu
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_VPN_PLUGIN_UI_CAPABILITY_EXPORT">
+<div class="refsect2">
 <a name="NM-VPN-PLUGIN-UI-CAPABILITY-EXPORT:CAPS"></a><h3>NM_VPN_PLUGIN_UI_CAPABILITY_EXPORT</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_UI_CAPABILITY_EXPORT   0x02
 </pre>
@@ -260,7 +131,7 @@ enum                <a class="link" href="libnm-glib-NMVpnPluginUi.html#NMVpnPlu
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_VPN_PLUGIN_UI_INTERFACE_NAME">
+<div class="refsect2">
 <a name="NM-VPN-PLUGIN-UI-INTERFACE-NAME:CAPS"></a><h3>NM_VPN_PLUGIN_UI_INTERFACE_NAME</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_UI_INTERFACE_NAME "name"
 </pre>
@@ -268,7 +139,7 @@ enum                <a class="link" href="libnm-glib-NMVpnPluginUi.html#NMVpnPlu
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_VPN_PLUGIN_UI_INTERFACE_DESC">
+<div class="refsect2">
 <a name="NM-VPN-PLUGIN-UI-INTERFACE-DESC:CAPS"></a><h3>NM_VPN_PLUGIN_UI_INTERFACE_DESC</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_UI_INTERFACE_DESC "desc"
 </pre>
@@ -276,7 +147,7 @@ enum                <a class="link" href="libnm-glib-NMVpnPluginUi.html#NMVpnPlu
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_VPN_PLUGIN_UI_INTERFACE_SERVICE">
+<div class="refsect2">
 <a name="NM-VPN-PLUGIN-UI-INTERFACE-SERVICE:CAPS"></a><h3>NM_VPN_PLUGIN_UI_INTERFACE_SERVICE</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_UI_INTERFACE_SERVICE "service"
 </pre>
@@ -284,7 +155,7 @@ enum                <a class="link" href="libnm-glib-NMVpnPluginUi.html#NMVpnPlu
 </p>
 </div>
 <hr>
-<div class="refsect2" title="enum NMVpnPluginUiInterfaceProp">
+<div class="refsect2">
 <a name="NMVpnPluginUiInterfaceProp"></a><h3>enum NMVpnPluginUiInterfaceProp</h3>
 <pre class="programlisting">typedef enum {
 	NM_VPN_PLUGIN_UI_INTERFACE_PROP_FIRST = 0x1000,
@@ -298,203 +169,126 @@ enum                <a class="link" href="libnm-glib-NMVpnPluginUi.html#NMVpnPlu
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_vpn_plugin_ui_interface_ui_factory ()">
+<div class="refsect2">
+<a name="NMVpnPluginUiInterface"></a><h3>struct NMVpnPluginUiInterface</h3>
+<pre class="programlisting">struct NMVpnPluginUiInterface {
+	GTypeInterface g_iface;
+
+	/* Plugin's factory function that returns a GObject that implements
+	 * NMVpnPluginUiWidgetInterface, pre-filled with values from 'connection'
+	 * if non-NULL.
+	 */
+	NMVpnPluginUiWidgetInterface * (*ui_factory) (NMVpnPluginUiInterface *iface,
+	                                              NMConnection *connection,
+	                                              GError **error);
+
+	/* Plugin's capabiltity function that returns a bitmask of capabilities
+	 * described by NM_VPN_PLUGIN_UI_CAPABILITY_* defines.
+	 */
+	guint32 (*get_capabilities) (NMVpnPluginUiInterface *iface);
+
+	/* Try to import a connection from the specified path.  On success, return a
+	 * partial NMConnection object.  On error, return NULL and set 'error' with
+	 * additional information.  Note that 'error' can be NULL, in which case no
+	 * additional error information should be provided.
+	 */
+	NMConnection * (*import_from_file) (NMVpnPluginUiInterface *iface,
+	                                    const char *path,
+	                                    GError **error);
+
+	/* Export the given connection to the specified path.  Return TRUE on success.
+	 * On error, return FALSE and set 'error' with additional error information.
+	 * Note that 'error' can be NULL, in which case no additional error information
+	 * should be provided.
+	 */
+	gboolean (*export_to_file) (NMVpnPluginUiInterface *iface,
+	                            const char *path,
+	                            NMConnection *connection,
+	                            GError **error);
+
+	/* For a given connection, return a suggested file name.  Returned value should
+	 * be NULL or a suggested file name allocated via g_malloc/g_new/etc to be freed
+	 * by the caller.
+	 */
+	char * (*get_suggested_name) (NMVpnPluginUiInterface *iface, NMConnection *connection);
+
+	/* Called when the user has chosen to remove the connection (for user
+	 * connections only; system connections are handled by the system
+	 * settings service).  Should clear out any VPN-specific secrets or data
+	 * related to the connection.
+	 */
+	gboolean (*delete_connection) (NMVpnPluginUiInterface *iface, NMConnection *connection, GError **error);
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+	void (*_reserved5) (void);
+	void (*_reserved6) (void);
+};
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="nm-vpn-plugin-ui-interface-ui-factory"></a><h3>nm_vpn_plugin_ui_interface_ui_factory ()</h3>
-<pre class="programlisting"><a class="link" href="libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiWidgetInterface" title="NMVpnPluginUiWidgetInterface"><span class="returnvalue">NMVpnPluginUiWidgetInterface</span></a> * nm_vpn_plugin_ui_interface_ui_factory
-                                                        (<em class="parameter"><code><a class="link" href="libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiInterface" title="NMVpnPluginUiInterface"><span class="type">NMVpnPluginUiInterface</span></a> *iface</code></em>,
-                                                         <em class="parameter"><code><a href="http://projects.gnome.org/NetworkManager/developers/libnm-util/08/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+<pre class="programlisting"><a class="link" href="libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiWidgetInterface" title="struct NMVpnPluginUiWidgetInterface"><span class="returnvalue">NMVpnPluginUiWidgetInterface</span></a> * nm_vpn_plugin_ui_interface_ui_factory
+                                                        (<em class="parameter"><code><a class="link" href="libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiInterface" title="struct NMVpnPluginUiInterface"><span class="type">NMVpnPluginUiInterface</span></a> *iface</code></em>,
+                                                         <em class="parameter"><code><span class="type">NMConnection</span> *connection</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>iface</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_vpn_plugin_ui_interface_get_capabilities ()">
+<div class="refsect2">
 <a name="nm-vpn-plugin-ui-interface-get-capabilities"></a><h3>nm_vpn_plugin_ui_interface_get_capabilities ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_vpn_plugin_ui_interface_get_capabilities
-                                                        (<em class="parameter"><code><a class="link" href="libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiInterface" title="NMVpnPluginUiInterface"><span class="type">NMVpnPluginUiInterface</span></a> *iface</code></em>);</pre>
+                                                        (<em class="parameter"><code><a class="link" href="libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiInterface" title="struct NMVpnPluginUiInterface"><span class="type">NMVpnPluginUiInterface</span></a> *iface</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>iface</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_vpn_plugin_ui_interface_import ()">
+<div class="refsect2">
 <a name="nm-vpn-plugin-ui-interface-import"></a><h3>nm_vpn_plugin_ui_interface_import ()</h3>
-<pre class="programlisting"><a href="http://projects.gnome.org/NetworkManager/developers/libnm-util/08/NMConnection.html"><span class="returnvalue">NMConnection</span></a> *      nm_vpn_plugin_ui_interface_import   (<em class="parameter"><code><a class="link" href="libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiInterface" title="NMVpnPluginUiInterface"><span class="type">NMVpnPluginUiInterface</span></a> *iface</code></em>,
+<pre class="programlisting"><span class="returnvalue">NMConnection</span> *      nm_vpn_plugin_ui_interface_import   (<em class="parameter"><code><a class="link" href="libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiInterface" title="struct NMVpnPluginUiInterface"><span class="type">NMVpnPluginUiInterface</span></a> *iface</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *path</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>iface</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>path</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_vpn_plugin_ui_interface_export ()">
+<div class="refsect2">
 <a name="nm-vpn-plugin-ui-interface-export"></a><h3>nm_vpn_plugin_ui_interface_export ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_vpn_plugin_ui_interface_export   (<em class="parameter"><code><a class="link" href="libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiInterface" title="NMVpnPluginUiInterface"><span class="type">NMVpnPluginUiInterface</span></a> *iface</code></em>,
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_vpn_plugin_ui_interface_export   (<em class="parameter"><code><a class="link" href="libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiInterface" title="struct NMVpnPluginUiInterface"><span class="type">NMVpnPluginUiInterface</span></a> *iface</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *path</code></em>,
-                                                         <em class="parameter"><code><a href="http://projects.gnome.org/NetworkManager/developers/libnm-util/08/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+                                                         <em class="parameter"><code><span class="type">NMConnection</span> *connection</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>iface</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>path</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_vpn_plugin_ui_interface_get_suggested_name ()">
+<div class="refsect2">
 <a name="nm-vpn-plugin-ui-interface-get-suggested-name"></a><h3>nm_vpn_plugin_ui_interface_get_suggested_name ()</h3>
 <pre class="programlisting"><span class="returnvalue">char</span> *              nm_vpn_plugin_ui_interface_get_suggested_name
-                                                        (<em class="parameter"><code><a class="link" href="libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiInterface" title="NMVpnPluginUiInterface"><span class="type">NMVpnPluginUiInterface</span></a> *iface</code></em>,
-                                                         <em class="parameter"><code><a href="http://projects.gnome.org/NetworkManager/developers/libnm-util/08/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+                                                        (<em class="parameter"><code><a class="link" href="libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiInterface" title="struct NMVpnPluginUiInterface"><span class="type">NMVpnPluginUiInterface</span></a> *iface</code></em>,
+                                                         <em class="parameter"><code><span class="type">NMConnection</span> *connection</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>iface</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_vpn_plugin_ui_interface_delete_connection ()">
+<div class="refsect2">
 <a name="nm-vpn-plugin-ui-interface-delete-connection"></a><h3>nm_vpn_plugin_ui_interface_delete_connection ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_vpn_plugin_ui_interface_delete_connection
-                                                        (<em class="parameter"><code><a class="link" href="libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiInterface" title="NMVpnPluginUiInterface"><span class="type">NMVpnPluginUiInterface</span></a> *iface</code></em>,
-                                                         <em class="parameter"><code><a href="http://projects.gnome.org/NetworkManager/developers/libnm-util/08/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+                                                        (<em class="parameter"><code><a class="link" href="libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiInterface" title="struct NMVpnPluginUiInterface"><span class="type">NMVpnPluginUiInterface</span></a> *iface</code></em>,
+                                                         <em class="parameter"><code><span class="type">NMConnection</span> *connection</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>iface</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="NM_TYPE_VPN_PLUGIN_UI_WIDGET_INTERFACE">
+<div class="refsect2">
 <a name="NM-TYPE-VPN-PLUGIN-UI-WIDGET-INTERFACE:CAPS"></a><h3>NM_TYPE_VPN_PLUGIN_UI_WIDGET_INTERFACE</h3>
 <pre class="programlisting">#define NM_TYPE_VPN_PLUGIN_UI_WIDGET_INTERFACE      (nm_vpn_plugin_ui_widget_interface_get_type ())
 </pre>
@@ -502,166 +296,106 @@ enum                <a class="link" href="libnm-glib-NMVpnPluginUi.html#NMVpnPlu
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_VPN_PLUGIN_UI_WIDGET_INTERFACE()">
+<div class="refsect2">
 <a name="NM-VPN-PLUGIN-UI-WIDGET-INTERFACE:CAPS"></a><h3>NM_VPN_PLUGIN_UI_WIDGET_INTERFACE()</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_UI_WIDGET_INTERFACE(obj)      (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_VPN_PLUGIN_UI_WIDGET_INTERFACE, NMVpnPluginUiWidgetInterface))
 </pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>obj</code></em> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="NM_IS_VPN_PLUGIN_UI_WIDGET_INTERFACE()">
+<div class="refsect2">
 <a name="NM-IS-VPN-PLUGIN-UI-WIDGET-INTERFACE:CAPS"></a><h3>NM_IS_VPN_PLUGIN_UI_WIDGET_INTERFACE()</h3>
 <pre class="programlisting">#define NM_IS_VPN_PLUGIN_UI_WIDGET_INTERFACE(obj)   (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_VPN_PLUGIN_UI_WIDGET_INTERFACE))
 </pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>obj</code></em> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="NM_VPN_PLUGIN_UI_WIDGET_INTERFACE_GET_INTERFACE()">
+<div class="refsect2">
 <a name="NM-VPN-PLUGIN-UI-WIDGET-INTERFACE-GET-INTERFACE:CAPS"></a><h3>NM_VPN_PLUGIN_UI_WIDGET_INTERFACE_GET_INTERFACE()</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_UI_WIDGET_INTERFACE_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), NM_TYPE_VPN_PLUGIN_UI_WIDGET_INTERFACE, NMVpnPluginUiWidgetInterface))
 </pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>obj</code></em> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_vpn_plugin_ui_widget_interface_get_type ()">
+<div class="refsect2">
+<a name="NMVpnPluginUiWidgetInterface"></a><h3>struct NMVpnPluginUiWidgetInterface</h3>
+<pre class="programlisting">struct NMVpnPluginUiWidgetInterface {
+	GTypeInterface g_iface;
+
+	/* Return the GtkWidget for the VPN's UI */
+	GObject * (*get_widget) (NMVpnPluginUiWidgetInterface *iface);
+
+	/* Called to save the user-entered options to the connection object.  Should
+	 * return FALSE and set 'error' if the current options are invalid.  'error'
+	 * should contain enough information for the plugin to determine which UI
+	 * widget is invalid at a later point in time.  For example, creating unique
+	 * error codes for what error occurred and populating the message field
+	 * of 'error' with the name of the invalid property.
+	 */
+	gboolean (*update_connection) (NMVpnPluginUiWidgetInterface *iface,
+	                               NMConnection *connection,
+	                               GError **error);
+
+	/* Called when the user has chosen to save the connection (for user
+	 * connections only; system connections are handled by the system
+	 * settings service).  Should save VPN-specific connection secrets in
+	 * a way that the auth-dialog can read them.
+	 */
+	gboolean (*save_secrets) (NMVpnPluginUiWidgetInterface *iface,
+	                          NMConnection *connection,
+	                          GError **error);
+
+	/* Emitted when the value of a UI widget changes.  May trigger a validity
+	 * check via update_connection() to write values to the connection */
+	void (*changed) (NMVpnPluginUiWidgetInterface *iface);
+};
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="nm-vpn-plugin-ui-widget-interface-get-type"></a><h3>nm_vpn_plugin_ui_widget_interface_get_type ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               nm_vpn_plugin_ui_widget_interface_get_type
                                                         (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_vpn_plugin_ui_widget_interface_get_widget ()">
+<div class="refsect2">
 <a name="nm-vpn-plugin-ui-widget-interface-get-widget"></a><h3>nm_vpn_plugin_ui_widget_interface_get_widget ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="returnvalue">GObject</span></a> *           nm_vpn_plugin_ui_widget_interface_get_widget
-                                                        (<em class="parameter"><code><a class="link" href="libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiWidgetInterface" title="NMVpnPluginUiWidgetInterface"><span class="type">NMVpnPluginUiWidgetInterface</span></a> *iface</code></em>);</pre>
+                                                        (<em class="parameter"><code><a class="link" href="libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiWidgetInterface" title="struct NMVpnPluginUiWidgetInterface"><span class="type">NMVpnPluginUiWidgetInterface</span></a> *iface</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>iface</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_vpn_plugin_ui_widget_interface_update_connection ()">
+<div class="refsect2">
 <a name="nm-vpn-plugin-ui-widget-interface-update-connection"></a><h3>nm_vpn_plugin_ui_widget_interface_update_connection ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_vpn_plugin_ui_widget_interface_update_connection
-                                                        (<em class="parameter"><code><a class="link" href="libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiWidgetInterface" title="NMVpnPluginUiWidgetInterface"><span class="type">NMVpnPluginUiWidgetInterface</span></a> *iface</code></em>,
-                                                         <em class="parameter"><code><a href="http://projects.gnome.org/NetworkManager/developers/libnm-util/08/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+                                                        (<em class="parameter"><code><a class="link" href="libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiWidgetInterface" title="struct NMVpnPluginUiWidgetInterface"><span class="type">NMVpnPluginUiWidgetInterface</span></a> *iface</code></em>,
+                                                         <em class="parameter"><code><span class="type">NMConnection</span> *connection</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>iface</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_vpn_plugin_ui_widget_interface_save_secrets ()">
+<div class="refsect2">
 <a name="nm-vpn-plugin-ui-widget-interface-save-secrets"></a><h3>nm_vpn_plugin_ui_widget_interface_save_secrets ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_vpn_plugin_ui_widget_interface_save_secrets
-                                                        (<em class="parameter"><code><a class="link" href="libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiWidgetInterface" title="NMVpnPluginUiWidgetInterface"><span class="type">NMVpnPluginUiWidgetInterface</span></a> *iface</code></em>,
-                                                         <em class="parameter"><code><a href="http://projects.gnome.org/NetworkManager/developers/libnm-util/08/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+                                                        (<em class="parameter"><code><a class="link" href="libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiWidgetInterface" title="struct NMVpnPluginUiWidgetInterface"><span class="type">NMVpnPluginUiWidgetInterface</span></a> *iface</code></em>,
+                                                         <em class="parameter"><code><span class="type">NMConnection</span> *connection</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>iface</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 </div>
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.15</div>
+          Generated by GTK-Doc V1.17</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/libnm-glib-nm-types.html b/docs/libnm-glib/html/libnm-glib-nm-types.html
index ec303a29f..2f00ec53f 100644
--- a/docs/libnm-glib/html/libnm-glib-nm-types.html
+++ b/docs/libnm-glib/html/libnm-glib-nm-types.html
@@ -3,22 +3,22 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>nm-types</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="libnm-glib Reference Manual">
-<link rel="up" href="ch01.html" title="libnm-glib Objects">
-<link rel="prev" href="libnm-glib-NMSettingsSystem.html" title="NMSettingsSystem">
-<link rel="next" href="NMVPNConnection.html" title="NMVPNConnection">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
+<link rel="up" href="ch02.html" title="libnm-glib API Reference">
+<link rel="prev" href="NMRemoteSettings.html" title="NMRemoteSettings">
+<link rel="next" href="NMSecretAgent.html" title="NMSecretAgent">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
 <tr valign="middle">
-<td><a accesskey="p" href="libnm-glib-NMSettingsSystem.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="ch01.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="NMRemoteSettings.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
+<td><a accesskey="u" href="ch02.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
 <th width="100%" align="center">libnm-glib Reference Manual</th>
-<td><a accesskey="n" href="NMVPNConnection.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+<td><a accesskey="n" href="NMSecretAgent.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
 </tr>
 <tr><td colspan="5" class="shortcuts">
 <a href="#libnm-glib-nm-types.synopsis" class="shortcut">Top</a>
@@ -26,7 +26,7 @@
                   <a href="#libnm-glib-nm-types.description" class="shortcut">Description</a>
 </td></tr>
 </table>
-<div class="refentry" title="nm-types">
+<div class="refentry">
 <a name="libnm-glib-nm-types"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
@@ -35,7 +35,7 @@
 </td>
 <td valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv" title="Synopsis">
+<div class="refsynopsisdiv">
 <a name="libnm-glib-nm-types.synopsis"></a><h2>Synopsis</h2>
 <pre class="synopsis">#define             <a class="link" href="libnm-glib-nm-types.html#NM-TYPE-SSID:CAPS" title="NM_TYPE_SSID">NM_TYPE_SSID</a>
 <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               <a class="link" href="libnm-glib-nm-types.html#nm-ssid-get-type" title="nm_ssid_get_type ()">nm_ssid_get_type</a>                    (<em class="parameter"><code><span class="type">void</span></code></em>);
@@ -54,14 +54,14 @@
 <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               <a class="link" href="libnm-glib-nm-types.html#nm-ip6-route-object-array-get-type" title="nm_ip6_route_object_array_get_type ()">nm_ip6_route_object_array_get_type</a>  (<em class="parameter"><code><span class="type">void</span></code></em>);
 </pre>
 </div>
-<div class="refsect1" title="Description">
+<div class="refsect1">
 <a name="libnm-glib-nm-types.description"></a><h2>Description</h2>
 <p>
 </p>
 </div>
-<div class="refsect1" title="Details">
+<div class="refsect1">
 <a name="libnm-glib-nm-types.details"></a><h2>Details</h2>
-<div class="refsect2" title="NM_TYPE_SSID">
+<div class="refsect2">
 <a name="NM-TYPE-SSID:CAPS"></a><h3>NM_TYPE_SSID</h3>
 <pre class="programlisting">#define NM_TYPE_SSID  (nm_ssid_get_type ())
 </pre>
@@ -69,22 +69,14 @@
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_ssid_get_type ()">
+<div class="refsect2">
 <a name="nm-ssid-get-type"></a><h3>nm_ssid_get_type ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               nm_ssid_get_type                    (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="NM_TYPE_UINT_ARRAY">
+<div class="refsect2">
 <a name="NM-TYPE-UINT-ARRAY:CAPS"></a><h3>NM_TYPE_UINT_ARRAY</h3>
 <pre class="programlisting">#define NM_TYPE_UINT_ARRAY  (nm_uint_array_get_type ())
 </pre>
@@ -92,22 +84,14 @@
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_uint_array_get_type ()">
+<div class="refsect2">
 <a name="nm-uint-array-get-type"></a><h3>nm_uint_array_get_type ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               nm_uint_array_get_type              (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="NM_TYPE_STRING_ARRAY">
+<div class="refsect2">
 <a name="NM-TYPE-STRING-ARRAY:CAPS"></a><h3>NM_TYPE_STRING_ARRAY</h3>
 <pre class="programlisting">#define NM_TYPE_STRING_ARRAY  (nm_string_array_get_type ())
 </pre>
@@ -115,22 +99,14 @@
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_string_array_get_type ()">
+<div class="refsect2">
 <a name="nm-string-array-get-type"></a><h3>nm_string_array_get_type ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               nm_string_array_get_type            (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="NM_TYPE_OBJECT_ARRAY">
+<div class="refsect2">
 <a name="NM-TYPE-OBJECT-ARRAY:CAPS"></a><h3>NM_TYPE_OBJECT_ARRAY</h3>
 <pre class="programlisting">#define NM_TYPE_OBJECT_ARRAY  (nm_object_array_get_type ())
 </pre>
@@ -138,22 +114,14 @@
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_object_array_get_type ()">
+<div class="refsect2">
 <a name="nm-object-array-get-type"></a><h3>nm_object_array_get_type ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               nm_object_array_get_type            (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="NM_TYPE_IP6_ADDRESS_OBJECT_ARRAY">
+<div class="refsect2">
 <a name="NM-TYPE-IP6-ADDRESS-OBJECT-ARRAY:CAPS"></a><h3>NM_TYPE_IP6_ADDRESS_OBJECT_ARRAY</h3>
 <pre class="programlisting">#define NM_TYPE_IP6_ADDRESS_OBJECT_ARRAY  (nm_ip6_address_object_array_get_type ())
 </pre>
@@ -161,23 +129,15 @@
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip6_address_object_array_get_type ()">
+<div class="refsect2">
 <a name="nm-ip6-address-object-array-get-type"></a><h3>nm_ip6_address_object_array_get_type ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               nm_ip6_address_object_array_get_type
                                                         (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="NM_TYPE_IP6_ADDRESS_ARRAY">
+<div class="refsect2">
 <a name="NM-TYPE-IP6-ADDRESS-ARRAY:CAPS"></a><h3>NM_TYPE_IP6_ADDRESS_ARRAY</h3>
 <pre class="programlisting">#define NM_TYPE_IP6_ADDRESS_ARRAY  (nm_ip6_address_array_get_type ())
 </pre>
@@ -185,22 +145,14 @@
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip6_address_array_get_type ()">
+<div class="refsect2">
 <a name="nm-ip6-address-array-get-type"></a><h3>nm_ip6_address_array_get_type ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               nm_ip6_address_array_get_type       (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="NM_TYPE_IP6_ROUTE_OBJECT_ARRAY">
+<div class="refsect2">
 <a name="NM-TYPE-IP6-ROUTE-OBJECT-ARRAY:CAPS"></a><h3>NM_TYPE_IP6_ROUTE_OBJECT_ARRAY</h3>
 <pre class="programlisting">#define NM_TYPE_IP6_ROUTE_OBJECT_ARRAY  (nm_ip6_route_object_array_get_type ())
 </pre>
@@ -208,24 +160,16 @@
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip6_route_object_array_get_type ()">
+<div class="refsect2">
 <a name="nm-ip6-route-object-array-get-type"></a><h3>nm_ip6_route_object_array_get_type ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               nm_ip6_route_object_array_get_type  (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 </div>
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.15</div>
+          Generated by GTK-Doc V1.17</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/libnm-glib.devhelp b/docs/libnm-glib/html/libnm-glib.devhelp
index 28707b004..e6ba9cc86 100644
--- a/docs/libnm-glib/html/libnm-glib.devhelp
+++ b/docs/libnm-glib/html/libnm-glib.devhelp
@@ -1,38 +1,38 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <!DOCTYPE book PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "">
-<book xmlns="http://www.devhelp.net/book" title="libnm-glib Reference Manual" link="index.html" author="" name="libnm-glib">
+<book xmlns="http://www.devhelp.net/book" title="libnm-glib Reference Manual" link="index.html" author="Dan Williams" name="libnm-glib">
   <chapters>
-    <sub name="libnm-glib Objects" link="ch01.html">
+    <sub name="Object Overview" link="ref-overview.html"/>
+    <sub name="libnm-glib API Reference" link="ch02.html">
       <sub name="NMClient" link="NMClient.html"/>
       <sub name="NMActiveConnection" link="NMActiveConnection.html"/>
       <sub name="NMDevice" link="NMDevice.html"/>
       <sub name="NMDeviceEthernet" link="NMDeviceEthernet.html"/>
       <sub name="NMDeviceWifi" link="NMDeviceWifi.html"/>
-      <sub name="NMSerialDevice" link="NMSerialDevice.html"/>
-      <sub name="NMGsmDevice" link="NMGsmDevice.html"/>
-      <sub name="NMCdmaDevice" link="NMCdmaDevice.html"/>
+      <sub name="NMDeviceModem" link="NMDeviceModem.html"/>
       <sub name="NMDeviceBt" link="NMDeviceBt.html"/>
+      <sub name="NMDeviceWimax" link="NMDeviceWimax.html"/>
+      <sub name="NMWimaxNsp" link="NMWimaxNsp.html"/>
       <sub name="NMAccessPoint" link="NMAccessPoint.html"/>
       <sub name="NMIP4Config" link="NMIP4Config.html"/>
       <sub name="NMIP6Config" link="NMIP6Config.html"/>
       <sub name="NMDHCP4Config" link="NMDHCP4Config.html"/>
       <sub name="NMDHCP6Config" link="NMDHCP6Config.html"/>
-      <sub name="NMExportedConnection" link="NMExportedConnection.html"/>
       <sub name="NMObject" link="NMObject.html"/>
       <sub name="NMRemoteConnection" link="NMRemoteConnection.html"/>
       <sub name="NMRemoteSettings" link="NMRemoteSettings.html"/>
-      <sub name="NMRemoteSettingsSystem" link="libnm-glib-NMRemoteSettingsSystem.html"/>
-      <sub name="NMSettingsConnection" link="libnm-glib-NMSettingsConnection.html"/>
-      <sub name="NMSettings" link="libnm-glib-NMSettings.html"/>
-      <sub name="NMSettingsService" link="libnm-glib-NMSettingsService.html"/>
-      <sub name="NMSettingsSystem" link="libnm-glib-NMSettingsSystem.html"/>
       <sub name="nm-types" link="libnm-glib-nm-types.html"/>
+      <sub name="NMSecretAgent" link="NMSecretAgent.html"/>
       <sub name="NMVPNConnection" link="NMVPNConnection.html"/>
       <sub name="NMVPNPlugin" link="libnm-glib-NMVPNPlugin.html"/>
       <sub name="NMVpnPluginUi" link="libnm-glib-NMVpnPluginUi.html"/>
     </sub>
+    <sub name="Object Hierarchy" link="object-tree.html"/>
+    <sub name="API Index" link="api-index-full.html"/>
+    <sub name="Annotation Glossary" link="annotation-glossary.html"/>
   </chapters>
   <functions>
+    <function name="NM_CLIENT_VERSION" link="NMClient.html#NM-CLIENT-VERSION:CAPS"/>
     <function name="NM_CLIENT_STATE" link="NMClient.html#NM-CLIENT-STATE:CAPS"/>
     <function name="NM_CLIENT_MANAGER_RUNNING" link="NMClient.html#NM-CLIENT-MANAGER-RUNNING:CAPS"/>
     <function name="NM_CLIENT_NETWORKING_ENABLED" link="NMClient.html#NM-CLIENT-NETWORKING-ENABLED:CAPS"/>
@@ -40,6 +40,8 @@
     <function name="NM_CLIENT_WIRELESS_HARDWARE_ENABLED" link="NMClient.html#NM-CLIENT-WIRELESS-HARDWARE-ENABLED:CAPS"/>
     <function name="NM_CLIENT_WWAN_ENABLED" link="NMClient.html#NM-CLIENT-WWAN-ENABLED:CAPS"/>
     <function name="NM_CLIENT_WWAN_HARDWARE_ENABLED" link="NMClient.html#NM-CLIENT-WWAN-HARDWARE-ENABLED:CAPS"/>
+    <function name="NM_CLIENT_WIMAX_ENABLED" link="NMClient.html#NM-CLIENT-WIMAX-ENABLED:CAPS"/>
+    <function name="NM_CLIENT_WIMAX_HARDWARE_ENABLED" link="NMClient.html#NM-CLIENT-WIMAX-HARDWARE-ENABLED:CAPS"/>
     <function name="NM_CLIENT_ACTIVE_CONNECTIONS" link="NMClient.html#NM-CLIENT-ACTIVE-CONNECTIONS:CAPS"/>
     <function name="enum NMClientPermission" link="NMClient.html#NMClientPermission"/>
     <function name="enum NMClientPermissionResult" link="NMClient.html#NMClientPermissionResult"/>
@@ -48,8 +50,10 @@
     <function name="nm_client_new ()" link="NMClient.html#nm-client-new"/>
     <function name="nm_client_get_devices ()" link="NMClient.html#nm-client-get-devices"/>
     <function name="nm_client_get_device_by_path ()" link="NMClient.html#nm-client-get-device-by-path"/>
-    <function name="NMClientActivateDeviceFn ()" link="NMClient.html#NMClientActivateDeviceFn"/>
+    <function name="NMClientActivateFn ()" link="NMClient.html#NMClientActivateFn"/>
     <function name="nm_client_activate_connection ()" link="NMClient.html#nm-client-activate-connection"/>
+    <function name="NMClientAddActivateFn ()" link="NMClient.html#NMClientAddActivateFn"/>
+    <function name="nm_client_add_and_activate_connection ()" link="NMClient.html#nm-client-add-and-activate-connection"/>
     <function name="nm_client_deactivate_connection ()" link="NMClient.html#nm-client-deactivate-connection"/>
     <function name="nm_client_networking_get_enabled ()" link="NMClient.html#nm-client-networking-get-enabled"/>
     <function name="nm_client_networking_set_enabled ()" link="NMClient.html#nm-client-networking-set-enabled"/>
@@ -59,6 +63,10 @@
     <function name="nm_client_wwan_get_enabled ()" link="NMClient.html#nm-client-wwan-get-enabled"/>
     <function name="nm_client_wwan_set_enabled ()" link="NMClient.html#nm-client-wwan-set-enabled"/>
     <function name="nm_client_wwan_hardware_get_enabled ()" link="NMClient.html#nm-client-wwan-hardware-get-enabled"/>
+    <function name="nm_client_wimax_get_enabled ()" link="NMClient.html#nm-client-wimax-get-enabled"/>
+    <function name="nm_client_wimax_set_enabled ()" link="NMClient.html#nm-client-wimax-set-enabled"/>
+    <function name="nm_client_wimax_hardware_get_enabled ()" link="NMClient.html#nm-client-wimax-hardware-get-enabled"/>
+    <function name="nm_client_get_version ()" link="NMClient.html#nm-client-get-version"/>
     <function name="nm_client_get_state ()" link="NMClient.html#nm-client-get-state"/>
     <function name="nm_client_get_manager_running ()" link="NMClient.html#nm-client-get-manager-running"/>
     <function name="nm_client_get_active_connections ()" link="NMClient.html#nm-client-get-active-connections"/>
@@ -68,6 +76,9 @@
     <function name="The &quot;manager-running&quot; property" link="NMClient.html#NMClient--manager-running"/>
     <function name="The &quot;networking-enabled&quot; property" link="NMClient.html#NMClient--networking-enabled"/>
     <function name="The &quot;state&quot; property" link="NMClient.html#NMClient--state"/>
+    <function name="The &quot;version&quot; property" link="NMClient.html#NMClient--version"/>
+    <function name="The &quot;wimax-enabled&quot; property" link="NMClient.html#NMClient--wimax-enabled"/>
+    <function name="The &quot;wimax-hardware-enabled&quot; property" link="NMClient.html#NMClient--wimax-hardware-enabled"/>
     <function name="The &quot;wireless-enabled&quot; property" link="NMClient.html#NMClient--wireless-enabled"/>
     <function name="The &quot;wireless-hardware-enabled&quot; property" link="NMClient.html#NMClient--wireless-hardware-enabled"/>
     <function name="The &quot;wwan-enabled&quot; property" link="NMClient.html#NMClient--wwan-enabled"/>
@@ -75,7 +86,6 @@
     <function name="The &quot;device-added&quot; signal" link="NMClient.html#NMClient-device-added"/>
     <function name="The &quot;device-removed&quot; signal" link="NMClient.html#NMClient-device-removed"/>
     <function name="The &quot;permission-changed&quot; signal" link="NMClient.html#NMClient-permission-changed"/>
-    <function name="NM_ACTIVE_CONNECTION_SERVICE_NAME" link="NMActiveConnection.html#NM-ACTIVE-CONNECTION-SERVICE-NAME:CAPS"/>
     <function name="NM_ACTIVE_CONNECTION_CONNECTION" link="NMActiveConnection.html#NM-ACTIVE-CONNECTION-CONNECTION:CAPS"/>
     <function name="NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT" link="NMActiveConnection.html#NM-ACTIVE-CONNECTION-SPECIFIC-OBJECT:CAPS"/>
     <function name="NM_ACTIVE_CONNECTION_DEVICES" link="NMActiveConnection.html#NM-ACTIVE-CONNECTION-DEVICES:CAPS"/>
@@ -85,8 +95,6 @@
     <function name="NMActiveConnection" link="NMActiveConnection.html#NMActiveConnection-struct"/>
     <function name="NMActiveConnectionClass" link="NMActiveConnection.html#NMActiveConnectionClass"/>
     <function name="nm_active_connection_new ()" link="NMActiveConnection.html#nm-active-connection-new"/>
-    <function name="nm_active_connection_get_service_name ()" link="NMActiveConnection.html#nm-active-connection-get-service-name"/>
-    <function name="nm_active_connection_get_scope ()" link="NMActiveConnection.html#nm-active-connection-get-scope"/>
     <function name="nm_active_connection_get_connection ()" link="NMActiveConnection.html#nm-active-connection-get-connection"/>
     <function name="nm_active_connection_get_specific_object ()" link="NMActiveConnection.html#nm-active-connection-get-specific-object"/>
     <function name="nm_active_connection_get_devices ()" link="NMActiveConnection.html#nm-active-connection-get-devices"/>
@@ -97,9 +105,9 @@
     <function name="The &quot;default&quot; property" link="NMActiveConnection.html#NMActiveConnection--default"/>
     <function name="The &quot;default6&quot; property" link="NMActiveConnection.html#NMActiveConnection--default6"/>
     <function name="The &quot;devices&quot; property" link="NMActiveConnection.html#NMActiveConnection--devices"/>
-    <function name="The &quot;service-name&quot; property" link="NMActiveConnection.html#NMActiveConnection--service-name"/>
     <function name="The &quot;specific-object&quot; property" link="NMActiveConnection.html#NMActiveConnection--specific-object"/>
     <function name="The &quot;state&quot; property" link="NMActiveConnection.html#NMActiveConnection--state"/>
+    <function name="NM_DEVICE_DEVICE_TYPE" link="NMDevice.html#NM-DEVICE-DEVICE-TYPE:CAPS"/>
     <function name="NM_DEVICE_UDI" link="NMDevice.html#NM-DEVICE-UDI:CAPS"/>
     <function name="NM_DEVICE_INTERFACE" link="NMDevice.html#NM-DEVICE-INTERFACE:CAPS"/>
     <function name="NM_DEVICE_IP_INTERFACE" link="NMDevice.html#NM-DEVICE-IP-INTERFACE:CAPS"/>
@@ -119,6 +127,7 @@
     <function name="nm_device_new ()" link="NMDevice.html#nm-device-new"/>
     <function name="nm_device_get_iface ()" link="NMDevice.html#nm-device-get-iface"/>
     <function name="nm_device_get_ip_iface ()" link="NMDevice.html#nm-device-get-ip-iface"/>
+    <function name="nm_device_get_device_type ()" link="NMDevice.html#nm-device-get-device-type"/>
     <function name="nm_device_get_udi ()" link="NMDevice.html#nm-device-get-udi"/>
     <function name="nm_device_get_driver ()" link="NMDevice.html#nm-device-get-driver"/>
     <function name="nm_device_get_capabilities ()" link="NMDevice.html#nm-device-get-capabilities"/>
@@ -133,7 +142,9 @@
     <function name="nm_device_get_vendor ()" link="NMDevice.html#nm-device-get-vendor"/>
     <function name="NMDeviceDeactivateFn ()" link="NMDevice.html#NMDeviceDeactivateFn"/>
     <function name="nm_device_disconnect ()" link="NMDevice.html#nm-device-disconnect"/>
+    <function name="nm_device_filter_connections ()" link="NMDevice.html#nm-device-filter-connections"/>
     <function name="The &quot;capabilities&quot; property" link="NMDevice.html#NMDevice--capabilities"/>
+    <function name="The &quot;device-type&quot; property" link="NMDevice.html#NMDevice--device-type"/>
     <function name="The &quot;dhcp4-config&quot; property" link="NMDevice.html#NMDevice--dhcp4-config"/>
     <function name="The &quot;dhcp6-config&quot; property" link="NMDevice.html#NMDevice--dhcp6-config"/>
     <function name="The &quot;driver&quot; property" link="NMDevice.html#NMDevice--driver"/>
@@ -188,17 +199,14 @@
     <function name="The &quot;wireless-capabilities&quot; property" link="NMDeviceWifi.html#NMDeviceWifi--wireless-capabilities"/>
     <function name="The &quot;access-point-added&quot; signal" link="NMDeviceWifi.html#NMDeviceWifi-access-point-added"/>
     <function name="The &quot;access-point-removed&quot; signal" link="NMDeviceWifi.html#NMDeviceWifi-access-point-removed"/>
-    <function name="NMSerialDevice" link="NMSerialDevice.html#NMSerialDevice-struct"/>
-    <function name="NMSerialDeviceClass" link="NMSerialDevice.html#NMSerialDeviceClass"/>
-    <function name="nm_serial_device_get_bytes_received ()" link="NMSerialDevice.html#nm-serial-device-get-bytes-received"/>
-    <function name="nm_serial_device_get_bytes_sent ()" link="NMSerialDevice.html#nm-serial-device-get-bytes-sent"/>
-    <function name="The &quot;ppp-stats&quot; signal" link="NMSerialDevice.html#NMSerialDevice-ppp-stats"/>
-    <function name="NMGsmDevice" link="NMGsmDevice.html#NMGsmDevice-struct"/>
-    <function name="NMGsmDeviceClass" link="NMGsmDevice.html#NMGsmDeviceClass"/>
-    <function name="nm_gsm_device_new ()" link="NMGsmDevice.html#nm-gsm-device-new"/>
-    <function name="NMCdmaDevice" link="NMCdmaDevice.html#NMCdmaDevice-struct"/>
-    <function name="NMCdmaDeviceClass" link="NMCdmaDevice.html#NMCdmaDeviceClass"/>
-    <function name="nm_cdma_device_new ()" link="NMCdmaDevice.html#nm-cdma-device-new"/>
+    <function name="NM_DEVICE_MODEM_MODEM_CAPABILITIES" link="NMDeviceModem.html#NM-DEVICE-MODEM-MODEM-CAPABILITIES:CAPS"/>
+    <function name="NM_DEVICE_MODEM_CURRENT_CAPABILITIES" link="NMDeviceModem.html#NM-DEVICE-MODEM-CURRENT-CAPABILITIES:CAPS"/>
+    <function name="NMDeviceModem" link="NMDeviceModem.html#NMDeviceModem-struct"/>
+    <function name="NMDeviceModemClass" link="NMDeviceModem.html#NMDeviceModemClass"/>
+    <function name="nm_device_modem_get_modem_capabilities ()" link="NMDeviceModem.html#nm-device-modem-get-modem-capabilities"/>
+    <function name="nm_device_modem_get_current_capabilities ()" link="NMDeviceModem.html#nm-device-modem-get-current-capabilities"/>
+    <function name="The &quot;current-capabilities&quot; property" link="NMDeviceModem.html#NMDeviceModem--current-capabilities"/>
+    <function name="The &quot;modem-capabilities&quot; property" link="NMDeviceModem.html#NMDeviceModem--modem-capabilities"/>
     <function name="NM_DEVICE_BT_HW_ADDRESS" link="NMDeviceBt.html#NM-DEVICE-BT-HW-ADDRESS:CAPS"/>
     <function name="NM_DEVICE_BT_NAME" link="NMDeviceBt.html#NM-DEVICE-BT-NAME:CAPS"/>
     <function name="NM_DEVICE_BT_CAPABILITIES" link="NMDeviceBt.html#NM-DEVICE-BT-CAPABILITIES:CAPS"/>
@@ -211,15 +219,58 @@
     <function name="The &quot;bt-capabilities&quot; property" link="NMDeviceBt.html#NMDeviceBt--bt-capabilities"/>
     <function name="The &quot;hw-address&quot; property" link="NMDeviceBt.html#NMDeviceBt--hw-address"/>
     <function name="The &quot;name&quot; property" link="NMDeviceBt.html#NMDeviceBt--name"/>
+    <function name="NM_DEVICE_WIMAX_HW_ADDRESS" link="NMDeviceWimax.html#NM-DEVICE-WIMAX-HW-ADDRESS:CAPS"/>
+    <function name="NM_DEVICE_WIMAX_ACTIVE_NSP" link="NMDeviceWimax.html#NM-DEVICE-WIMAX-ACTIVE-NSP:CAPS"/>
+    <function name="NM_DEVICE_WIMAX_CENTER_FREQUENCY" link="NMDeviceWimax.html#NM-DEVICE-WIMAX-CENTER-FREQUENCY:CAPS"/>
+    <function name="NM_DEVICE_WIMAX_RSSI" link="NMDeviceWimax.html#NM-DEVICE-WIMAX-RSSI:CAPS"/>
+    <function name="NM_DEVICE_WIMAX_CINR" link="NMDeviceWimax.html#NM-DEVICE-WIMAX-CINR:CAPS"/>
+    <function name="NM_DEVICE_WIMAX_TX_POWER" link="NMDeviceWimax.html#NM-DEVICE-WIMAX-TX-POWER:CAPS"/>
+    <function name="NM_DEVICE_WIMAX_BSID" link="NMDeviceWimax.html#NM-DEVICE-WIMAX-BSID:CAPS"/>
+    <function name="NMDeviceWimax" link="NMDeviceWimax.html#NMDeviceWimax-struct"/>
+    <function name="NMDeviceWimaxClass" link="NMDeviceWimax.html#NMDeviceWimaxClass"/>
+    <function name="nm_device_wimax_new ()" link="NMDeviceWimax.html#nm-device-wimax-new"/>
+    <function name="nm_device_wimax_get_hw_address ()" link="NMDeviceWimax.html#nm-device-wimax-get-hw-address"/>
+    <function name="nm_device_wimax_get_active_nsp ()" link="NMDeviceWimax.html#nm-device-wimax-get-active-nsp"/>
+    <function name="nm_device_wimax_get_nsp_by_path ()" link="NMDeviceWimax.html#nm-device-wimax-get-nsp-by-path"/>
+    <function name="nm_device_wimax_get_nsps ()" link="NMDeviceWimax.html#nm-device-wimax-get-nsps"/>
+    <function name="nm_device_wimax_get_center_frequency ()" link="NMDeviceWimax.html#nm-device-wimax-get-center-frequency"/>
+    <function name="nm_device_wimax_get_rssi ()" link="NMDeviceWimax.html#nm-device-wimax-get-rssi"/>
+    <function name="nm_device_wimax_get_cinr ()" link="NMDeviceWimax.html#nm-device-wimax-get-cinr"/>
+    <function name="nm_device_wimax_get_tx_power ()" link="NMDeviceWimax.html#nm-device-wimax-get-tx-power"/>
+    <function name="nm_device_wimax_get_bsid ()" link="NMDeviceWimax.html#nm-device-wimax-get-bsid"/>
+    <function name="The &quot;active-nsp&quot; property" link="NMDeviceWimax.html#NMDeviceWimax--active-nsp"/>
+    <function name="The &quot;bsid&quot; property" link="NMDeviceWimax.html#NMDeviceWimax--bsid"/>
+    <function name="The &quot;center-frequency&quot; property" link="NMDeviceWimax.html#NMDeviceWimax--center-frequency"/>
+    <function name="The &quot;cinr&quot; property" link="NMDeviceWimax.html#NMDeviceWimax--cinr"/>
+    <function name="The &quot;hw-address&quot; property" link="NMDeviceWimax.html#NMDeviceWimax--hw-address"/>
+    <function name="The &quot;rssi&quot; property" link="NMDeviceWimax.html#NMDeviceWimax--rssi"/>
+    <function name="The &quot;tx-power&quot; property" link="NMDeviceWimax.html#NMDeviceWimax--tx-power"/>
+    <function name="The &quot;nsp-added&quot; signal" link="NMDeviceWimax.html#NMDeviceWimax-nsp-added"/>
+    <function name="The &quot;nsp-removed&quot; signal" link="NMDeviceWimax.html#NMDeviceWimax-nsp-removed"/>
+    <function name="NM_WIMAX_NSP_NAME" link="NMWimaxNsp.html#NM-WIMAX-NSP-NAME:CAPS"/>
+    <function name="NM_WIMAX_NSP_SIGNAL_QUALITY" link="NMWimaxNsp.html#NM-WIMAX-NSP-SIGNAL-QUALITY:CAPS"/>
+    <function name="NM_WIMAX_NSP_NETWORK_TYPE" link="NMWimaxNsp.html#NM-WIMAX-NSP-NETWORK-TYPE:CAPS"/>
+    <function name="enum NMWimaxNspNetworkType" link="NMWimaxNsp.html#NMWimaxNspNetworkType"/>
+    <function name="NMWimaxNsp" link="NMWimaxNsp.html#NMWimaxNsp-struct"/>
+    <function name="NMWimaxNspClass" link="NMWimaxNsp.html#NMWimaxNspClass"/>
+    <function name="nm_wimax_nsp_new ()" link="NMWimaxNsp.html#nm-wimax-nsp-new"/>
+    <function name="nm_wimax_nsp_get_name ()" link="NMWimaxNsp.html#nm-wimax-nsp-get-name"/>
+    <function name="nm_wimax_nsp_get_signal_quality ()" link="NMWimaxNsp.html#nm-wimax-nsp-get-signal-quality"/>
+    <function name="nm_wimax_nsp_get_network_type ()" link="NMWimaxNsp.html#nm-wimax-nsp-get-network-type"/>
+    <function name="nm_wimax_nsp_filter_connections ()" link="NMWimaxNsp.html#nm-wimax-nsp-filter-connections"/>
+    <function name="The &quot;name&quot; property" link="NMWimaxNsp.html#NMWimaxNsp--name"/>
+    <function name="The &quot;network-type&quot; property" link="NMWimaxNsp.html#NMWimaxNsp--network-type"/>
+    <function name="The &quot;signal-quality&quot; property" link="NMWimaxNsp.html#NMWimaxNsp--signal-quality"/>
     <function name="NM_ACCESS_POINT_FLAGS" link="NMAccessPoint.html#NM-ACCESS-POINT-FLAGS:CAPS"/>
     <function name="NM_ACCESS_POINT_WPA_FLAGS" link="NMAccessPoint.html#NM-ACCESS-POINT-WPA-FLAGS:CAPS"/>
     <function name="NM_ACCESS_POINT_RSN_FLAGS" link="NMAccessPoint.html#NM-ACCESS-POINT-RSN-FLAGS:CAPS"/>
     <function name="NM_ACCESS_POINT_SSID" link="NMAccessPoint.html#NM-ACCESS-POINT-SSID:CAPS"/>
+    <function name="NM_ACCESS_POINT_BSSID" link="NMAccessPoint.html#NM-ACCESS-POINT-BSSID:CAPS"/>
     <function name="NM_ACCESS_POINT_FREQUENCY" link="NMAccessPoint.html#NM-ACCESS-POINT-FREQUENCY:CAPS"/>
-    <function name="NM_ACCESS_POINT_HW_ADDRESS" link="NMAccessPoint.html#NM-ACCESS-POINT-HW-ADDRESS:CAPS"/>
     <function name="NM_ACCESS_POINT_MODE" link="NMAccessPoint.html#NM-ACCESS-POINT-MODE:CAPS"/>
     <function name="NM_ACCESS_POINT_MAX_BITRATE" link="NMAccessPoint.html#NM-ACCESS-POINT-MAX-BITRATE:CAPS"/>
     <function name="NM_ACCESS_POINT_STRENGTH" link="NMAccessPoint.html#NM-ACCESS-POINT-STRENGTH:CAPS"/>
+    <function name="NM_ACCESS_POINT_HW_ADDRESS" link="NMAccessPoint.html#NM-ACCESS-POINT-HW-ADDRESS:CAPS"/>
     <function name="NMAccessPoint" link="NMAccessPoint.html#NMAccessPoint-struct"/>
     <function name="NMAccessPointClass" link="NMAccessPoint.html#NMAccessPointClass"/>
     <function name="nm_access_point_new ()" link="NMAccessPoint.html#nm-access-point-new"/>
@@ -227,11 +278,14 @@
     <function name="nm_access_point_get_wpa_flags ()" link="NMAccessPoint.html#nm-access-point-get-wpa-flags"/>
     <function name="nm_access_point_get_rsn_flags ()" link="NMAccessPoint.html#nm-access-point-get-rsn-flags"/>
     <function name="nm_access_point_get_ssid ()" link="NMAccessPoint.html#nm-access-point-get-ssid"/>
+    <function name="nm_access_point_get_bssid ()" link="NMAccessPoint.html#nm-access-point-get-bssid"/>
     <function name="nm_access_point_get_frequency ()" link="NMAccessPoint.html#nm-access-point-get-frequency"/>
-    <function name="nm_access_point_get_hw_address ()" link="NMAccessPoint.html#nm-access-point-get-hw-address"/>
     <function name="nm_access_point_get_mode ()" link="NMAccessPoint.html#nm-access-point-get-mode"/>
     <function name="nm_access_point_get_max_bitrate ()" link="NMAccessPoint.html#nm-access-point-get-max-bitrate"/>
     <function name="nm_access_point_get_strength ()" link="NMAccessPoint.html#nm-access-point-get-strength"/>
+    <function name="nm_access_point_filter_connections ()" link="NMAccessPoint.html#nm-access-point-filter-connections"/>
+    <function name="nm_access_point_get_hw_address ()" link="NMAccessPoint.html#nm-access-point-get-hw-address"/>
+    <function name="The &quot;bssid&quot; property" link="NMAccessPoint.html#NMAccessPoint--bssid"/>
     <function name="The &quot;flags&quot; property" link="NMAccessPoint.html#NMAccessPoint--flags"/>
     <function name="The &quot;frequency&quot; property" link="NMAccessPoint.html#NMAccessPoint--frequency"/>
     <function name="The &quot;hw-address&quot; property" link="NMAccessPoint.html#NMAccessPoint--hw-address"/>
@@ -244,21 +298,18 @@
     <function name="NMIP4Config" link="NMIP4Config.html#NMIP4Config-struct"/>
     <function name="NMIP4ConfigClass" link="NMIP4Config.html#NMIP4ConfigClass"/>
     <function name="NM_IP4_CONFIG_ADDRESSES" link="NMIP4Config.html#NM-IP4-CONFIG-ADDRESSES:CAPS"/>
-    <function name="NM_IP4_CONFIG_HOSTNAME" link="NMIP4Config.html#NM-IP4-CONFIG-HOSTNAME:CAPS"/>
     <function name="NM_IP4_CONFIG_NAMESERVERS" link="NMIP4Config.html#NM-IP4-CONFIG-NAMESERVERS:CAPS"/>
     <function name="NM_IP4_CONFIG_DOMAINS" link="NMIP4Config.html#NM-IP4-CONFIG-DOMAINS:CAPS"/>
     <function name="NM_IP4_CONFIG_ROUTES" link="NMIP4Config.html#NM-IP4-CONFIG-ROUTES:CAPS"/>
     <function name="NM_IP4_CONFIG_WINS_SERVERS" link="NMIP4Config.html#NM-IP4-CONFIG-WINS-SERVERS:CAPS"/>
     <function name="nm_ip4_config_new ()" link="NMIP4Config.html#nm-ip4-config-new"/>
     <function name="nm_ip4_config_get_addresses ()" link="NMIP4Config.html#nm-ip4-config-get-addresses"/>
-    <function name="nm_ip4_config_get_hostname ()" link="NMIP4Config.html#nm-ip4-config-get-hostname"/>
     <function name="nm_ip4_config_get_nameservers ()" link="NMIP4Config.html#nm-ip4-config-get-nameservers"/>
     <function name="nm_ip4_config_get_domains ()" link="NMIP4Config.html#nm-ip4-config-get-domains"/>
     <function name="nm_ip4_config_get_routes ()" link="NMIP4Config.html#nm-ip4-config-get-routes"/>
     <function name="nm_ip4_config_get_wins_servers ()" link="NMIP4Config.html#nm-ip4-config-get-wins-servers"/>
     <function name="The &quot;addresses&quot; property" link="NMIP4Config.html#NMIP4Config--addresses"/>
     <function name="The &quot;domains&quot; property" link="NMIP4Config.html#NMIP4Config--domains"/>
-    <function name="The &quot;hostname&quot; property" link="NMIP4Config.html#NMIP4Config--hostname"/>
     <function name="The &quot;nameservers&quot; property" link="NMIP4Config.html#NMIP4Config--nameservers"/>
     <function name="The &quot;routes&quot; property" link="NMIP4Config.html#NMIP4Config--routes"/>
     <function name="The &quot;wins-servers&quot; property" link="NMIP4Config.html#NMIP4Config--wins-servers"/>
@@ -291,9 +342,6 @@
     <function name="nm_dhcp6_config_get_options ()" link="NMDHCP6Config.html#nm-dhcp6-config-get-options"/>
     <function name="nm_dhcp6_config_get_one_option ()" link="NMDHCP6Config.html#nm-dhcp6-config-get-one-option"/>
     <function name="The &quot;options&quot; property" link="NMDHCP6Config.html#NMDHCP6Config--options"/>
-    <function name="NMExportedConnection" link="NMExportedConnection.html#NMExportedConnection-struct"/>
-    <function name="NMExportedConnectionClass" link="NMExportedConnection.html#NMExportedConnectionClass"/>
-    <function name="nm_exported_connection_new ()" link="NMExportedConnection.html#nm-exported-connection-new"/>
     <function name="NM_OBJECT_DBUS_CONNECTION" link="NMObject.html#NM-OBJECT-DBUS-CONNECTION:CAPS"/>
     <function name="NM_OBJECT_DBUS_PATH" link="NMObject.html#NM-OBJECT-DBUS-PATH:CAPS"/>
     <function name="NMObject" link="NMObject.html#NMObject-struct"/>
@@ -302,62 +350,48 @@
     <function name="nm_object_get_path ()" link="NMObject.html#nm-object-get-path"/>
     <function name="The &quot;dbus-connection&quot; property" link="NMObject.html#NMObject--dbus-connection"/>
     <function name="The &quot;dbus-path&quot; property" link="NMObject.html#NMObject--dbus-path"/>
+    <function name="NM_REMOTE_CONNECTION_UPDATED" link="NMRemoteConnection.html#NM-REMOTE-CONNECTION-UPDATED:CAPS"/>
+    <function name="NM_REMOTE_CONNECTION_REMOVED" link="NMRemoteConnection.html#NM-REMOTE-CONNECTION-REMOVED:CAPS"/>
     <function name="NMRemoteConnection" link="NMRemoteConnection.html#NMRemoteConnection-struct"/>
     <function name="NMRemoteConnectionClass" link="NMRemoteConnection.html#NMRemoteConnectionClass"/>
+    <function name="NMRemoteConnectionCommitFunc ()" link="NMRemoteConnection.html#NMRemoteConnectionCommitFunc"/>
+    <function name="NMRemoteConnectionDeleteFunc ()" link="NMRemoteConnection.html#NMRemoteConnectionDeleteFunc"/>
+    <function name="NMRemoteConnectionGetSecretsFunc ()" link="NMRemoteConnection.html#NMRemoteConnectionGetSecretsFunc"/>
     <function name="nm_remote_connection_new ()" link="NMRemoteConnection.html#nm-remote-connection-new"/>
+    <function name="nm_remote_connection_commit_changes ()" link="NMRemoteConnection.html#nm-remote-connection-commit-changes"/>
+    <function name="nm_remote_connection_delete ()" link="NMRemoteConnection.html#nm-remote-connection-delete"/>
+    <function name="nm_remote_connection_get_secrets ()" link="NMRemoteConnection.html#nm-remote-connection-get-secrets"/>
     <function name="The &quot;bus&quot; property" link="NMRemoteConnection.html#NMRemoteConnection--bus"/>
     <function name="The &quot;init-result&quot; property" link="NMRemoteConnection.html#NMRemoteConnection--init-result"/>
+    <function name="The &quot;removed&quot; signal" link="NMRemoteConnection.html#NMRemoteConnection-removed"/>
+    <function name="The &quot;updated&quot; signal" link="NMRemoteConnection.html#NMRemoteConnection-updated"/>
+    <function name="The &quot;visible&quot; signal" link="NMRemoteConnection.html#NMRemoteConnection-visible"/>
+    <function name="enum NMRemoteSettingsError" link="NMRemoteSettings.html#NMRemoteSettingsError"/>
+    <function name="NM_TYPE_REMOTE_SETTINGS_ERROR" link="NMRemoteSettings.html#NM-TYPE-REMOTE-SETTINGS-ERROR:CAPS"/>
+    <function name="NM_REMOTE_SETTINGS_ERROR" link="NMRemoteSettings.html#NM-REMOTE-SETTINGS-ERROR:CAPS"/>
+    <function name="nm_remote_settings_error_quark ()" link="NMRemoteSettings.html#nm-remote-settings-error-quark"/>
     <function name="NM_REMOTE_SETTINGS_BUS" link="NMRemoteSettings.html#NM-REMOTE-SETTINGS-BUS:CAPS"/>
-    <function name="NM_REMOTE_SETTINGS_SCOPE" link="NMRemoteSettings.html#NM-REMOTE-SETTINGS-SCOPE:CAPS"/>
     <function name="NM_REMOTE_SETTINGS_SERVICE_RUNNING" link="NMRemoteSettings.html#NM-REMOTE-SETTINGS-SERVICE-RUNNING:CAPS"/>
-    <function name="NMRemoteSettings" link="NMRemoteSettings.html#NMRemoteSettings-struct"/>
-    <function name="NMRemoteSettingsClass" link="NMRemoteSettings.html#NMRemoteSettingsClass"/>
+    <function name="NM_REMOTE_SETTINGS_HOSTNAME" link="NMRemoteSettings.html#NM-REMOTE-SETTINGS-HOSTNAME:CAPS"/>
+    <function name="NM_REMOTE_SETTINGS_CAN_MODIFY" link="NMRemoteSettings.html#NM-REMOTE-SETTINGS-CAN-MODIFY:CAPS"/>
+    <function name="NM_REMOTE_SETTINGS_NEW_CONNECTION" link="NMRemoteSettings.html#NM-REMOTE-SETTINGS-NEW-CONNECTION:CAPS"/>
+    <function name="NM_REMOTE_SETTINGS_CONNECTIONS_READ" link="NMRemoteSettings.html#NM-REMOTE-SETTINGS-CONNECTIONS-READ:CAPS"/>
+    <function name="NMRemoteSettingsAddConnectionFunc ()" link="NMRemoteSettings.html#NMRemoteSettingsAddConnectionFunc"/>
+    <function name="NMRemoteSettingsSaveHostnameFunc ()" link="NMRemoteSettings.html#NMRemoteSettingsSaveHostnameFunc"/>
+    <function name="struct NMRemoteSettings" link="NMRemoteSettings.html#NMRemoteSettings-struct"/>
+    <function name="struct NMRemoteSettingsClass" link="NMRemoteSettings.html#NMRemoteSettingsClass"/>
+    <function name="nm_remote_settings_get_type ()" link="NMRemoteSettings.html#nm-remote-settings-get-type"/>
     <function name="nm_remote_settings_new ()" link="NMRemoteSettings.html#nm-remote-settings-new"/>
+    <function name="nm_remote_settings_list_connections ()" link="NMRemoteSettings.html#nm-remote-settings-list-connections"/>
+    <function name="nm_remote_settings_get_connection_by_path ()" link="NMRemoteSettings.html#nm-remote-settings-get-connection-by-path"/>
+    <function name="nm_remote_settings_add_connection ()" link="NMRemoteSettings.html#nm-remote-settings-add-connection"/>
+    <function name="nm_remote_settings_save_hostname ()" link="NMRemoteSettings.html#nm-remote-settings-save-hostname"/>
     <function name="The &quot;bus&quot; property" link="NMRemoteSettings.html#NMRemoteSettings--bus"/>
-    <function name="The &quot;scope&quot; property" link="NMRemoteSettings.html#NMRemoteSettings--scope"/>
+    <function name="The &quot;can-modify&quot; property" link="NMRemoteSettings.html#NMRemoteSettings--can-modify"/>
+    <function name="The &quot;hostname&quot; property" link="NMRemoteSettings.html#NMRemoteSettings--hostname"/>
     <function name="The &quot;service-running&quot; property" link="NMRemoteSettings.html#NMRemoteSettings--service-running"/>
-    <function name="NMRemoteSettingsSystem" link="libnm-glib-NMRemoteSettingsSystem.html#NMRemoteSettingsSystem"/>
-    <function name="NMRemoteSettingsSystemClass" link="libnm-glib-NMRemoteSettingsSystem.html#NMRemoteSettingsSystemClass"/>
-    <function name="nm_remote_settings_system_new ()" link="libnm-glib-NMRemoteSettingsSystem.html#nm-remote-settings-system-new"/>
-    <function name="NM_SETTINGS_CONNECTION_INTERFACE_UPDATED" link="libnm-glib-NMSettingsConnection.html#NM-SETTINGS-CONNECTION-INTERFACE-UPDATED:CAPS"/>
-    <function name="NM_SETTINGS_CONNECTION_INTERFACE_REMOVED" link="libnm-glib-NMSettingsConnection.html#NM-SETTINGS-CONNECTION-INTERFACE-REMOVED:CAPS"/>
-    <function name="NMSettingsConnectionInterface" link="libnm-glib-NMSettingsConnection.html#NMSettingsConnectionInterface-struct"/>
-    <function name="NMSettingsConnectionInterfaceUpdateFunc ()" link="libnm-glib-NMSettingsConnection.html#NMSettingsConnectionInterfaceUpdateFunc"/>
-    <function name="NMSettingsConnectionInterfaceDeleteFunc ()" link="libnm-glib-NMSettingsConnection.html#NMSettingsConnectionInterfaceDeleteFunc"/>
-    <function name="NMSettingsConnectionInterfaceGetSecretsFunc ()" link="libnm-glib-NMSettingsConnection.html#NMSettingsConnectionInterfaceGetSecretsFunc"/>
-    <function name="nm_settings_connection_interface_update ()" link="libnm-glib-NMSettingsConnection.html#nm-settings-connection-interface-update"/>
-    <function name="nm_settings_connection_interface_delete ()" link="libnm-glib-NMSettingsConnection.html#nm-settings-connection-interface-delete"/>
-    <function name="nm_settings_connection_interface_get_secrets ()" link="libnm-glib-NMSettingsConnection.html#nm-settings-connection-interface-get-secrets"/>
-    <function name="nm_settings_connection_interface_emit_updated ()" link="libnm-glib-NMSettingsConnection.html#nm-settings-connection-interface-emit-updated"/>
-    <function name="enum NMSettingsInterfaceError" link="libnm-glib-NMSettings.html#NMSettingsInterfaceError"/>
-    <function name="NM_SETTINGS_INTERFACE_ERROR" link="libnm-glib-NMSettings.html#NM-SETTINGS-INTERFACE-ERROR:CAPS"/>
-    <function name="nm_settings_interface_error_quark ()" link="libnm-glib-NMSettings.html#nm-settings-interface-error-quark"/>
-    <function name="NM_TYPE_SETTINGS_INTERFACE_ERROR" link="libnm-glib-NMSettings.html#NM-TYPE-SETTINGS-INTERFACE-ERROR:CAPS"/>
-    <function name="NM_SETTINGS_INTERFACE_NEW_CONNECTION" link="libnm-glib-NMSettings.html#NM-SETTINGS-INTERFACE-NEW-CONNECTION:CAPS"/>
-    <function name="NM_SETTINGS_INTERFACE_CONNECTIONS_READ" link="libnm-glib-NMSettings.html#NM-SETTINGS-INTERFACE-CONNECTIONS-READ:CAPS"/>
-    <function name="NMSettingsInterface" link="libnm-glib-NMSettings.html#NMSettingsInterface-struct"/>
-    <function name="NMSettingsAddConnectionFunc ()" link="libnm-glib-NMSettings.html#NMSettingsAddConnectionFunc"/>
-    <function name="nm_settings_interface_get_type ()" link="libnm-glib-NMSettings.html#nm-settings-interface-get-type"/>
-    <function name="nm_settings_interface_list_connections ()" link="libnm-glib-NMSettings.html#nm-settings-interface-list-connections"/>
-    <function name="nm_settings_interface_get_connection_by_path ()" link="libnm-glib-NMSettings.html#nm-settings-interface-get-connection-by-path"/>
-    <function name="nm_settings_interface_add_connection ()" link="libnm-glib-NMSettings.html#nm-settings-interface-add-connection"/>
-    <function name="NM_SETTINGS_SERVICE_BUS" link="libnm-glib-NMSettingsService.html#NM-SETTINGS-SERVICE-BUS:CAPS"/>
-    <function name="NM_SETTINGS_SERVICE_SCOPE" link="libnm-glib-NMSettingsService.html#NM-SETTINGS-SERVICE-SCOPE:CAPS"/>
-    <function name="NMSettingsService" link="libnm-glib-NMSettingsService.html#NMSettingsService"/>
-    <function name="NMSettingsServiceClass" link="libnm-glib-NMSettingsService.html#NMSettingsServiceClass"/>
-    <function name="nm_settings_service_get_connection_by_path ()" link="libnm-glib-NMSettingsService.html#nm-settings-service-get-connection-by-path"/>
-    <function name="nm_settings_service_export ()" link="libnm-glib-NMSettingsService.html#nm-settings-service-export"/>
-    <function name="nm_settings_service_export_connection ()" link="libnm-glib-NMSettingsService.html#nm-settings-service-export-connection"/>
-    <function name="enum NMSettingsSystemPermissions" link="libnm-glib-NMSettingsSystem.html#NMSettingsSystemPermissions"/>
-    <function name="NM_SETTINGS_SYSTEM_INTERFACE_HOSTNAME" link="libnm-glib-NMSettingsSystem.html#NM-SETTINGS-SYSTEM-INTERFACE-HOSTNAME:CAPS"/>
-    <function name="NM_SETTINGS_SYSTEM_INTERFACE_CAN_MODIFY" link="libnm-glib-NMSettingsSystem.html#NM-SETTINGS-SYSTEM-INTERFACE-CAN-MODIFY:CAPS"/>
-    <function name="NM_SETTINGS_SYSTEM_INTERFACE_CHECK_PERMISSIONS" link="libnm-glib-NMSettingsSystem.html#NM-SETTINGS-SYSTEM-INTERFACE-CHECK-PERMISSIONS:CAPS"/>
-    <function name="enum NMSettingsSystemInterfaceProp" link="libnm-glib-NMSettingsSystem.html#NMSettingsSystemInterfaceProp"/>
-    <function name="NMSettingsSystemInterface" link="libnm-glib-NMSettingsSystem.html#NMSettingsSystemInterface"/>
-    <function name="NMSettingsSystemSaveHostnameFunc ()" link="libnm-glib-NMSettingsSystem.html#NMSettingsSystemSaveHostnameFunc"/>
-    <function name="NMSettingsSystemGetPermissionsFunc ()" link="libnm-glib-NMSettingsSystem.html#NMSettingsSystemGetPermissionsFunc"/>
-    <function name="nm_settings_system_interface_save_hostname ()" link="libnm-glib-NMSettingsSystem.html#nm-settings-system-interface-save-hostname"/>
-    <function name="nm_settings_system_interface_get_permissions ()" link="libnm-glib-NMSettingsSystem.html#nm-settings-system-interface-get-permissions"/>
+    <function name="The &quot;connections-read&quot; signal" link="NMRemoteSettings.html#NMRemoteSettings-connections-read"/>
+    <function name="The &quot;new-connection&quot; signal" link="NMRemoteSettings.html#NMRemoteSettings-new-connection"/>
     <function name="NM_TYPE_SSID" link="libnm-glib-nm-types.html#NM-TYPE-SSID:CAPS"/>
     <function name="nm_ssid_get_type ()" link="libnm-glib-nm-types.html#nm-ssid-get-type"/>
     <function name="NM_TYPE_UINT_ARRAY" link="libnm-glib-nm-types.html#NM-TYPE-UINT-ARRAY:CAPS"/>
@@ -372,6 +406,28 @@
     <function name="nm_ip6_address_array_get_type ()" link="libnm-glib-nm-types.html#nm-ip6-address-array-get-type"/>
     <function name="NM_TYPE_IP6_ROUTE_OBJECT_ARRAY" link="libnm-glib-nm-types.html#NM-TYPE-IP6-ROUTE-OBJECT-ARRAY:CAPS"/>
     <function name="nm_ip6_route_object_array_get_type ()" link="libnm-glib-nm-types.html#nm-ip6-route-object-array-get-type"/>
+    <function name="NM_SECRET_AGENT_ERROR" link="NMSecretAgent.html#NM-SECRET-AGENT-ERROR:CAPS"/>
+    <function name="NM_TYPE_SECRET_AGENT_ERROR" link="NMSecretAgent.html#NM-TYPE-SECRET-AGENT-ERROR:CAPS"/>
+    <function name="nm_secret_agent_error_quark ()" link="NMSecretAgent.html#nm-secret-agent-error-quark"/>
+    <function name="enum NMSecretAgentError" link="NMSecretAgent.html#NMSecretAgentError"/>
+    <function name="enum NMSecretAgentGetSecretsFlags" link="NMSecretAgent.html#NMSecretAgentGetSecretsFlags"/>
+    <function name="NM_SECRET_AGENT_IDENTIFIER" link="NMSecretAgent.html#NM-SECRET-AGENT-IDENTIFIER:CAPS"/>
+    <function name="NM_SECRET_AGENT_AUTO_REGISTER" link="NMSecretAgent.html#NM-SECRET-AGENT-AUTO-REGISTER:CAPS"/>
+    <function name="NM_SECRET_AGENT_REGISTRATION_RESULT" link="NMSecretAgent.html#NM-SECRET-AGENT-REGISTRATION-RESULT:CAPS"/>
+    <function name="NMSecretAgent" link="NMSecretAgent.html#NMSecretAgent-struct"/>
+    <function name="NMSecretAgentGetSecretsFunc ()" link="NMSecretAgent.html#NMSecretAgentGetSecretsFunc"/>
+    <function name="NMSecretAgentSaveSecretsFunc ()" link="NMSecretAgent.html#NMSecretAgentSaveSecretsFunc"/>
+    <function name="NMSecretAgentDeleteSecretsFunc ()" link="NMSecretAgent.html#NMSecretAgentDeleteSecretsFunc"/>
+    <function name="NMSecretAgentClass" link="NMSecretAgent.html#NMSecretAgentClass"/>
+    <function name="nm_secret_agent_get_type ()" link="NMSecretAgent.html#nm-secret-agent-get-type"/>
+    <function name="nm_secret_agent_register ()" link="NMSecretAgent.html#nm-secret-agent-register"/>
+    <function name="nm_secret_agent_unregister ()" link="NMSecretAgent.html#nm-secret-agent-unregister"/>
+    <function name="nm_secret_agent_get_secrets ()" link="NMSecretAgent.html#nm-secret-agent-get-secrets"/>
+    <function name="nm_secret_agent_save_secrets ()" link="NMSecretAgent.html#nm-secret-agent-save-secrets"/>
+    <function name="nm_secret_agent_delete_secrets ()" link="NMSecretAgent.html#nm-secret-agent-delete-secrets"/>
+    <function name="The &quot;auto-register&quot; property" link="NMSecretAgent.html#NMSecretAgent--auto-register"/>
+    <function name="The &quot;identifier&quot; property" link="NMSecretAgent.html#NMSecretAgent--identifier"/>
+    <function name="The &quot;registration-result&quot; signal" link="NMSecretAgent.html#NMSecretAgent-registration-result"/>
     <function name="NM_VPN_CONNECTION_VPN_STATE" link="NMVPNConnection.html#NM-VPN-CONNECTION-VPN-STATE:CAPS"/>
     <function name="NM_VPN_CONNECTION_BANNER" link="NMVPNConnection.html#NM-VPN-CONNECTION-BANNER:CAPS"/>
     <function name="NMVPNConnection" link="NMVPNConnection.html#NMVPNConnection-struct"/>
@@ -398,8 +454,6 @@
     <function name="nm_vpn_plugin_failure ()" link="libnm-glib-NMVPNPlugin.html#nm-vpn-plugin-failure"/>
     <function name="nm_vpn_plugin_set_ip4_config ()" link="libnm-glib-NMVPNPlugin.html#nm-vpn-plugin-set-ip4-config"/>
     <function name="nm_vpn_plugin_disconnect ()" link="libnm-glib-NMVPNPlugin.html#nm-vpn-plugin-disconnect"/>
-    <function name="NMVpnPluginUiInterface" link="libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiInterface"/>
-    <function name="NMVpnPluginUiWidgetInterface" link="libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiWidgetInterface"/>
     <function name="NMVpnPluginUiFactory ()" link="libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiFactory"/>
     <function name="nm_vpn_plugin_ui_factory ()" link="libnm-glib-NMVpnPluginUi.html#nm-vpn-plugin-ui-factory"/>
     <function name="NM_VPN_PLUGIN_UI_CAPABILITY_NONE" link="libnm-glib-NMVpnPluginUi.html#NM-VPN-PLUGIN-UI-CAPABILITY-NONE:CAPS"/>
@@ -409,6 +463,7 @@
     <function name="NM_VPN_PLUGIN_UI_INTERFACE_DESC" link="libnm-glib-NMVpnPluginUi.html#NM-VPN-PLUGIN-UI-INTERFACE-DESC:CAPS"/>
     <function name="NM_VPN_PLUGIN_UI_INTERFACE_SERVICE" link="libnm-glib-NMVpnPluginUi.html#NM-VPN-PLUGIN-UI-INTERFACE-SERVICE:CAPS"/>
     <function name="enum NMVpnPluginUiInterfaceProp" link="libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiInterfaceProp"/>
+    <function name="struct NMVpnPluginUiInterface" link="libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiInterface"/>
     <function name="nm_vpn_plugin_ui_interface_ui_factory ()" link="libnm-glib-NMVpnPluginUi.html#nm-vpn-plugin-ui-interface-ui-factory"/>
     <function name="nm_vpn_plugin_ui_interface_get_capabilities ()" link="libnm-glib-NMVpnPluginUi.html#nm-vpn-plugin-ui-interface-get-capabilities"/>
     <function name="nm_vpn_plugin_ui_interface_import ()" link="libnm-glib-NMVpnPluginUi.html#nm-vpn-plugin-ui-interface-import"/>
@@ -419,6 +474,7 @@
     <function name="NM_VPN_PLUGIN_UI_WIDGET_INTERFACE()" link="libnm-glib-NMVpnPluginUi.html#NM-VPN-PLUGIN-UI-WIDGET-INTERFACE:CAPS"/>
     <function name="NM_IS_VPN_PLUGIN_UI_WIDGET_INTERFACE()" link="libnm-glib-NMVpnPluginUi.html#NM-IS-VPN-PLUGIN-UI-WIDGET-INTERFACE:CAPS"/>
     <function name="NM_VPN_PLUGIN_UI_WIDGET_INTERFACE_GET_INTERFACE()" link="libnm-glib-NMVpnPluginUi.html#NM-VPN-PLUGIN-UI-WIDGET-INTERFACE-GET-INTERFACE:CAPS"/>
+    <function name="struct NMVpnPluginUiWidgetInterface" link="libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiWidgetInterface"/>
     <function name="nm_vpn_plugin_ui_widget_interface_get_type ()" link="libnm-glib-NMVpnPluginUi.html#nm-vpn-plugin-ui-widget-interface-get-type"/>
     <function name="nm_vpn_plugin_ui_widget_interface_get_widget ()" link="libnm-glib-NMVpnPluginUi.html#nm-vpn-plugin-ui-widget-interface-get-widget"/>
     <function name="nm_vpn_plugin_ui_widget_interface_update_connection ()" link="libnm-glib-NMVpnPluginUi.html#nm-vpn-plugin-ui-widget-interface-update-connection"/>
diff --git a/docs/libnm-glib/html/libnm-glib.devhelp2 b/docs/libnm-glib/html/libnm-glib.devhelp2
index a3b307982..b88b1388e 100644
--- a/docs/libnm-glib/html/libnm-glib.devhelp2
+++ b/docs/libnm-glib/html/libnm-glib.devhelp2
@@ -1,38 +1,38 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <!DOCTYPE book PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "">
-<book xmlns="http://www.devhelp.net/book" title="libnm-glib Reference Manual" link="index.html" author="" name="libnm-glib" version="2" language="c">
+<book xmlns="http://www.devhelp.net/book" title="libnm-glib Reference Manual" link="index.html" author="Dan Williams" name="libnm-glib" version="2" language="c">
   <chapters>
-    <sub name="libnm-glib Objects" link="ch01.html">
+    <sub name="Object Overview" link="ref-overview.html"/>
+    <sub name="libnm-glib API Reference" link="ch02.html">
       <sub name="NMClient" link="NMClient.html"/>
       <sub name="NMActiveConnection" link="NMActiveConnection.html"/>
       <sub name="NMDevice" link="NMDevice.html"/>
       <sub name="NMDeviceEthernet" link="NMDeviceEthernet.html"/>
       <sub name="NMDeviceWifi" link="NMDeviceWifi.html"/>
-      <sub name="NMSerialDevice" link="NMSerialDevice.html"/>
-      <sub name="NMGsmDevice" link="NMGsmDevice.html"/>
-      <sub name="NMCdmaDevice" link="NMCdmaDevice.html"/>
+      <sub name="NMDeviceModem" link="NMDeviceModem.html"/>
       <sub name="NMDeviceBt" link="NMDeviceBt.html"/>
+      <sub name="NMDeviceWimax" link="NMDeviceWimax.html"/>
+      <sub name="NMWimaxNsp" link="NMWimaxNsp.html"/>
       <sub name="NMAccessPoint" link="NMAccessPoint.html"/>
       <sub name="NMIP4Config" link="NMIP4Config.html"/>
       <sub name="NMIP6Config" link="NMIP6Config.html"/>
       <sub name="NMDHCP4Config" link="NMDHCP4Config.html"/>
       <sub name="NMDHCP6Config" link="NMDHCP6Config.html"/>
-      <sub name="NMExportedConnection" link="NMExportedConnection.html"/>
       <sub name="NMObject" link="NMObject.html"/>
       <sub name="NMRemoteConnection" link="NMRemoteConnection.html"/>
       <sub name="NMRemoteSettings" link="NMRemoteSettings.html"/>
-      <sub name="NMRemoteSettingsSystem" link="libnm-glib-NMRemoteSettingsSystem.html"/>
-      <sub name="NMSettingsConnection" link="libnm-glib-NMSettingsConnection.html"/>
-      <sub name="NMSettings" link="libnm-glib-NMSettings.html"/>
-      <sub name="NMSettingsService" link="libnm-glib-NMSettingsService.html"/>
-      <sub name="NMSettingsSystem" link="libnm-glib-NMSettingsSystem.html"/>
       <sub name="nm-types" link="libnm-glib-nm-types.html"/>
+      <sub name="NMSecretAgent" link="NMSecretAgent.html"/>
       <sub name="NMVPNConnection" link="NMVPNConnection.html"/>
       <sub name="NMVPNPlugin" link="libnm-glib-NMVPNPlugin.html"/>
       <sub name="NMVpnPluginUi" link="libnm-glib-NMVpnPluginUi.html"/>
     </sub>
+    <sub name="Object Hierarchy" link="object-tree.html"/>
+    <sub name="API Index" link="api-index-full.html"/>
+    <sub name="Annotation Glossary" link="annotation-glossary.html"/>
   </chapters>
   <functions>
+    <keyword type="macro" name="NM_CLIENT_VERSION" link="NMClient.html#NM-CLIENT-VERSION:CAPS"/>
     <keyword type="macro" name="NM_CLIENT_STATE" link="NMClient.html#NM-CLIENT-STATE:CAPS"/>
     <keyword type="macro" name="NM_CLIENT_MANAGER_RUNNING" link="NMClient.html#NM-CLIENT-MANAGER-RUNNING:CAPS"/>
     <keyword type="macro" name="NM_CLIENT_NETWORKING_ENABLED" link="NMClient.html#NM-CLIENT-NETWORKING-ENABLED:CAPS"/>
@@ -40,6 +40,8 @@
     <keyword type="macro" name="NM_CLIENT_WIRELESS_HARDWARE_ENABLED" link="NMClient.html#NM-CLIENT-WIRELESS-HARDWARE-ENABLED:CAPS"/>
     <keyword type="macro" name="NM_CLIENT_WWAN_ENABLED" link="NMClient.html#NM-CLIENT-WWAN-ENABLED:CAPS"/>
     <keyword type="macro" name="NM_CLIENT_WWAN_HARDWARE_ENABLED" link="NMClient.html#NM-CLIENT-WWAN-HARDWARE-ENABLED:CAPS"/>
+    <keyword type="macro" name="NM_CLIENT_WIMAX_ENABLED" link="NMClient.html#NM-CLIENT-WIMAX-ENABLED:CAPS"/>
+    <keyword type="macro" name="NM_CLIENT_WIMAX_HARDWARE_ENABLED" link="NMClient.html#NM-CLIENT-WIMAX-HARDWARE-ENABLED:CAPS"/>
     <keyword type="macro" name="NM_CLIENT_ACTIVE_CONNECTIONS" link="NMClient.html#NM-CLIENT-ACTIVE-CONNECTIONS:CAPS"/>
     <keyword type="enum" name="enum NMClientPermission" link="NMClient.html#NMClientPermission"/>
     <keyword type="enum" name="enum NMClientPermissionResult" link="NMClient.html#NMClientPermissionResult"/>
@@ -48,8 +50,10 @@
     <keyword type="function" name="nm_client_new ()" link="NMClient.html#nm-client-new"/>
     <keyword type="function" name="nm_client_get_devices ()" link="NMClient.html#nm-client-get-devices"/>
     <keyword type="function" name="nm_client_get_device_by_path ()" link="NMClient.html#nm-client-get-device-by-path"/>
-    <keyword type="function" name="NMClientActivateDeviceFn ()" link="NMClient.html#NMClientActivateDeviceFn"/>
+    <keyword type="function" name="NMClientActivateFn ()" link="NMClient.html#NMClientActivateFn"/>
     <keyword type="function" name="nm_client_activate_connection ()" link="NMClient.html#nm-client-activate-connection"/>
+    <keyword type="function" name="NMClientAddActivateFn ()" link="NMClient.html#NMClientAddActivateFn"/>
+    <keyword type="function" name="nm_client_add_and_activate_connection ()" link="NMClient.html#nm-client-add-and-activate-connection"/>
     <keyword type="function" name="nm_client_deactivate_connection ()" link="NMClient.html#nm-client-deactivate-connection"/>
     <keyword type="function" name="nm_client_networking_get_enabled ()" link="NMClient.html#nm-client-networking-get-enabled"/>
     <keyword type="function" name="nm_client_networking_set_enabled ()" link="NMClient.html#nm-client-networking-set-enabled"/>
@@ -59,6 +63,10 @@
     <keyword type="function" name="nm_client_wwan_get_enabled ()" link="NMClient.html#nm-client-wwan-get-enabled"/>
     <keyword type="function" name="nm_client_wwan_set_enabled ()" link="NMClient.html#nm-client-wwan-set-enabled"/>
     <keyword type="function" name="nm_client_wwan_hardware_get_enabled ()" link="NMClient.html#nm-client-wwan-hardware-get-enabled"/>
+    <keyword type="function" name="nm_client_wimax_get_enabled ()" link="NMClient.html#nm-client-wimax-get-enabled"/>
+    <keyword type="function" name="nm_client_wimax_set_enabled ()" link="NMClient.html#nm-client-wimax-set-enabled"/>
+    <keyword type="function" name="nm_client_wimax_hardware_get_enabled ()" link="NMClient.html#nm-client-wimax-hardware-get-enabled"/>
+    <keyword type="function" name="nm_client_get_version ()" link="NMClient.html#nm-client-get-version"/>
     <keyword type="function" name="nm_client_get_state ()" link="NMClient.html#nm-client-get-state"/>
     <keyword type="function" name="nm_client_get_manager_running ()" link="NMClient.html#nm-client-get-manager-running"/>
     <keyword type="function" name="nm_client_get_active_connections ()" link="NMClient.html#nm-client-get-active-connections"/>
@@ -68,6 +76,9 @@
     <keyword type="property" name="The &quot;manager-running&quot; property" link="NMClient.html#NMClient--manager-running"/>
     <keyword type="property" name="The &quot;networking-enabled&quot; property" link="NMClient.html#NMClient--networking-enabled"/>
     <keyword type="property" name="The &quot;state&quot; property" link="NMClient.html#NMClient--state"/>
+    <keyword type="property" name="The &quot;version&quot; property" link="NMClient.html#NMClient--version"/>
+    <keyword type="property" name="The &quot;wimax-enabled&quot; property" link="NMClient.html#NMClient--wimax-enabled"/>
+    <keyword type="property" name="The &quot;wimax-hardware-enabled&quot; property" link="NMClient.html#NMClient--wimax-hardware-enabled"/>
     <keyword type="property" name="The &quot;wireless-enabled&quot; property" link="NMClient.html#NMClient--wireless-enabled"/>
     <keyword type="property" name="The &quot;wireless-hardware-enabled&quot; property" link="NMClient.html#NMClient--wireless-hardware-enabled"/>
     <keyword type="property" name="The &quot;wwan-enabled&quot; property" link="NMClient.html#NMClient--wwan-enabled"/>
@@ -75,7 +86,6 @@
     <keyword type="signal" name="The &quot;device-added&quot; signal" link="NMClient.html#NMClient-device-added"/>
     <keyword type="signal" name="The &quot;device-removed&quot; signal" link="NMClient.html#NMClient-device-removed"/>
     <keyword type="signal" name="The &quot;permission-changed&quot; signal" link="NMClient.html#NMClient-permission-changed"/>
-    <keyword type="macro" name="NM_ACTIVE_CONNECTION_SERVICE_NAME" link="NMActiveConnection.html#NM-ACTIVE-CONNECTION-SERVICE-NAME:CAPS"/>
     <keyword type="macro" name="NM_ACTIVE_CONNECTION_CONNECTION" link="NMActiveConnection.html#NM-ACTIVE-CONNECTION-CONNECTION:CAPS"/>
     <keyword type="macro" name="NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT" link="NMActiveConnection.html#NM-ACTIVE-CONNECTION-SPECIFIC-OBJECT:CAPS"/>
     <keyword type="macro" name="NM_ACTIVE_CONNECTION_DEVICES" link="NMActiveConnection.html#NM-ACTIVE-CONNECTION-DEVICES:CAPS"/>
@@ -85,8 +95,6 @@
     <keyword type="struct" name="NMActiveConnection" link="NMActiveConnection.html#NMActiveConnection-struct"/>
     <keyword type="struct" name="NMActiveConnectionClass" link="NMActiveConnection.html#NMActiveConnectionClass"/>
     <keyword type="function" name="nm_active_connection_new ()" link="NMActiveConnection.html#nm-active-connection-new"/>
-    <keyword type="function" name="nm_active_connection_get_service_name ()" link="NMActiveConnection.html#nm-active-connection-get-service-name"/>
-    <keyword type="function" name="nm_active_connection_get_scope ()" link="NMActiveConnection.html#nm-active-connection-get-scope"/>
     <keyword type="function" name="nm_active_connection_get_connection ()" link="NMActiveConnection.html#nm-active-connection-get-connection"/>
     <keyword type="function" name="nm_active_connection_get_specific_object ()" link="NMActiveConnection.html#nm-active-connection-get-specific-object"/>
     <keyword type="function" name="nm_active_connection_get_devices ()" link="NMActiveConnection.html#nm-active-connection-get-devices"/>
@@ -97,9 +105,9 @@
     <keyword type="property" name="The &quot;default&quot; property" link="NMActiveConnection.html#NMActiveConnection--default"/>
     <keyword type="property" name="The &quot;default6&quot; property" link="NMActiveConnection.html#NMActiveConnection--default6"/>
     <keyword type="property" name="The &quot;devices&quot; property" link="NMActiveConnection.html#NMActiveConnection--devices"/>
-    <keyword type="property" name="The &quot;service-name&quot; property" link="NMActiveConnection.html#NMActiveConnection--service-name"/>
     <keyword type="property" name="The &quot;specific-object&quot; property" link="NMActiveConnection.html#NMActiveConnection--specific-object"/>
     <keyword type="property" name="The &quot;state&quot; property" link="NMActiveConnection.html#NMActiveConnection--state"/>
+    <keyword type="macro" name="NM_DEVICE_DEVICE_TYPE" link="NMDevice.html#NM-DEVICE-DEVICE-TYPE:CAPS"/>
     <keyword type="macro" name="NM_DEVICE_UDI" link="NMDevice.html#NM-DEVICE-UDI:CAPS"/>
     <keyword type="macro" name="NM_DEVICE_INTERFACE" link="NMDevice.html#NM-DEVICE-INTERFACE:CAPS"/>
     <keyword type="macro" name="NM_DEVICE_IP_INTERFACE" link="NMDevice.html#NM-DEVICE-IP-INTERFACE:CAPS"/>
@@ -119,6 +127,7 @@
     <keyword type="function" name="nm_device_new ()" link="NMDevice.html#nm-device-new"/>
     <keyword type="function" name="nm_device_get_iface ()" link="NMDevice.html#nm-device-get-iface"/>
     <keyword type="function" name="nm_device_get_ip_iface ()" link="NMDevice.html#nm-device-get-ip-iface"/>
+    <keyword type="function" name="nm_device_get_device_type ()" link="NMDevice.html#nm-device-get-device-type"/>
     <keyword type="function" name="nm_device_get_udi ()" link="NMDevice.html#nm-device-get-udi"/>
     <keyword type="function" name="nm_device_get_driver ()" link="NMDevice.html#nm-device-get-driver"/>
     <keyword type="function" name="nm_device_get_capabilities ()" link="NMDevice.html#nm-device-get-capabilities"/>
@@ -133,7 +142,9 @@
     <keyword type="function" name="nm_device_get_vendor ()" link="NMDevice.html#nm-device-get-vendor"/>
     <keyword type="function" name="NMDeviceDeactivateFn ()" link="NMDevice.html#NMDeviceDeactivateFn"/>
     <keyword type="function" name="nm_device_disconnect ()" link="NMDevice.html#nm-device-disconnect"/>
+    <keyword type="function" name="nm_device_filter_connections ()" link="NMDevice.html#nm-device-filter-connections"/>
     <keyword type="property" name="The &quot;capabilities&quot; property" link="NMDevice.html#NMDevice--capabilities"/>
+    <keyword type="property" name="The &quot;device-type&quot; property" link="NMDevice.html#NMDevice--device-type"/>
     <keyword type="property" name="The &quot;dhcp4-config&quot; property" link="NMDevice.html#NMDevice--dhcp4-config"/>
     <keyword type="property" name="The &quot;dhcp6-config&quot; property" link="NMDevice.html#NMDevice--dhcp6-config"/>
     <keyword type="property" name="The &quot;driver&quot; property" link="NMDevice.html#NMDevice--driver"/>
@@ -188,17 +199,14 @@
     <keyword type="property" name="The &quot;wireless-capabilities&quot; property" link="NMDeviceWifi.html#NMDeviceWifi--wireless-capabilities"/>
     <keyword type="signal" name="The &quot;access-point-added&quot; signal" link="NMDeviceWifi.html#NMDeviceWifi-access-point-added"/>
     <keyword type="signal" name="The &quot;access-point-removed&quot; signal" link="NMDeviceWifi.html#NMDeviceWifi-access-point-removed"/>
-    <keyword type="struct" name="NMSerialDevice" link="NMSerialDevice.html#NMSerialDevice-struct"/>
-    <keyword type="struct" name="NMSerialDeviceClass" link="NMSerialDevice.html#NMSerialDeviceClass"/>
-    <keyword type="function" name="nm_serial_device_get_bytes_received ()" link="NMSerialDevice.html#nm-serial-device-get-bytes-received"/>
-    <keyword type="function" name="nm_serial_device_get_bytes_sent ()" link="NMSerialDevice.html#nm-serial-device-get-bytes-sent"/>
-    <keyword type="signal" name="The &quot;ppp-stats&quot; signal" link="NMSerialDevice.html#NMSerialDevice-ppp-stats"/>
-    <keyword type="struct" name="NMGsmDevice" link="NMGsmDevice.html#NMGsmDevice-struct"/>
-    <keyword type="struct" name="NMGsmDeviceClass" link="NMGsmDevice.html#NMGsmDeviceClass"/>
-    <keyword type="function" name="nm_gsm_device_new ()" link="NMGsmDevice.html#nm-gsm-device-new"/>
-    <keyword type="struct" name="NMCdmaDevice" link="NMCdmaDevice.html#NMCdmaDevice-struct"/>
-    <keyword type="struct" name="NMCdmaDeviceClass" link="NMCdmaDevice.html#NMCdmaDeviceClass"/>
-    <keyword type="function" name="nm_cdma_device_new ()" link="NMCdmaDevice.html#nm-cdma-device-new"/>
+    <keyword type="macro" name="NM_DEVICE_MODEM_MODEM_CAPABILITIES" link="NMDeviceModem.html#NM-DEVICE-MODEM-MODEM-CAPABILITIES:CAPS"/>
+    <keyword type="macro" name="NM_DEVICE_MODEM_CURRENT_CAPABILITIES" link="NMDeviceModem.html#NM-DEVICE-MODEM-CURRENT-CAPABILITIES:CAPS"/>
+    <keyword type="struct" name="NMDeviceModem" link="NMDeviceModem.html#NMDeviceModem-struct"/>
+    <keyword type="struct" name="NMDeviceModemClass" link="NMDeviceModem.html#NMDeviceModemClass"/>
+    <keyword type="function" name="nm_device_modem_get_modem_capabilities ()" link="NMDeviceModem.html#nm-device-modem-get-modem-capabilities"/>
+    <keyword type="function" name="nm_device_modem_get_current_capabilities ()" link="NMDeviceModem.html#nm-device-modem-get-current-capabilities"/>
+    <keyword type="property" name="The &quot;current-capabilities&quot; property" link="NMDeviceModem.html#NMDeviceModem--current-capabilities"/>
+    <keyword type="property" name="The &quot;modem-capabilities&quot; property" link="NMDeviceModem.html#NMDeviceModem--modem-capabilities"/>
     <keyword type="macro" name="NM_DEVICE_BT_HW_ADDRESS" link="NMDeviceBt.html#NM-DEVICE-BT-HW-ADDRESS:CAPS"/>
     <keyword type="macro" name="NM_DEVICE_BT_NAME" link="NMDeviceBt.html#NM-DEVICE-BT-NAME:CAPS"/>
     <keyword type="macro" name="NM_DEVICE_BT_CAPABILITIES" link="NMDeviceBt.html#NM-DEVICE-BT-CAPABILITIES:CAPS"/>
@@ -211,15 +219,58 @@
     <keyword type="property" name="The &quot;bt-capabilities&quot; property" link="NMDeviceBt.html#NMDeviceBt--bt-capabilities"/>
     <keyword type="property" name="The &quot;hw-address&quot; property" link="NMDeviceBt.html#NMDeviceBt--hw-address"/>
     <keyword type="property" name="The &quot;name&quot; property" link="NMDeviceBt.html#NMDeviceBt--name"/>
+    <keyword type="macro" name="NM_DEVICE_WIMAX_HW_ADDRESS" link="NMDeviceWimax.html#NM-DEVICE-WIMAX-HW-ADDRESS:CAPS"/>
+    <keyword type="macro" name="NM_DEVICE_WIMAX_ACTIVE_NSP" link="NMDeviceWimax.html#NM-DEVICE-WIMAX-ACTIVE-NSP:CAPS"/>
+    <keyword type="macro" name="NM_DEVICE_WIMAX_CENTER_FREQUENCY" link="NMDeviceWimax.html#NM-DEVICE-WIMAX-CENTER-FREQUENCY:CAPS"/>
+    <keyword type="macro" name="NM_DEVICE_WIMAX_RSSI" link="NMDeviceWimax.html#NM-DEVICE-WIMAX-RSSI:CAPS"/>
+    <keyword type="macro" name="NM_DEVICE_WIMAX_CINR" link="NMDeviceWimax.html#NM-DEVICE-WIMAX-CINR:CAPS"/>
+    <keyword type="macro" name="NM_DEVICE_WIMAX_TX_POWER" link="NMDeviceWimax.html#NM-DEVICE-WIMAX-TX-POWER:CAPS"/>
+    <keyword type="macro" name="NM_DEVICE_WIMAX_BSID" link="NMDeviceWimax.html#NM-DEVICE-WIMAX-BSID:CAPS"/>
+    <keyword type="struct" name="NMDeviceWimax" link="NMDeviceWimax.html#NMDeviceWimax-struct"/>
+    <keyword type="struct" name="NMDeviceWimaxClass" link="NMDeviceWimax.html#NMDeviceWimaxClass"/>
+    <keyword type="function" name="nm_device_wimax_new ()" link="NMDeviceWimax.html#nm-device-wimax-new"/>
+    <keyword type="function" name="nm_device_wimax_get_hw_address ()" link="NMDeviceWimax.html#nm-device-wimax-get-hw-address"/>
+    <keyword type="function" name="nm_device_wimax_get_active_nsp ()" link="NMDeviceWimax.html#nm-device-wimax-get-active-nsp"/>
+    <keyword type="function" name="nm_device_wimax_get_nsp_by_path ()" link="NMDeviceWimax.html#nm-device-wimax-get-nsp-by-path"/>
+    <keyword type="function" name="nm_device_wimax_get_nsps ()" link="NMDeviceWimax.html#nm-device-wimax-get-nsps"/>
+    <keyword type="function" name="nm_device_wimax_get_center_frequency ()" link="NMDeviceWimax.html#nm-device-wimax-get-center-frequency"/>
+    <keyword type="function" name="nm_device_wimax_get_rssi ()" link="NMDeviceWimax.html#nm-device-wimax-get-rssi"/>
+    <keyword type="function" name="nm_device_wimax_get_cinr ()" link="NMDeviceWimax.html#nm-device-wimax-get-cinr"/>
+    <keyword type="function" name="nm_device_wimax_get_tx_power ()" link="NMDeviceWimax.html#nm-device-wimax-get-tx-power"/>
+    <keyword type="function" name="nm_device_wimax_get_bsid ()" link="NMDeviceWimax.html#nm-device-wimax-get-bsid"/>
+    <keyword type="property" name="The &quot;active-nsp&quot; property" link="NMDeviceWimax.html#NMDeviceWimax--active-nsp"/>
+    <keyword type="property" name="The &quot;bsid&quot; property" link="NMDeviceWimax.html#NMDeviceWimax--bsid"/>
+    <keyword type="property" name="The &quot;center-frequency&quot; property" link="NMDeviceWimax.html#NMDeviceWimax--center-frequency"/>
+    <keyword type="property" name="The &quot;cinr&quot; property" link="NMDeviceWimax.html#NMDeviceWimax--cinr"/>
+    <keyword type="property" name="The &quot;hw-address&quot; property" link="NMDeviceWimax.html#NMDeviceWimax--hw-address"/>
+    <keyword type="property" name="The &quot;rssi&quot; property" link="NMDeviceWimax.html#NMDeviceWimax--rssi"/>
+    <keyword type="property" name="The &quot;tx-power&quot; property" link="NMDeviceWimax.html#NMDeviceWimax--tx-power"/>
+    <keyword type="signal" name="The &quot;nsp-added&quot; signal" link="NMDeviceWimax.html#NMDeviceWimax-nsp-added"/>
+    <keyword type="signal" name="The &quot;nsp-removed&quot; signal" link="NMDeviceWimax.html#NMDeviceWimax-nsp-removed"/>
+    <keyword type="macro" name="NM_WIMAX_NSP_NAME" link="NMWimaxNsp.html#NM-WIMAX-NSP-NAME:CAPS"/>
+    <keyword type="macro" name="NM_WIMAX_NSP_SIGNAL_QUALITY" link="NMWimaxNsp.html#NM-WIMAX-NSP-SIGNAL-QUALITY:CAPS"/>
+    <keyword type="macro" name="NM_WIMAX_NSP_NETWORK_TYPE" link="NMWimaxNsp.html#NM-WIMAX-NSP-NETWORK-TYPE:CAPS"/>
+    <keyword type="enum" name="enum NMWimaxNspNetworkType" link="NMWimaxNsp.html#NMWimaxNspNetworkType"/>
+    <keyword type="struct" name="NMWimaxNsp" link="NMWimaxNsp.html#NMWimaxNsp-struct"/>
+    <keyword type="struct" name="NMWimaxNspClass" link="NMWimaxNsp.html#NMWimaxNspClass"/>
+    <keyword type="function" name="nm_wimax_nsp_new ()" link="NMWimaxNsp.html#nm-wimax-nsp-new"/>
+    <keyword type="function" name="nm_wimax_nsp_get_name ()" link="NMWimaxNsp.html#nm-wimax-nsp-get-name"/>
+    <keyword type="function" name="nm_wimax_nsp_get_signal_quality ()" link="NMWimaxNsp.html#nm-wimax-nsp-get-signal-quality"/>
+    <keyword type="function" name="nm_wimax_nsp_get_network_type ()" link="NMWimaxNsp.html#nm-wimax-nsp-get-network-type"/>
+    <keyword type="function" name="nm_wimax_nsp_filter_connections ()" link="NMWimaxNsp.html#nm-wimax-nsp-filter-connections"/>
+    <keyword type="property" name="The &quot;name&quot; property" link="NMWimaxNsp.html#NMWimaxNsp--name"/>
+    <keyword type="property" name="The &quot;network-type&quot; property" link="NMWimaxNsp.html#NMWimaxNsp--network-type"/>
+    <keyword type="property" name="The &quot;signal-quality&quot; property" link="NMWimaxNsp.html#NMWimaxNsp--signal-quality"/>
     <keyword type="macro" name="NM_ACCESS_POINT_FLAGS" link="NMAccessPoint.html#NM-ACCESS-POINT-FLAGS:CAPS"/>
     <keyword type="macro" name="NM_ACCESS_POINT_WPA_FLAGS" link="NMAccessPoint.html#NM-ACCESS-POINT-WPA-FLAGS:CAPS"/>
     <keyword type="macro" name="NM_ACCESS_POINT_RSN_FLAGS" link="NMAccessPoint.html#NM-ACCESS-POINT-RSN-FLAGS:CAPS"/>
     <keyword type="macro" name="NM_ACCESS_POINT_SSID" link="NMAccessPoint.html#NM-ACCESS-POINT-SSID:CAPS"/>
+    <keyword type="macro" name="NM_ACCESS_POINT_BSSID" link="NMAccessPoint.html#NM-ACCESS-POINT-BSSID:CAPS"/>
     <keyword type="macro" name="NM_ACCESS_POINT_FREQUENCY" link="NMAccessPoint.html#NM-ACCESS-POINT-FREQUENCY:CAPS"/>
-    <keyword type="macro" name="NM_ACCESS_POINT_HW_ADDRESS" link="NMAccessPoint.html#NM-ACCESS-POINT-HW-ADDRESS:CAPS"/>
     <keyword type="macro" name="NM_ACCESS_POINT_MODE" link="NMAccessPoint.html#NM-ACCESS-POINT-MODE:CAPS"/>
     <keyword type="macro" name="NM_ACCESS_POINT_MAX_BITRATE" link="NMAccessPoint.html#NM-ACCESS-POINT-MAX-BITRATE:CAPS"/>
     <keyword type="macro" name="NM_ACCESS_POINT_STRENGTH" link="NMAccessPoint.html#NM-ACCESS-POINT-STRENGTH:CAPS"/>
+    <keyword type="macro" name="NM_ACCESS_POINT_HW_ADDRESS" link="NMAccessPoint.html#NM-ACCESS-POINT-HW-ADDRESS:CAPS"/>
     <keyword type="struct" name="NMAccessPoint" link="NMAccessPoint.html#NMAccessPoint-struct"/>
     <keyword type="struct" name="NMAccessPointClass" link="NMAccessPoint.html#NMAccessPointClass"/>
     <keyword type="function" name="nm_access_point_new ()" link="NMAccessPoint.html#nm-access-point-new"/>
@@ -227,11 +278,14 @@
     <keyword type="function" name="nm_access_point_get_wpa_flags ()" link="NMAccessPoint.html#nm-access-point-get-wpa-flags"/>
     <keyword type="function" name="nm_access_point_get_rsn_flags ()" link="NMAccessPoint.html#nm-access-point-get-rsn-flags"/>
     <keyword type="function" name="nm_access_point_get_ssid ()" link="NMAccessPoint.html#nm-access-point-get-ssid"/>
+    <keyword type="function" name="nm_access_point_get_bssid ()" link="NMAccessPoint.html#nm-access-point-get-bssid"/>
     <keyword type="function" name="nm_access_point_get_frequency ()" link="NMAccessPoint.html#nm-access-point-get-frequency"/>
-    <keyword type="function" name="nm_access_point_get_hw_address ()" link="NMAccessPoint.html#nm-access-point-get-hw-address"/>
     <keyword type="function" name="nm_access_point_get_mode ()" link="NMAccessPoint.html#nm-access-point-get-mode"/>
     <keyword type="function" name="nm_access_point_get_max_bitrate ()" link="NMAccessPoint.html#nm-access-point-get-max-bitrate"/>
     <keyword type="function" name="nm_access_point_get_strength ()" link="NMAccessPoint.html#nm-access-point-get-strength"/>
+    <keyword type="function" name="nm_access_point_filter_connections ()" link="NMAccessPoint.html#nm-access-point-filter-connections"/>
+    <keyword type="function" name="nm_access_point_get_hw_address ()" link="NMAccessPoint.html#nm-access-point-get-hw-address" deprecated="0.9: Use nm_access_point_get_bssid() instead."/>
+    <keyword type="property" name="The &quot;bssid&quot; property" link="NMAccessPoint.html#NMAccessPoint--bssid"/>
     <keyword type="property" name="The &quot;flags&quot; property" link="NMAccessPoint.html#NMAccessPoint--flags"/>
     <keyword type="property" name="The &quot;frequency&quot; property" link="NMAccessPoint.html#NMAccessPoint--frequency"/>
     <keyword type="property" name="The &quot;hw-address&quot; property" link="NMAccessPoint.html#NMAccessPoint--hw-address"/>
@@ -244,21 +298,18 @@
     <keyword type="struct" name="NMIP4Config" link="NMIP4Config.html#NMIP4Config-struct"/>
     <keyword type="struct" name="NMIP4ConfigClass" link="NMIP4Config.html#NMIP4ConfigClass"/>
     <keyword type="macro" name="NM_IP4_CONFIG_ADDRESSES" link="NMIP4Config.html#NM-IP4-CONFIG-ADDRESSES:CAPS"/>
-    <keyword type="macro" name="NM_IP4_CONFIG_HOSTNAME" link="NMIP4Config.html#NM-IP4-CONFIG-HOSTNAME:CAPS"/>
     <keyword type="macro" name="NM_IP4_CONFIG_NAMESERVERS" link="NMIP4Config.html#NM-IP4-CONFIG-NAMESERVERS:CAPS"/>
     <keyword type="macro" name="NM_IP4_CONFIG_DOMAINS" link="NMIP4Config.html#NM-IP4-CONFIG-DOMAINS:CAPS"/>
     <keyword type="macro" name="NM_IP4_CONFIG_ROUTES" link="NMIP4Config.html#NM-IP4-CONFIG-ROUTES:CAPS"/>
     <keyword type="macro" name="NM_IP4_CONFIG_WINS_SERVERS" link="NMIP4Config.html#NM-IP4-CONFIG-WINS-SERVERS:CAPS"/>
     <keyword type="function" name="nm_ip4_config_new ()" link="NMIP4Config.html#nm-ip4-config-new"/>
     <keyword type="function" name="nm_ip4_config_get_addresses ()" link="NMIP4Config.html#nm-ip4-config-get-addresses"/>
-    <keyword type="function" name="nm_ip4_config_get_hostname ()" link="NMIP4Config.html#nm-ip4-config-get-hostname"/>
     <keyword type="function" name="nm_ip4_config_get_nameservers ()" link="NMIP4Config.html#nm-ip4-config-get-nameservers"/>
     <keyword type="function" name="nm_ip4_config_get_domains ()" link="NMIP4Config.html#nm-ip4-config-get-domains"/>
     <keyword type="function" name="nm_ip4_config_get_routes ()" link="NMIP4Config.html#nm-ip4-config-get-routes"/>
     <keyword type="function" name="nm_ip4_config_get_wins_servers ()" link="NMIP4Config.html#nm-ip4-config-get-wins-servers"/>
     <keyword type="property" name="The &quot;addresses&quot; property" link="NMIP4Config.html#NMIP4Config--addresses"/>
     <keyword type="property" name="The &quot;domains&quot; property" link="NMIP4Config.html#NMIP4Config--domains"/>
-    <keyword type="property" name="The &quot;hostname&quot; property" link="NMIP4Config.html#NMIP4Config--hostname"/>
     <keyword type="property" name="The &quot;nameservers&quot; property" link="NMIP4Config.html#NMIP4Config--nameservers"/>
     <keyword type="property" name="The &quot;routes&quot; property" link="NMIP4Config.html#NMIP4Config--routes"/>
     <keyword type="property" name="The &quot;wins-servers&quot; property" link="NMIP4Config.html#NMIP4Config--wins-servers"/>
@@ -291,9 +342,6 @@
     <keyword type="function" name="nm_dhcp6_config_get_options ()" link="NMDHCP6Config.html#nm-dhcp6-config-get-options"/>
     <keyword type="function" name="nm_dhcp6_config_get_one_option ()" link="NMDHCP6Config.html#nm-dhcp6-config-get-one-option"/>
     <keyword type="property" name="The &quot;options&quot; property" link="NMDHCP6Config.html#NMDHCP6Config--options"/>
-    <keyword type="struct" name="NMExportedConnection" link="NMExportedConnection.html#NMExportedConnection-struct"/>
-    <keyword type="struct" name="NMExportedConnectionClass" link="NMExportedConnection.html#NMExportedConnectionClass"/>
-    <keyword type="function" name="nm_exported_connection_new ()" link="NMExportedConnection.html#nm-exported-connection-new"/>
     <keyword type="macro" name="NM_OBJECT_DBUS_CONNECTION" link="NMObject.html#NM-OBJECT-DBUS-CONNECTION:CAPS"/>
     <keyword type="macro" name="NM_OBJECT_DBUS_PATH" link="NMObject.html#NM-OBJECT-DBUS-PATH:CAPS"/>
     <keyword type="struct" name="NMObject" link="NMObject.html#NMObject-struct"/>
@@ -302,62 +350,48 @@
     <keyword type="function" name="nm_object_get_path ()" link="NMObject.html#nm-object-get-path"/>
     <keyword type="property" name="The &quot;dbus-connection&quot; property" link="NMObject.html#NMObject--dbus-connection"/>
     <keyword type="property" name="The &quot;dbus-path&quot; property" link="NMObject.html#NMObject--dbus-path"/>
+    <keyword type="macro" name="NM_REMOTE_CONNECTION_UPDATED" link="NMRemoteConnection.html#NM-REMOTE-CONNECTION-UPDATED:CAPS"/>
+    <keyword type="macro" name="NM_REMOTE_CONNECTION_REMOVED" link="NMRemoteConnection.html#NM-REMOTE-CONNECTION-REMOVED:CAPS"/>
     <keyword type="struct" name="NMRemoteConnection" link="NMRemoteConnection.html#NMRemoteConnection-struct"/>
     <keyword type="struct" name="NMRemoteConnectionClass" link="NMRemoteConnection.html#NMRemoteConnectionClass"/>
+    <keyword type="function" name="NMRemoteConnectionCommitFunc ()" link="NMRemoteConnection.html#NMRemoteConnectionCommitFunc"/>
+    <keyword type="function" name="NMRemoteConnectionDeleteFunc ()" link="NMRemoteConnection.html#NMRemoteConnectionDeleteFunc"/>
+    <keyword type="function" name="NMRemoteConnectionGetSecretsFunc ()" link="NMRemoteConnection.html#NMRemoteConnectionGetSecretsFunc"/>
     <keyword type="function" name="nm_remote_connection_new ()" link="NMRemoteConnection.html#nm-remote-connection-new"/>
+    <keyword type="function" name="nm_remote_connection_commit_changes ()" link="NMRemoteConnection.html#nm-remote-connection-commit-changes"/>
+    <keyword type="function" name="nm_remote_connection_delete ()" link="NMRemoteConnection.html#nm-remote-connection-delete"/>
+    <keyword type="function" name="nm_remote_connection_get_secrets ()" link="NMRemoteConnection.html#nm-remote-connection-get-secrets"/>
     <keyword type="property" name="The &quot;bus&quot; property" link="NMRemoteConnection.html#NMRemoteConnection--bus"/>
     <keyword type="property" name="The &quot;init-result&quot; property" link="NMRemoteConnection.html#NMRemoteConnection--init-result"/>
+    <keyword type="signal" name="The &quot;removed&quot; signal" link="NMRemoteConnection.html#NMRemoteConnection-removed"/>
+    <keyword type="signal" name="The &quot;updated&quot; signal" link="NMRemoteConnection.html#NMRemoteConnection-updated"/>
+    <keyword type="signal" name="The &quot;visible&quot; signal" link="NMRemoteConnection.html#NMRemoteConnection-visible"/>
+    <keyword type="enum" name="enum NMRemoteSettingsError" link="NMRemoteSettings.html#NMRemoteSettingsError"/>
+    <keyword type="macro" name="NM_TYPE_REMOTE_SETTINGS_ERROR" link="NMRemoteSettings.html#NM-TYPE-REMOTE-SETTINGS-ERROR:CAPS"/>
+    <keyword type="macro" name="NM_REMOTE_SETTINGS_ERROR" link="NMRemoteSettings.html#NM-REMOTE-SETTINGS-ERROR:CAPS"/>
+    <keyword type="function" name="nm_remote_settings_error_quark ()" link="NMRemoteSettings.html#nm-remote-settings-error-quark"/>
     <keyword type="macro" name="NM_REMOTE_SETTINGS_BUS" link="NMRemoteSettings.html#NM-REMOTE-SETTINGS-BUS:CAPS"/>
-    <keyword type="macro" name="NM_REMOTE_SETTINGS_SCOPE" link="NMRemoteSettings.html#NM-REMOTE-SETTINGS-SCOPE:CAPS"/>
     <keyword type="macro" name="NM_REMOTE_SETTINGS_SERVICE_RUNNING" link="NMRemoteSettings.html#NM-REMOTE-SETTINGS-SERVICE-RUNNING:CAPS"/>
-    <keyword type="struct" name="NMRemoteSettings" link="NMRemoteSettings.html#NMRemoteSettings-struct"/>
-    <keyword type="struct" name="NMRemoteSettingsClass" link="NMRemoteSettings.html#NMRemoteSettingsClass"/>
+    <keyword type="macro" name="NM_REMOTE_SETTINGS_HOSTNAME" link="NMRemoteSettings.html#NM-REMOTE-SETTINGS-HOSTNAME:CAPS"/>
+    <keyword type="macro" name="NM_REMOTE_SETTINGS_CAN_MODIFY" link="NMRemoteSettings.html#NM-REMOTE-SETTINGS-CAN-MODIFY:CAPS"/>
+    <keyword type="macro" name="NM_REMOTE_SETTINGS_NEW_CONNECTION" link="NMRemoteSettings.html#NM-REMOTE-SETTINGS-NEW-CONNECTION:CAPS"/>
+    <keyword type="macro" name="NM_REMOTE_SETTINGS_CONNECTIONS_READ" link="NMRemoteSettings.html#NM-REMOTE-SETTINGS-CONNECTIONS-READ:CAPS"/>
+    <keyword type="function" name="NMRemoteSettingsAddConnectionFunc ()" link="NMRemoteSettings.html#NMRemoteSettingsAddConnectionFunc"/>
+    <keyword type="function" name="NMRemoteSettingsSaveHostnameFunc ()" link="NMRemoteSettings.html#NMRemoteSettingsSaveHostnameFunc"/>
+    <keyword type="struct" name="struct NMRemoteSettings" link="NMRemoteSettings.html#NMRemoteSettings-struct"/>
+    <keyword type="struct" name="struct NMRemoteSettingsClass" link="NMRemoteSettings.html#NMRemoteSettingsClass"/>
+    <keyword type="function" name="nm_remote_settings_get_type ()" link="NMRemoteSettings.html#nm-remote-settings-get-type"/>
     <keyword type="function" name="nm_remote_settings_new ()" link="NMRemoteSettings.html#nm-remote-settings-new"/>
+    <keyword type="function" name="nm_remote_settings_list_connections ()" link="NMRemoteSettings.html#nm-remote-settings-list-connections"/>
+    <keyword type="function" name="nm_remote_settings_get_connection_by_path ()" link="NMRemoteSettings.html#nm-remote-settings-get-connection-by-path"/>
+    <keyword type="function" name="nm_remote_settings_add_connection ()" link="NMRemoteSettings.html#nm-remote-settings-add-connection"/>
+    <keyword type="function" name="nm_remote_settings_save_hostname ()" link="NMRemoteSettings.html#nm-remote-settings-save-hostname"/>
     <keyword type="property" name="The &quot;bus&quot; property" link="NMRemoteSettings.html#NMRemoteSettings--bus"/>
-    <keyword type="property" name="The &quot;scope&quot; property" link="NMRemoteSettings.html#NMRemoteSettings--scope"/>
+    <keyword type="property" name="The &quot;can-modify&quot; property" link="NMRemoteSettings.html#NMRemoteSettings--can-modify"/>
+    <keyword type="property" name="The &quot;hostname&quot; property" link="NMRemoteSettings.html#NMRemoteSettings--hostname"/>
     <keyword type="property" name="The &quot;service-running&quot; property" link="NMRemoteSettings.html#NMRemoteSettings--service-running"/>
-    <keyword type="struct" name="NMRemoteSettingsSystem" link="libnm-glib-NMRemoteSettingsSystem.html#NMRemoteSettingsSystem"/>
-    <keyword type="struct" name="NMRemoteSettingsSystemClass" link="libnm-glib-NMRemoteSettingsSystem.html#NMRemoteSettingsSystemClass"/>
-    <keyword type="function" name="nm_remote_settings_system_new ()" link="libnm-glib-NMRemoteSettingsSystem.html#nm-remote-settings-system-new"/>
-    <keyword type="macro" name="NM_SETTINGS_CONNECTION_INTERFACE_UPDATED" link="libnm-glib-NMSettingsConnection.html#NM-SETTINGS-CONNECTION-INTERFACE-UPDATED:CAPS"/>
-    <keyword type="macro" name="NM_SETTINGS_CONNECTION_INTERFACE_REMOVED" link="libnm-glib-NMSettingsConnection.html#NM-SETTINGS-CONNECTION-INTERFACE-REMOVED:CAPS"/>
-    <keyword type="struct" name="NMSettingsConnectionInterface" link="libnm-glib-NMSettingsConnection.html#NMSettingsConnectionInterface-struct"/>
-    <keyword type="function" name="NMSettingsConnectionInterfaceUpdateFunc ()" link="libnm-glib-NMSettingsConnection.html#NMSettingsConnectionInterfaceUpdateFunc"/>
-    <keyword type="function" name="NMSettingsConnectionInterfaceDeleteFunc ()" link="libnm-glib-NMSettingsConnection.html#NMSettingsConnectionInterfaceDeleteFunc"/>
-    <keyword type="function" name="NMSettingsConnectionInterfaceGetSecretsFunc ()" link="libnm-glib-NMSettingsConnection.html#NMSettingsConnectionInterfaceGetSecretsFunc"/>
-    <keyword type="function" name="nm_settings_connection_interface_update ()" link="libnm-glib-NMSettingsConnection.html#nm-settings-connection-interface-update"/>
-    <keyword type="function" name="nm_settings_connection_interface_delete ()" link="libnm-glib-NMSettingsConnection.html#nm-settings-connection-interface-delete"/>
-    <keyword type="function" name="nm_settings_connection_interface_get_secrets ()" link="libnm-glib-NMSettingsConnection.html#nm-settings-connection-interface-get-secrets"/>
-    <keyword type="function" name="nm_settings_connection_interface_emit_updated ()" link="libnm-glib-NMSettingsConnection.html#nm-settings-connection-interface-emit-updated"/>
-    <keyword type="enum" name="enum NMSettingsInterfaceError" link="libnm-glib-NMSettings.html#NMSettingsInterfaceError"/>
-    <keyword type="macro" name="NM_SETTINGS_INTERFACE_ERROR" link="libnm-glib-NMSettings.html#NM-SETTINGS-INTERFACE-ERROR:CAPS"/>
-    <keyword type="function" name="nm_settings_interface_error_quark ()" link="libnm-glib-NMSettings.html#nm-settings-interface-error-quark"/>
-    <keyword type="macro" name="NM_TYPE_SETTINGS_INTERFACE_ERROR" link="libnm-glib-NMSettings.html#NM-TYPE-SETTINGS-INTERFACE-ERROR:CAPS"/>
-    <keyword type="macro" name="NM_SETTINGS_INTERFACE_NEW_CONNECTION" link="libnm-glib-NMSettings.html#NM-SETTINGS-INTERFACE-NEW-CONNECTION:CAPS"/>
-    <keyword type="macro" name="NM_SETTINGS_INTERFACE_CONNECTIONS_READ" link="libnm-glib-NMSettings.html#NM-SETTINGS-INTERFACE-CONNECTIONS-READ:CAPS"/>
-    <keyword type="struct" name="NMSettingsInterface" link="libnm-glib-NMSettings.html#NMSettingsInterface-struct"/>
-    <keyword type="function" name="NMSettingsAddConnectionFunc ()" link="libnm-glib-NMSettings.html#NMSettingsAddConnectionFunc"/>
-    <keyword type="function" name="nm_settings_interface_get_type ()" link="libnm-glib-NMSettings.html#nm-settings-interface-get-type"/>
-    <keyword type="function" name="nm_settings_interface_list_connections ()" link="libnm-glib-NMSettings.html#nm-settings-interface-list-connections"/>
-    <keyword type="function" name="nm_settings_interface_get_connection_by_path ()" link="libnm-glib-NMSettings.html#nm-settings-interface-get-connection-by-path"/>
-    <keyword type="function" name="nm_settings_interface_add_connection ()" link="libnm-glib-NMSettings.html#nm-settings-interface-add-connection"/>
-    <keyword type="macro" name="NM_SETTINGS_SERVICE_BUS" link="libnm-glib-NMSettingsService.html#NM-SETTINGS-SERVICE-BUS:CAPS"/>
-    <keyword type="macro" name="NM_SETTINGS_SERVICE_SCOPE" link="libnm-glib-NMSettingsService.html#NM-SETTINGS-SERVICE-SCOPE:CAPS"/>
-    <keyword type="struct" name="NMSettingsService" link="libnm-glib-NMSettingsService.html#NMSettingsService"/>
-    <keyword type="struct" name="NMSettingsServiceClass" link="libnm-glib-NMSettingsService.html#NMSettingsServiceClass"/>
-    <keyword type="function" name="nm_settings_service_get_connection_by_path ()" link="libnm-glib-NMSettingsService.html#nm-settings-service-get-connection-by-path"/>
-    <keyword type="function" name="nm_settings_service_export ()" link="libnm-glib-NMSettingsService.html#nm-settings-service-export"/>
-    <keyword type="function" name="nm_settings_service_export_connection ()" link="libnm-glib-NMSettingsService.html#nm-settings-service-export-connection"/>
-    <keyword type="enum" name="enum NMSettingsSystemPermissions" link="libnm-glib-NMSettingsSystem.html#NMSettingsSystemPermissions"/>
-    <keyword type="macro" name="NM_SETTINGS_SYSTEM_INTERFACE_HOSTNAME" link="libnm-glib-NMSettingsSystem.html#NM-SETTINGS-SYSTEM-INTERFACE-HOSTNAME:CAPS"/>
-    <keyword type="macro" name="NM_SETTINGS_SYSTEM_INTERFACE_CAN_MODIFY" link="libnm-glib-NMSettingsSystem.html#NM-SETTINGS-SYSTEM-INTERFACE-CAN-MODIFY:CAPS"/>
-    <keyword type="macro" name="NM_SETTINGS_SYSTEM_INTERFACE_CHECK_PERMISSIONS" link="libnm-glib-NMSettingsSystem.html#NM-SETTINGS-SYSTEM-INTERFACE-CHECK-PERMISSIONS:CAPS"/>
-    <keyword type="enum" name="enum NMSettingsSystemInterfaceProp" link="libnm-glib-NMSettingsSystem.html#NMSettingsSystemInterfaceProp"/>
-    <keyword type="struct" name="NMSettingsSystemInterface" link="libnm-glib-NMSettingsSystem.html#NMSettingsSystemInterface"/>
-    <keyword type="function" name="NMSettingsSystemSaveHostnameFunc ()" link="libnm-glib-NMSettingsSystem.html#NMSettingsSystemSaveHostnameFunc"/>
-    <keyword type="function" name="NMSettingsSystemGetPermissionsFunc ()" link="libnm-glib-NMSettingsSystem.html#NMSettingsSystemGetPermissionsFunc"/>
-    <keyword type="function" name="nm_settings_system_interface_save_hostname ()" link="libnm-glib-NMSettingsSystem.html#nm-settings-system-interface-save-hostname"/>
-    <keyword type="function" name="nm_settings_system_interface_get_permissions ()" link="libnm-glib-NMSettingsSystem.html#nm-settings-system-interface-get-permissions"/>
+    <keyword type="signal" name="The &quot;connections-read&quot; signal" link="NMRemoteSettings.html#NMRemoteSettings-connections-read"/>
+    <keyword type="signal" name="The &quot;new-connection&quot; signal" link="NMRemoteSettings.html#NMRemoteSettings-new-connection"/>
     <keyword type="macro" name="NM_TYPE_SSID" link="libnm-glib-nm-types.html#NM-TYPE-SSID:CAPS"/>
     <keyword type="function" name="nm_ssid_get_type ()" link="libnm-glib-nm-types.html#nm-ssid-get-type"/>
     <keyword type="macro" name="NM_TYPE_UINT_ARRAY" link="libnm-glib-nm-types.html#NM-TYPE-UINT-ARRAY:CAPS"/>
@@ -372,6 +406,28 @@
     <keyword type="function" name="nm_ip6_address_array_get_type ()" link="libnm-glib-nm-types.html#nm-ip6-address-array-get-type"/>
     <keyword type="macro" name="NM_TYPE_IP6_ROUTE_OBJECT_ARRAY" link="libnm-glib-nm-types.html#NM-TYPE-IP6-ROUTE-OBJECT-ARRAY:CAPS"/>
     <keyword type="function" name="nm_ip6_route_object_array_get_type ()" link="libnm-glib-nm-types.html#nm-ip6-route-object-array-get-type"/>
+    <keyword type="macro" name="NM_SECRET_AGENT_ERROR" link="NMSecretAgent.html#NM-SECRET-AGENT-ERROR:CAPS"/>
+    <keyword type="macro" name="NM_TYPE_SECRET_AGENT_ERROR" link="NMSecretAgent.html#NM-TYPE-SECRET-AGENT-ERROR:CAPS"/>
+    <keyword type="function" name="nm_secret_agent_error_quark ()" link="NMSecretAgent.html#nm-secret-agent-error-quark"/>
+    <keyword type="enum" name="enum NMSecretAgentError" link="NMSecretAgent.html#NMSecretAgentError"/>
+    <keyword type="enum" name="enum NMSecretAgentGetSecretsFlags" link="NMSecretAgent.html#NMSecretAgentGetSecretsFlags"/>
+    <keyword type="macro" name="NM_SECRET_AGENT_IDENTIFIER" link="NMSecretAgent.html#NM-SECRET-AGENT-IDENTIFIER:CAPS"/>
+    <keyword type="macro" name="NM_SECRET_AGENT_AUTO_REGISTER" link="NMSecretAgent.html#NM-SECRET-AGENT-AUTO-REGISTER:CAPS"/>
+    <keyword type="macro" name="NM_SECRET_AGENT_REGISTRATION_RESULT" link="NMSecretAgent.html#NM-SECRET-AGENT-REGISTRATION-RESULT:CAPS"/>
+    <keyword type="struct" name="NMSecretAgent" link="NMSecretAgent.html#NMSecretAgent-struct"/>
+    <keyword type="function" name="NMSecretAgentGetSecretsFunc ()" link="NMSecretAgent.html#NMSecretAgentGetSecretsFunc"/>
+    <keyword type="function" name="NMSecretAgentSaveSecretsFunc ()" link="NMSecretAgent.html#NMSecretAgentSaveSecretsFunc"/>
+    <keyword type="function" name="NMSecretAgentDeleteSecretsFunc ()" link="NMSecretAgent.html#NMSecretAgentDeleteSecretsFunc"/>
+    <keyword type="struct" name="NMSecretAgentClass" link="NMSecretAgent.html#NMSecretAgentClass"/>
+    <keyword type="function" name="nm_secret_agent_get_type ()" link="NMSecretAgent.html#nm-secret-agent-get-type"/>
+    <keyword type="function" name="nm_secret_agent_register ()" link="NMSecretAgent.html#nm-secret-agent-register"/>
+    <keyword type="function" name="nm_secret_agent_unregister ()" link="NMSecretAgent.html#nm-secret-agent-unregister"/>
+    <keyword type="function" name="nm_secret_agent_get_secrets ()" link="NMSecretAgent.html#nm-secret-agent-get-secrets"/>
+    <keyword type="function" name="nm_secret_agent_save_secrets ()" link="NMSecretAgent.html#nm-secret-agent-save-secrets"/>
+    <keyword type="function" name="nm_secret_agent_delete_secrets ()" link="NMSecretAgent.html#nm-secret-agent-delete-secrets"/>
+    <keyword type="property" name="The &quot;auto-register&quot; property" link="NMSecretAgent.html#NMSecretAgent--auto-register"/>
+    <keyword type="property" name="The &quot;identifier&quot; property" link="NMSecretAgent.html#NMSecretAgent--identifier"/>
+    <keyword type="signal" name="The &quot;registration-result&quot; signal" link="NMSecretAgent.html#NMSecretAgent-registration-result"/>
     <keyword type="macro" name="NM_VPN_CONNECTION_VPN_STATE" link="NMVPNConnection.html#NM-VPN-CONNECTION-VPN-STATE:CAPS"/>
     <keyword type="macro" name="NM_VPN_CONNECTION_BANNER" link="NMVPNConnection.html#NM-VPN-CONNECTION-BANNER:CAPS"/>
     <keyword type="struct" name="NMVPNConnection" link="NMVPNConnection.html#NMVPNConnection-struct"/>
@@ -398,8 +454,6 @@
     <keyword type="function" name="nm_vpn_plugin_failure ()" link="libnm-glib-NMVPNPlugin.html#nm-vpn-plugin-failure"/>
     <keyword type="function" name="nm_vpn_plugin_set_ip4_config ()" link="libnm-glib-NMVPNPlugin.html#nm-vpn-plugin-set-ip4-config"/>
     <keyword type="function" name="nm_vpn_plugin_disconnect ()" link="libnm-glib-NMVPNPlugin.html#nm-vpn-plugin-disconnect"/>
-    <keyword type="struct" name="NMVpnPluginUiInterface" link="libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiInterface"/>
-    <keyword type="struct" name="NMVpnPluginUiWidgetInterface" link="libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiWidgetInterface"/>
     <keyword type="function" name="NMVpnPluginUiFactory ()" link="libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiFactory"/>
     <keyword type="function" name="nm_vpn_plugin_ui_factory ()" link="libnm-glib-NMVpnPluginUi.html#nm-vpn-plugin-ui-factory"/>
     <keyword type="macro" name="NM_VPN_PLUGIN_UI_CAPABILITY_NONE" link="libnm-glib-NMVpnPluginUi.html#NM-VPN-PLUGIN-UI-CAPABILITY-NONE:CAPS"/>
@@ -409,6 +463,7 @@
     <keyword type="macro" name="NM_VPN_PLUGIN_UI_INTERFACE_DESC" link="libnm-glib-NMVpnPluginUi.html#NM-VPN-PLUGIN-UI-INTERFACE-DESC:CAPS"/>
     <keyword type="macro" name="NM_VPN_PLUGIN_UI_INTERFACE_SERVICE" link="libnm-glib-NMVpnPluginUi.html#NM-VPN-PLUGIN-UI-INTERFACE-SERVICE:CAPS"/>
     <keyword type="enum" name="enum NMVpnPluginUiInterfaceProp" link="libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiInterfaceProp"/>
+    <keyword type="struct" name="struct NMVpnPluginUiInterface" link="libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiInterface"/>
     <keyword type="function" name="nm_vpn_plugin_ui_interface_ui_factory ()" link="libnm-glib-NMVpnPluginUi.html#nm-vpn-plugin-ui-interface-ui-factory"/>
     <keyword type="function" name="nm_vpn_plugin_ui_interface_get_capabilities ()" link="libnm-glib-NMVpnPluginUi.html#nm-vpn-plugin-ui-interface-get-capabilities"/>
     <keyword type="function" name="nm_vpn_plugin_ui_interface_import ()" link="libnm-glib-NMVpnPluginUi.html#nm-vpn-plugin-ui-interface-import"/>
@@ -419,9 +474,16 @@
     <keyword type="macro" name="NM_VPN_PLUGIN_UI_WIDGET_INTERFACE()" link="libnm-glib-NMVpnPluginUi.html#NM-VPN-PLUGIN-UI-WIDGET-INTERFACE:CAPS"/>
     <keyword type="macro" name="NM_IS_VPN_PLUGIN_UI_WIDGET_INTERFACE()" link="libnm-glib-NMVpnPluginUi.html#NM-IS-VPN-PLUGIN-UI-WIDGET-INTERFACE:CAPS"/>
     <keyword type="macro" name="NM_VPN_PLUGIN_UI_WIDGET_INTERFACE_GET_INTERFACE()" link="libnm-glib-NMVpnPluginUi.html#NM-VPN-PLUGIN-UI-WIDGET-INTERFACE-GET-INTERFACE:CAPS"/>
+    <keyword type="struct" name="struct NMVpnPluginUiWidgetInterface" link="libnm-glib-NMVpnPluginUi.html#NMVpnPluginUiWidgetInterface"/>
     <keyword type="function" name="nm_vpn_plugin_ui_widget_interface_get_type ()" link="libnm-glib-NMVpnPluginUi.html#nm-vpn-plugin-ui-widget-interface-get-type"/>
     <keyword type="function" name="nm_vpn_plugin_ui_widget_interface_get_widget ()" link="libnm-glib-NMVpnPluginUi.html#nm-vpn-plugin-ui-widget-interface-get-widget"/>
     <keyword type="function" name="nm_vpn_plugin_ui_widget_interface_update_connection ()" link="libnm-glib-NMVpnPluginUi.html#nm-vpn-plugin-ui-widget-interface-update-connection"/>
     <keyword type="function" name="nm_vpn_plugin_ui_widget_interface_save_secrets ()" link="libnm-glib-NMVpnPluginUi.html#nm-vpn-plugin-ui-widget-interface-save-secrets"/>
+    <keyword type="constant" name="NM_REMOTE_SETTINGS_ERROR_UNKNOWN" link="NMRemoteSettings.html#NM-REMOTE-SETTINGS-ERROR-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_REMOTE_SETTINGS_ERROR_CONNECTION_REMOVED" link="NMRemoteSettings.html#NM-REMOTE-SETTINGS-ERROR-CONNECTION-REMOVED:CAPS"/>
+    <keyword type="constant" name="NM_REMOTE_SETTINGS_ERROR_CONNECTION_UNAVAILABLE" link="NMRemoteSettings.html#NM-REMOTE-SETTINGS-ERROR-CONNECTION-UNAVAILABLE:CAPS"/>
+    <keyword type="constant" name="NM_SECRET_AGENT_GET_SECRETS_FLAG_NONE" link="NMSecretAgent.html#NM-SECRET-AGENT-GET-SECRETS-FLAG-NONE:CAPS"/>
+    <keyword type="constant" name="NM_SECRET_AGENT_GET_SECRETS_FLAG_ALLOW_INTERACTION" link="NMSecretAgent.html#NM-SECRET-AGENT-GET-SECRETS-FLAG-ALLOW-INTERACTION:CAPS"/>
+    <keyword type="constant" name="NM_SECRET_AGENT_GET_SECRETS_FLAG_REQUEST_NEW" link="NMSecretAgent.html#NM-SECRET-AGENT-GET-SECRETS-FLAG-REQUEST-NEW:CAPS"/>
   </functions>
 </book>
diff --git a/docs/libnm-glib/html/libnm-glib.png b/docs/libnm-glib/html/libnm-glib.png
new file mode 100644
index 000000000..dc0007284
--- /dev/null
+++ b/docs/libnm-glib/html/libnm-glib.png
diff --git a/docs/libnm-glib/html/object-tree.html b/docs/libnm-glib/html/object-tree.html
new file mode 100644
index 000000000..1ebe13691
--- /dev/null
+++ b/docs/libnm-glib/html/object-tree.html
@@ -0,0 +1,53 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Object Hierarchy</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<link rel="home" href="index.html" title="libnm-glib Reference Manual">
+<link rel="up" href="index.html" title="libnm-glib Reference Manual">
+<link rel="prev" href="libnm-glib-NMVpnPluginUi.html" title="NMVpnPluginUi">
+<link rel="next" href="api-index-full.html" title="API Index">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle">
+<td><a accesskey="p" href="libnm-glib-NMVpnPluginUi.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
+<td> </td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
+<th width="100%" align="center">libnm-glib Reference Manual</th>
+<td><a accesskey="n" href="api-index-full.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="chapter">
+<div class="titlepage"><div><div><h2 class="title">
+<a name="object-tree"></a>Object Hierarchy</h2></div></div></div>
+<pre class="screen">
+    <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>
+        <a class="link" href="NMObject.html" title="NMObject">NMObject</a>
+            <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+            <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+                <a class="link" href="NMDeviceEthernet.html" title="NMDeviceEthernet">NMDeviceEthernet</a>
+                <a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi">NMDeviceWifi</a>
+                <a class="link" href="NMDeviceModem.html" title="NMDeviceModem">NMDeviceModem</a>
+                <a class="link" href="NMDeviceBt.html" title="NMDeviceBt">NMDeviceBt</a>
+                <a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax">NMDeviceWimax</a>
+            <a class="link" href="NMWimaxNsp.html" title="NMWimaxNsp">NMWimaxNsp</a>
+            <a class="link" href="NMAccessPoint.html" title="NMAccessPoint">NMAccessPoint</a>
+            <a class="link" href="NMIP4Config.html" title="NMIP4Config">NMIP4Config</a>
+            <a class="link" href="NMIP6Config.html" title="NMIP6Config">NMIP6Config</a>
+            <a class="link" href="NMActiveConnection.html" title="NMActiveConnection">NMActiveConnection</a>
+                <a class="link" href="NMVPNConnection.html" title="NMVPNConnection">NMVPNConnection</a>
+            <a class="link" href="NMDHCP4Config.html" title="NMDHCP4Config">NMDHCP4Config</a>
+            <a class="link" href="NMDHCP6Config.html" title="NMDHCP6Config">NMDHCP6Config</a>
+        <a class="link" href="NMRemoteSettings.html" title="NMRemoteSettings">NMRemoteSettings</a>
+        NMConnection
+            <a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection">NMRemoteConnection</a>
+        <a class="link" href="NMSecretAgent.html" title="NMSecretAgent">NMSecretAgent</a>
+</pre>
+</div>
+<div class="footer">
+<hr>
+          Generated by GTK-Doc V1.17</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/ref-overview.html b/docs/libnm-glib/html/ref-overview.html
new file mode 100644
index 000000000..9465073b1
--- /dev/null
+++ b/docs/libnm-glib/html/ref-overview.html
@@ -0,0 +1,47 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Object Overview</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<link rel="home" href="index.html" title="libnm-glib Reference Manual">
+<link rel="up" href="index.html" title="libnm-glib Reference Manual">
+<link rel="prev" href="index.html" title="libnm-glib Reference Manual">
+<link rel="next" href="ch02.html" title="libnm-glib API Reference">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle">
+<td><a accesskey="p" href="index.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
+<td> </td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
+<th width="100%" align="center">libnm-glib Reference Manual</th>
+<td><a accesskey="n" href="ch02.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="chapter">
+<div class="titlepage"><div><div><h2 class="title">
+<a name="ref-overview"></a>Object Overview</h2></div></div></div>
+<p>
+      libnm-glib maps closely to the actual D-Bus API that NetworkManager
+      provides, simply wrapping the remote D-Bus objects as native GObjects,
+      mapping D-Bus signals and properties to GObject signals and properties,
+      and providing helpful accessor and utility functions.  As such, objects
+      in the libnm-glib API have the same properties, behavior, signals, and
+      semantics as the NM D-Bus API.
+    </p>
+<p>
+      The following is a rough overview of the libnm-glib object structure and
+      how to use the various parts of it:
+      </p>
+<div class="mediaobject">
+<a name="libnm-glib-overview"></a><img src="libnm-glib.png">
+</div>
+<p>
+    </p>
+</div>
+<div class="footer">
+<hr>
+          Generated by GTK-Doc V1.17</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/style.css b/docs/libnm-glib/html/style.css
index d544a2c2e..d6f6c26ec 100644
--- a/docs/libnm-glib/html/style.css
+++ b/docs/libnm-glib/html/style.css
@@ -32,8 +32,9 @@
   /* this is needed so that the local anchors are displayed below the naviagtion */
   div.footnote a[name], div.refnamediv a[name], div.refsect1 a[name], div.refsect2 a[name], div.index a[name], div.glossary a[name], div.sect1 a[name]
   {
+    display: inline-block;
     position: relative;
-    padding-top:4.5em;
+    top:-5em;
   }
   /* this seems to be a bug in the xsl style sheets when generating indexes */
   div.index div.index
diff --git a/docs/libnm-glib/libnm-glib-docs.sgml b/docs/libnm-glib/libnm-glib-docs.sgml
deleted file mode 100644
index b4e5dac25..000000000
--- a/docs/libnm-glib/libnm-glib-docs.sgml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
-<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
-  <bookinfo>
-    <title>libnm-glib Reference Manual</title>
-    <releaseinfo>
-      for libnm-glib 0.8
-      The latest version of this documentation can be found on-line at
-      <ulink role="online-location" url="http://projects.gnome.org/NetworkManager/developers/libnm-glib/08/">http://projects.gnome.org/NetworkManager/developers/libnm-glib/08/</ulink>.
-    </releaseinfo>
-  </bookinfo>
-
-  <chapter>
-    <title>libnm-glib Objects</title>
-    <xi:include href="xml/nm-client.xml"/>
-    <xi:include href="xml/nm-active-connection.xml"/>
-    <xi:include href="xml/nm-device.xml"/>
-    <xi:include href="xml/nm-device-ethernet.xml"/>
-    <xi:include href="xml/nm-device-wifi.xml"/>
-    <xi:include href="xml/nm-serial-device.xml"/>
-    <xi:include href="xml/nm-gsm-device.xml"/>
-    <xi:include href="xml/nm-cdma-device.xml"/>
-    <xi:include href="xml/nm-device-bt.xml"/>
-    <xi:include href="xml/nm-access-point.xml"/>
-    <xi:include href="xml/nm-ip4-config.xml"/>
-    <xi:include href="xml/nm-ip6-config.xml"/>
-    <xi:include href="xml/nm-dhcp4-config.xml"/>
-    <xi:include href="xml/nm-dhcp6-config.xml"/>
-    <xi:include href="xml/nm-exported-connection.xml"/>
-    <xi:include href="xml/nm-object.xml"/>
-    <xi:include href="xml/nm-remote-connection.xml"/>
-    <xi:include href="xml/nm-remote-settings.xml"/>
-    <xi:include href="xml/nm-remote-settings-system.xml"/>
-    <xi:include href="xml/nm-settings-connection-interface.xml"/>
-    <xi:include href="xml/nm-settings-interface.xml"/>
-    <xi:include href="xml/nm-settings-service.xml"/>
-    <xi:include href="xml/nm-settings-system-interface.xml"/>
-    <xi:include href="xml/nm-types.xml"/>
-    <xi:include href="xml/nm-vpn-connection.xml"/>
-    <xi:include href="xml/nm-vpn-plugin.xml"/>
-    <xi:include href="xml/nm-vpn-plugin-ui-interface.xml"/>
-  </chapter>
-</book>
diff --git a/docs/libnm-glib/libnm-glib-docs.xml b/docs/libnm-glib/libnm-glib-docs.xml
new file mode 100644
index 000000000..533010e15
--- /dev/null
+++ b/docs/libnm-glib/libnm-glib-docs.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
+               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
+<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
+  <bookinfo>
+    <title>libnm-glib Reference Manual</title>
+    <releaseinfo>
+      for libnm-glib 0.9
+      The latest version of this documentation can be found on-line at
+      <ulink role="online-location" url="http://projects.gnome.org/NetworkManager/developers/libnm-glib/09/">http://projects.gnome.org/NetworkManager/developers/libnm-glib/09/</ulink>.
+    </releaseinfo>
+    <authorgroup>
+      <author>
+	<firstname>Dan</firstname>
+	<surname>Williams</surname>
+	<affiliation>
+	  <address>
+	    <email>dcbw@redhat.com</email>
+	  </address>
+	</affiliation>
+      </author>
+    </authorgroup>
+
+    <copyright>
+      <year>2011</year>
+      <holder>The NetworkManager Authors</holder>
+    </copyright>
+
+    <legalnotice>
+      <para>
+	Permission is granted to copy, distribute and/or modify this
+	document under the terms of the <citetitle>GNU Free
+	Documentation License</citetitle>, Version 1.1 or any later
+	version published by the Free Software Foundation with no
+	Invariant Sections, no Front-Cover Texts, and no Back-Cover
+	Texts. You may obtain a copy of the <citetitle>GNU Free
+	Documentation License</citetitle> from the Free Software
+	Foundation by visiting <ulink type="http"
+	url="http://www.fsf.org">their Web site</ulink> or by writing
+	to:
+
+	<address>
+	  The Free Software Foundation, Inc.,
+	  <street>59 Temple Place</street> - Suite 330,
+	  <city>Boston</city>, <state>MA</state> <postcode>02111-1307</postcode>,
+	  <country>USA</country>
+	</address>
+      </para>
+
+      <para>
+	Many of the names used by companies to distinguish their
+	products and services are claimed as trademarks. Where those
+	names appear in any GNOME documentation, and those trademarks
+	are made aware to the members of the GNOME Documentation
+	Project, the names have been printed in caps or initial caps.
+      </para>
+    </legalnotice>
+  </bookinfo>
+
+  <chapter id="ref-overview">
+    <title>Object Overview</title>
+    <para>
+      libnm-glib maps closely to the actual D-Bus API that NetworkManager
+      provides, simply wrapping the remote D-Bus objects as native GObjects,
+      mapping D-Bus signals and properties to GObject signals and properties,
+      and providing helpful accessor and utility functions.  As such, objects
+      in the libnm-glib API have the same properties, behavior, signals, and
+      semantics as the NM D-Bus API.
+    </para>
+    <para>
+      The following is a rough overview of the libnm-glib object structure and
+      how to use the various parts of it:
+      <mediaobject  id="libnm-glib-overview">
+        <imageobject>
+          <imagedata fileref="libnm-glib.png" format="PNG"/>
+        </imageobject>
+      </mediaobject>
+    </para>
+  </chapter>
+
+  <chapter>
+    <title>libnm-glib API Reference</title>
+    <xi:include href="xml/nm-client.xml"/>
+    <xi:include href="xml/nm-active-connection.xml"/>
+    <xi:include href="xml/nm-device.xml"/>
+    <xi:include href="xml/nm-device-ethernet.xml"/>
+    <xi:include href="xml/nm-device-wifi.xml"/>
+    <xi:include href="xml/nm-device-modem.xml"/>
+    <xi:include href="xml/nm-device-bt.xml"/>
+    <xi:include href="xml/nm-device-wimax.xml"/>
+    <xi:include href="xml/nm-wimax-nsp.xml"/>
+    <xi:include href="xml/nm-access-point.xml"/>
+    <xi:include href="xml/nm-ip4-config.xml"/>
+    <xi:include href="xml/nm-ip6-config.xml"/>
+    <xi:include href="xml/nm-dhcp4-config.xml"/>
+    <xi:include href="xml/nm-dhcp6-config.xml"/>
+    <xi:include href="xml/nm-object.xml"/>
+    <xi:include href="xml/nm-remote-connection.xml"/>
+    <xi:include href="xml/nm-remote-settings.xml"/>
+    <xi:include href="xml/nm-types.xml"/>
+    <xi:include href="xml/nm-secret-agent.xml"/>
+    <xi:include href="xml/nm-vpn-connection.xml"/>
+    <xi:include href="xml/nm-vpn-plugin.xml"/>
+    <xi:include href="xml/nm-vpn-plugin-ui-interface.xml"/>
+  </chapter>
+
+  <chapter id="object-tree">
+    <title>Object Hierarchy</title>
+     <xi:include href="xml/tree_index.sgml"/>
+  </chapter>
+  <index id="api-index-full">
+    <title>API Index</title>
+    <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
+  </index>
+
+  <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
+</book>
+
diff --git a/docs/libnm-glib/libnm-glib-sections.txt b/docs/libnm-glib/libnm-glib-sections.txt
index f20c39dea..14f920e57 100644
--- a/docs/libnm-glib/libnm-glib-sections.txt
+++ b/docs/libnm-glib/libnm-glib-sections.txt
@@ -1,69 +1,6 @@
 <SECTION>
-<FILE>nm-exported-connection</FILE>
-<TITLE>NMExportedConnection</TITLE>
-NMExportedConnection
-NMExportedConnectionClass
-nm_exported_connection_new
-<SUBSECTION Standard>
-NM_EXPORTED_CONNECTION
-NM_IS_EXPORTED_CONNECTION
-NM_TYPE_EXPORTED_CONNECTION
-nm_exported_connection_get_type
-NM_EXPORTED_CONNECTION_CLASS
-NM_IS_EXPORTED_CONNECTION_CLASS
-NM_EXPORTED_CONNECTION_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>nm-device</FILE>
-<TITLE>NMDevice</TITLE>
-NM_DEVICE_UDI
-NM_DEVICE_INTERFACE
-NM_DEVICE_IP_INTERFACE
-NM_DEVICE_DRIVER
-NM_DEVICE_CAPABILITIES
-NM_DEVICE_MANAGED
-NM_DEVICE_FIRMWARE_MISSING
-NM_DEVICE_IP4_CONFIG
-NM_DEVICE_DHCP4_CONFIG
-NM_DEVICE_IP6_CONFIG
-NM_DEVICE_DHCP6_CONFIG
-NM_DEVICE_STATE
-NM_DEVICE_VENDOR
-NM_DEVICE_PRODUCT
-NMDevice
-NMDeviceClass
-nm_device_new
-nm_device_get_iface
-nm_device_get_ip_iface
-nm_device_get_udi
-nm_device_get_driver
-nm_device_get_capabilities
-nm_device_get_managed
-nm_device_get_firmware_missing
-nm_device_get_ip4_config
-nm_device_get_dhcp4_config
-nm_device_get_ip6_config
-nm_device_get_dhcp6_config
-nm_device_get_state
-nm_device_get_product
-nm_device_get_vendor
-NMDeviceDeactivateFn
-nm_device_disconnect
-<SUBSECTION Standard>
-NM_DEVICE
-NM_IS_DEVICE
-NM_TYPE_DEVICE
-nm_device_get_type
-NM_DEVICE_CLASS
-NM_IS_DEVICE_CLASS
-NM_DEVICE_GET_CLASS
-</SECTION>
-
-<SECTION>
 <FILE>nm-active-connection</FILE>
 <TITLE>NMActiveConnection</TITLE>
-NM_ACTIVE_CONNECTION_SERVICE_NAME
 NM_ACTIVE_CONNECTION_CONNECTION
 NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT
 NM_ACTIVE_CONNECTION_DEVICES
@@ -73,8 +10,6 @@ NM_ACTIVE_CONNECTION_DEFAULT6
 NMActiveConnection
 NMActiveConnectionClass
 nm_active_connection_new
-nm_active_connection_get_service_name
-nm_active_connection_get_scope
 nm_active_connection_get_connection
 nm_active_connection_get_specific_object
 nm_active_connection_get_devices
@@ -92,181 +27,68 @@ NM_ACTIVE_CONNECTION_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>nm-access-point</FILE>
-<TITLE>NMAccessPoint</TITLE>
-NM_ACCESS_POINT_FLAGS
-NM_ACCESS_POINT_WPA_FLAGS
-NM_ACCESS_POINT_RSN_FLAGS
-NM_ACCESS_POINT_SSID
-NM_ACCESS_POINT_FREQUENCY
-NM_ACCESS_POINT_HW_ADDRESS
-NM_ACCESS_POINT_MODE
-NM_ACCESS_POINT_MAX_BITRATE
-NM_ACCESS_POINT_STRENGTH
-NMAccessPoint
-NMAccessPointClass
-nm_access_point_new
-nm_access_point_get_flags
-nm_access_point_get_wpa_flags
-nm_access_point_get_rsn_flags
-nm_access_point_get_ssid
-nm_access_point_get_frequency
-nm_access_point_get_hw_address
-nm_access_point_get_mode
-nm_access_point_get_max_bitrate
-nm_access_point_get_strength
-<SUBSECTION Standard>
-NM_ACCESS_POINT
-NM_IS_ACCESS_POINT
-NM_TYPE_ACCESS_POINT
-nm_access_point_get_type
-NM_ACCESS_POINT_CLASS
-NM_IS_ACCESS_POINT_CLASS
-NM_ACCESS_POINT_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>nm-vpn-connection</FILE>
-<TITLE>NMVPNConnection</TITLE>
-NM_VPN_CONNECTION_VPN_STATE
-NM_VPN_CONNECTION_BANNER
-NMVPNConnection
-NMVPNConnectionClass
-nm_vpn_connection_new
-nm_vpn_connection_get_vpn_state
-nm_vpn_connection_get_banner
-<SUBSECTION Standard>
-NM_VPN_CONNECTION
-NM_IS_VPN_CONNECTION
-NM_TYPE_VPN_CONNECTION
-nm_vpn_connection_get_type
-NM_VPN_CONNECTION_CLASS
-NM_IS_VPN_CONNECTION_CLASS
-NM_VPN_CONNECTION_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>nm-settings-connection-interface</FILE>
-<TITLE>NMSettingsConnection</TITLE>
-NM_SETTINGS_CONNECTION_INTERFACE_UPDATED
-NM_SETTINGS_CONNECTION_INTERFACE_REMOVED
-NMSettingsConnectionInterface
-NMSettingsConnectionInterfaceUpdateFunc
-NMSettingsConnectionInterfaceDeleteFunc
-NMSettingsConnectionInterfaceGetSecretsFunc
-nm_settings_connection_interface_update
-nm_settings_connection_interface_delete
-nm_settings_connection_interface_get_secrets
-nm_settings_connection_interface_emit_updated
-<SUBSECTION Standard>
-NM_SETTINGS_CONNECTION_INTERFACE
-NM_IS_SETTINGS_CONNECTION_INTERFACE
-NM_TYPE_SETTINGS_CONNECTION_INTERFACE
-nm_settings_connection_interface_get_type
-NM_SETTINGS_CONNECTION_INTERFACE_GET_INTERFACE
-</SECTION>
-
-<SECTION>
-<FILE>nm-ip4-config</FILE>
-<TITLE>NMIP4Config</TITLE>
-NMIP4Config
-NMIP4ConfigClass
-NM_IP4_CONFIG_ADDRESSES
-NM_IP4_CONFIG_HOSTNAME
-NM_IP4_CONFIG_NAMESERVERS
-NM_IP4_CONFIG_DOMAINS
-NM_IP4_CONFIG_ROUTES
-NM_IP4_CONFIG_WINS_SERVERS
-nm_ip4_config_new
-nm_ip4_config_get_addresses
-nm_ip4_config_get_hostname
-nm_ip4_config_get_nameservers
-nm_ip4_config_get_domains
-nm_ip4_config_get_routes
-nm_ip4_config_get_wins_servers
-<SUBSECTION Standard>
-NM_IP4_CONFIG
-NM_IS_IP4_CONFIG
-NM_TYPE_IP4_CONFIG
-nm_ip4_config_get_type
-NM_IP4_CONFIG_CLASS
-NM_IS_IP4_CONFIG_CLASS
-NM_IP4_CONFIG_GET_CLASS
-</SECTION>
-
-<SECTION>
 <FILE>nm-remote-settings</FILE>
 <TITLE>NMRemoteSettings</TITLE>
+NMRemoteSettingsError
+NM_TYPE_REMOTE_SETTINGS_ERROR
+NM_REMOTE_SETTINGS_ERROR
+nm_remote_settings_error_quark
 NM_REMOTE_SETTINGS_BUS
-NM_REMOTE_SETTINGS_SCOPE
 NM_REMOTE_SETTINGS_SERVICE_RUNNING
+NM_REMOTE_SETTINGS_HOSTNAME
+NM_REMOTE_SETTINGS_CAN_MODIFY
+NM_REMOTE_SETTINGS_NEW_CONNECTION
+NM_REMOTE_SETTINGS_CONNECTIONS_READ
+NMRemoteSettingsAddConnectionFunc
+NMRemoteSettingsSaveHostnameFunc
 NMRemoteSettings
 NMRemoteSettingsClass
+nm_remote_settings_get_type
 nm_remote_settings_new
+nm_remote_settings_list_connections
+nm_remote_settings_get_connection_by_path
+nm_remote_settings_add_connection
+nm_remote_settings_save_hostname
 <SUBSECTION Standard>
 NM_REMOTE_SETTINGS
 NM_IS_REMOTE_SETTINGS
 NM_TYPE_REMOTE_SETTINGS
-nm_remote_settings_get_type
+nm_remote_settings_error_get_type
 NM_REMOTE_SETTINGS_CLASS
 NM_IS_REMOTE_SETTINGS_CLASS
 NM_REMOTE_SETTINGS_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>nm-ip6-config</FILE>
-<TITLE>NMIP6Config</TITLE>
-NMIP6Config
-NMIP6ConfigClass
-NM_IP6_CONFIG_ADDRESSES
-NM_IP6_CONFIG_NAMESERVERS
-NM_IP6_CONFIG_DOMAINS
-NM_IP6_CONFIG_ROUTES
-nm_ip6_config_new
-nm_ip6_config_get_addresses
-nm_ip6_config_get_nameservers
-nm_ip6_config_get_domains
-nm_ip6_config_get_routes
+<FILE>nm-device-wimax</FILE>
+<TITLE>NMDeviceWimax</TITLE>
+NM_DEVICE_WIMAX_HW_ADDRESS
+NM_DEVICE_WIMAX_ACTIVE_NSP
+NM_DEVICE_WIMAX_CENTER_FREQUENCY
+NM_DEVICE_WIMAX_RSSI
+NM_DEVICE_WIMAX_CINR
+NM_DEVICE_WIMAX_TX_POWER
+NM_DEVICE_WIMAX_BSID
+NMDeviceWimax
+NMDeviceWimaxClass
+nm_device_wimax_new
+nm_device_wimax_get_hw_address
+nm_device_wimax_get_active_nsp
+nm_device_wimax_get_nsp_by_path
+nm_device_wimax_get_nsps
+nm_device_wimax_get_center_frequency
+nm_device_wimax_get_rssi
+nm_device_wimax_get_cinr
+nm_device_wimax_get_tx_power
+nm_device_wimax_get_bsid
 <SUBSECTION Standard>
-NM_IP6_CONFIG
-NM_IS_IP6_CONFIG
-NM_TYPE_IP6_CONFIG
-nm_ip6_config_get_type
-NM_IP6_CONFIG_CLASS
-NM_IS_IP6_CONFIG_CLASS
-NM_IP6_CONFIG_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>nm-remote-settings-system</FILE>
-<TITLE>NMRemoteSettingsSystem</TITLE>
-NMRemoteSettingsSystem
-NMRemoteSettingsSystemClass
-nm_remote_settings_system_new
-<SUBSECTION Standard>
-NM_REMOTE_SETTINGS_SYSTEM
-NM_IS_REMOTE_SETTINGS_SYSTEM
-NM_TYPE_REMOTE_SETTINGS_SYSTEM
-nm_remote_settings_system_get_type
-NM_REMOTE_SETTINGS_SYSTEM_CLASS
-NM_IS_REMOTE_SETTINGS_SYSTEM_CLASS
-NM_REMOTE_SETTINGS_SYSTEM_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>nm-cdma-device</FILE>
-<TITLE>NMCdmaDevice</TITLE>
-NMCdmaDevice
-NMCdmaDeviceClass
-nm_cdma_device_new
-<SUBSECTION Standard>
-NM_CDMA_DEVICE
-NM_IS_CDMA_DEVICE
-NM_TYPE_CDMA_DEVICE
-nm_cdma_device_get_type
-NM_CDMA_DEVICE_CLASS
-NM_IS_CDMA_DEVICE_CLASS
-NM_CDMA_DEVICE_GET_CLASS
+NM_DEVICE_WIMAX
+NM_IS_DEVICE_WIMAX
+NM_TYPE_DEVICE_WIMAX
+nm_device_wimax_get_type
+NM_DEVICE_WIMAX_CLASS
+NM_IS_DEVICE_WIMAX_CLASS
+NM_DEVICE_WIMAX_GET_CLASS
 </SECTION>
 
 <SECTION>
@@ -300,21 +122,213 @@ NM_DEVICE_WIFI_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>nm-dhcp4-config</FILE>
-<TITLE>NMDHCP4Config</TITLE>
-NMDHCP4Config
-NMDHCP4ConfigClass
-NM_DHCP4_CONFIG_OPTIONS
-nm_dhcp4_config_new
-nm_dhcp4_config_get_options
-nm_dhcp4_config_get_one_option
+<FILE>nm-dhcp6-config</FILE>
+<TITLE>NMDHCP6Config</TITLE>
+NMDHCP6Config
+NMDHCP6ConfigClass
+NM_DHCP6_CONFIG_OPTIONS
+nm_dhcp6_config_new
+nm_dhcp6_config_get_options
+nm_dhcp6_config_get_one_option
 <SUBSECTION Standard>
-NM_DHCP4_CONFIG
-NM_IS_DHCP4_CONFIG
-NM_TYPE_DHCP4_CONFIG
-nm_dhcp4_config_get_type
-NM_DHCP4_CONFIG_CLASS
-NM_IS_DHCP4_CONFIG_CLASS
+NM_DHCP6_CONFIG
+NM_IS_DHCP6_CONFIG
+NM_TYPE_DHCP6_CONFIG
+nm_dhcp6_config_get_type
+NM_DHCP6_CONFIG_CLASS
+NM_IS_DHCP6_CONFIG_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>nm-object</FILE>
+<TITLE>NMObject</TITLE>
+NM_OBJECT_DBUS_CONNECTION
+NM_OBJECT_DBUS_PATH
+NMObject
+NMObjectClass
+nm_object_get_connection
+nm_object_get_path
+<SUBSECTION Standard>
+NM_OBJECT
+NM_IS_OBJECT
+NM_TYPE_OBJECT
+nm_object_get_type
+NM_OBJECT_CLASS
+NM_IS_OBJECT_CLASS
+NM_OBJECT_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>nm-secret-agent</FILE>
+<TITLE>NMSecretAgent</TITLE>
+NM_SECRET_AGENT_ERROR
+NM_TYPE_SECRET_AGENT_ERROR
+nm_secret_agent_error_quark
+NMSecretAgentError
+NMSecretAgentGetSecretsFlags
+NM_SECRET_AGENT_IDENTIFIER
+NM_SECRET_AGENT_AUTO_REGISTER
+NM_SECRET_AGENT_REGISTRATION_RESULT
+NMSecretAgent
+NMSecretAgentGetSecretsFunc
+NMSecretAgentSaveSecretsFunc
+NMSecretAgentDeleteSecretsFunc
+NMSecretAgentClass
+nm_secret_agent_get_type
+nm_secret_agent_register
+nm_secret_agent_unregister
+nm_secret_agent_get_secrets
+nm_secret_agent_save_secrets
+nm_secret_agent_delete_secrets
+<SUBSECTION Standard>
+NM_SECRET_AGENT
+NM_IS_SECRET_AGENT
+NM_TYPE_SECRET_AGENT
+nm_secret_agent_error_get_type
+NM_SECRET_AGENT_CLASS
+NM_IS_SECRET_AGENT_CLASS
+NM_SECRET_AGENT_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>nm-ip4-config</FILE>
+<TITLE>NMIP4Config</TITLE>
+NMIP4Config
+NMIP4ConfigClass
+NM_IP4_CONFIG_ADDRESSES
+NM_IP4_CONFIG_NAMESERVERS
+NM_IP4_CONFIG_DOMAINS
+NM_IP4_CONFIG_ROUTES
+NM_IP4_CONFIG_WINS_SERVERS
+nm_ip4_config_new
+nm_ip4_config_get_addresses
+nm_ip4_config_get_nameservers
+nm_ip4_config_get_domains
+nm_ip4_config_get_routes
+nm_ip4_config_get_wins_servers
+<SUBSECTION Standard>
+NM_IP4_CONFIG
+NM_IS_IP4_CONFIG
+NM_TYPE_IP4_CONFIG
+nm_ip4_config_get_type
+NM_IP4_CONFIG_CLASS
+NM_IS_IP4_CONFIG_CLASS
+NM_IP4_CONFIG_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>nm-vpn-plugin</FILE>
+<TITLE>NMVPNPlugin</TITLE>
+NM_VPN_PLUGIN_DBUS_SERVICE_NAME
+NM_VPN_PLUGIN_STATE
+NMVPNPluginError
+NM_VPN_PLUGIN_ERROR
+NM_TYPE_VPN_PLUGIN_ERROR
+NMVPNPlugin
+NMVPNPluginClass
+nm_vpn_plugin_error_quark
+nm_vpn_plugin_error_get_type
+nm_vpn_plugin_get_connection
+nm_vpn_plugin_get_state
+nm_vpn_plugin_set_state
+nm_vpn_plugin_set_login_banner
+nm_vpn_plugin_failure
+nm_vpn_plugin_set_ip4_config
+nm_vpn_plugin_disconnect
+<SUBSECTION Standard>
+NM_VPN_PLUGIN
+NM_IS_VPN_PLUGIN
+NM_TYPE_VPN_PLUGIN
+nm_vpn_plugin_get_type
+NM_VPN_PLUGIN_CLASS
+NM_IS_VPN_PLUGIN_CLASS
+NM_VPN_PLUGIN_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>nm-access-point</FILE>
+<TITLE>NMAccessPoint</TITLE>
+NM_ACCESS_POINT_FLAGS
+NM_ACCESS_POINT_WPA_FLAGS
+NM_ACCESS_POINT_RSN_FLAGS
+NM_ACCESS_POINT_SSID
+NM_ACCESS_POINT_BSSID
+NM_ACCESS_POINT_FREQUENCY
+NM_ACCESS_POINT_MODE
+NM_ACCESS_POINT_MAX_BITRATE
+NM_ACCESS_POINT_STRENGTH
+NM_ACCESS_POINT_HW_ADDRESS
+NMAccessPoint
+NMAccessPointClass
+nm_access_point_new
+nm_access_point_get_flags
+nm_access_point_get_wpa_flags
+nm_access_point_get_rsn_flags
+nm_access_point_get_ssid
+nm_access_point_get_bssid
+nm_access_point_get_frequency
+nm_access_point_get_mode
+nm_access_point_get_max_bitrate
+nm_access_point_get_strength
+nm_access_point_filter_connections
+nm_access_point_get_hw_address
+<SUBSECTION Standard>
+NM_ACCESS_POINT
+NM_IS_ACCESS_POINT
+NM_TYPE_ACCESS_POINT
+nm_access_point_get_type
+NM_ACCESS_POINT_CLASS
+NM_IS_ACCESS_POINT_CLASS
+NM_ACCESS_POINT_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>nm-device</FILE>
+<TITLE>NMDevice</TITLE>
+NM_DEVICE_DEVICE_TYPE
+NM_DEVICE_UDI
+NM_DEVICE_INTERFACE
+NM_DEVICE_IP_INTERFACE
+NM_DEVICE_DRIVER
+NM_DEVICE_CAPABILITIES
+NM_DEVICE_MANAGED
+NM_DEVICE_FIRMWARE_MISSING
+NM_DEVICE_IP4_CONFIG
+NM_DEVICE_DHCP4_CONFIG
+NM_DEVICE_IP6_CONFIG
+NM_DEVICE_DHCP6_CONFIG
+NM_DEVICE_STATE
+NM_DEVICE_VENDOR
+NM_DEVICE_PRODUCT
+NMDevice
+NMDeviceClass
+nm_device_new
+nm_device_get_iface
+nm_device_get_ip_iface
+nm_device_get_device_type
+nm_device_get_udi
+nm_device_get_driver
+nm_device_get_capabilities
+nm_device_get_managed
+nm_device_get_firmware_missing
+nm_device_get_ip4_config
+nm_device_get_dhcp4_config
+nm_device_get_ip6_config
+nm_device_get_dhcp6_config
+nm_device_get_state
+nm_device_get_product
+nm_device_get_vendor
+NMDeviceDeactivateFn
+nm_device_disconnect
+nm_device_filter_connections
+<SUBSECTION Standard>
+NM_DEVICE
+NM_IS_DEVICE
+NM_TYPE_DEVICE
+nm_device_get_type
+NM_DEVICE_CLASS
+NM_IS_DEVICE_CLASS
+NM_DEVICE_GET_CLASS
 </SECTION>
 
 <SECTION>
@@ -342,105 +356,29 @@ NM_DEVICE_ETHERNET_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>nm-dhcp6-config</FILE>
-<TITLE>NMDHCP6Config</TITLE>
-NMDHCP6Config
-NMDHCP6ConfigClass
-NM_DHCP6_CONFIG_OPTIONS
-nm_dhcp6_config_new
-nm_dhcp6_config_get_options
-nm_dhcp6_config_get_one_option
-<SUBSECTION Standard>
-NM_DHCP6_CONFIG
-NM_IS_DHCP6_CONFIG
-NM_TYPE_DHCP6_CONFIG
-nm_dhcp6_config_get_type
-NM_DHCP6_CONFIG_CLASS
-NM_IS_DHCP6_CONFIG_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>nm-client</FILE>
-<TITLE>NMClient</TITLE>
-NM_CLIENT_STATE
-NM_CLIENT_MANAGER_RUNNING
-NM_CLIENT_NETWORKING_ENABLED
-NM_CLIENT_WIRELESS_ENABLED
-NM_CLIENT_WIRELESS_HARDWARE_ENABLED
-NM_CLIENT_WWAN_ENABLED
-NM_CLIENT_WWAN_HARDWARE_ENABLED
-NM_CLIENT_ACTIVE_CONNECTIONS
-NMClientPermission
-NMClientPermissionResult
-NMClient
-NMClientClass
-nm_client_new
-nm_client_get_devices
-nm_client_get_device_by_path
-NMClientActivateDeviceFn
-nm_client_activate_connection
-nm_client_deactivate_connection
-nm_client_networking_get_enabled
-nm_client_networking_set_enabled
-nm_client_wireless_get_enabled
-nm_client_wireless_set_enabled
-nm_client_wireless_hardware_get_enabled
-nm_client_wwan_get_enabled
-nm_client_wwan_set_enabled
-nm_client_wwan_hardware_get_enabled
-nm_client_get_state
-nm_client_get_manager_running
-nm_client_get_active_connections
-nm_client_sleep
-nm_client_get_permission_result
-<SUBSECTION Standard>
-NM_CLIENT
-NM_IS_CLIENT
-NM_TYPE_CLIENT
-nm_client_get_type
-NM_CLIENT_CLASS
-NM_IS_CLIENT_CLASS
-NM_CLIENT_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>nm-remote-connection</FILE>
-<TITLE>NMRemoteConnection</TITLE>
-NMRemoteConnection
-NMRemoteConnectionClass
-nm_remote_connection_new
-<SUBSECTION Standard>
-NM_REMOTE_CONNECTION
-NM_IS_REMOTE_CONNECTION
-NM_TYPE_REMOTE_CONNECTION
-nm_remote_connection_get_type
-NM_REMOTE_CONNECTION_CLASS
-NM_IS_REMOTE_CONNECTION_CLASS
-NM_REMOTE_CONNECTION_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>nm-gsm-device</FILE>
-<TITLE>NMGsmDevice</TITLE>
-NMGsmDevice
-NMGsmDeviceClass
-nm_gsm_device_new
+<FILE>nm-vpn-connection</FILE>
+<TITLE>NMVPNConnection</TITLE>
+NM_VPN_CONNECTION_VPN_STATE
+NM_VPN_CONNECTION_BANNER
+NMVPNConnection
+NMVPNConnectionClass
+nm_vpn_connection_new
+nm_vpn_connection_get_vpn_state
+nm_vpn_connection_get_banner
 <SUBSECTION Standard>
-NM_GSM_DEVICE
-NM_IS_GSM_DEVICE
-NM_TYPE_GSM_DEVICE
-nm_gsm_device_get_type
-NM_GSM_DEVICE_CLASS
-NM_IS_GSM_DEVICE_CLASS
-NM_GSM_DEVICE_GET_CLASS
+NM_VPN_CONNECTION
+NM_IS_VPN_CONNECTION
+NM_TYPE_VPN_CONNECTION
+nm_vpn_connection_get_type
+NM_VPN_CONNECTION_CLASS
+NM_IS_VPN_CONNECTION_CLASS
+NM_VPN_CONNECTION_GET_CLASS
 </SECTION>
 
 <SECTION>
 <FILE>nm-vpn-plugin-ui-interface</FILE>
 <TITLE>NMVpnPluginUiWidget</TITLE>
 <TITLE>NMVpnPluginUi</TITLE>
-NMVpnPluginUiInterface
-NMVpnPluginUiWidgetInterface
 NMVpnPluginUiFactory
 nm_vpn_plugin_ui_factory
 NM_VPN_PLUGIN_UI_CAPABILITY_NONE
@@ -450,6 +388,7 @@ NM_VPN_PLUGIN_UI_INTERFACE_NAME
 NM_VPN_PLUGIN_UI_INTERFACE_DESC
 NM_VPN_PLUGIN_UI_INTERFACE_SERVICE
 NMVpnPluginUiInterfaceProp
+NMVpnPluginUiInterface
 nm_vpn_plugin_ui_interface_ui_factory
 nm_vpn_plugin_ui_interface_get_capabilities
 nm_vpn_plugin_ui_interface_import
@@ -460,6 +399,7 @@ NM_TYPE_VPN_PLUGIN_UI_WIDGET_INTERFACE
 NM_VPN_PLUGIN_UI_WIDGET_INTERFACE
 NM_IS_VPN_PLUGIN_UI_WIDGET_INTERFACE
 NM_VPN_PLUGIN_UI_WIDGET_INTERFACE_GET_INTERFACE
+NMVpnPluginUiWidgetInterface
 nm_vpn_plugin_ui_widget_interface_get_type
 nm_vpn_plugin_ui_widget_interface_get_widget
 nm_vpn_plugin_ui_widget_interface_update_connection
@@ -473,109 +413,70 @@ NM_VPN_PLUGIN_UI_INTERFACE_GET_INTERFACE
 </SECTION>
 
 <SECTION>
-<FILE>nm-vpn-plugin</FILE>
-<TITLE>NMVPNPlugin</TITLE>
-NM_VPN_PLUGIN_DBUS_SERVICE_NAME
-NM_VPN_PLUGIN_STATE
-NMVPNPluginError
-NM_VPN_PLUGIN_ERROR
-NM_TYPE_VPN_PLUGIN_ERROR
-NMVPNPlugin
-NMVPNPluginClass
-nm_vpn_plugin_error_quark
-nm_vpn_plugin_error_get_type
-nm_vpn_plugin_get_connection
-nm_vpn_plugin_get_state
-nm_vpn_plugin_set_state
-nm_vpn_plugin_set_login_banner
-nm_vpn_plugin_failure
-nm_vpn_plugin_set_ip4_config
-nm_vpn_plugin_disconnect
-<SUBSECTION Standard>
-NM_VPN_PLUGIN
-NM_IS_VPN_PLUGIN
-NM_TYPE_VPN_PLUGIN
-nm_vpn_plugin_get_type
-NM_VPN_PLUGIN_CLASS
-NM_IS_VPN_PLUGIN_CLASS
-NM_VPN_PLUGIN_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>nm-serial-device</FILE>
-<TITLE>NMSerialDevice</TITLE>
-NMSerialDevice
-NMSerialDeviceClass
-nm_serial_device_get_bytes_received
-nm_serial_device_get_bytes_sent
+<FILE>nm-ip6-config</FILE>
+<TITLE>NMIP6Config</TITLE>
+NMIP6Config
+NMIP6ConfigClass
+NM_IP6_CONFIG_ADDRESSES
+NM_IP6_CONFIG_NAMESERVERS
+NM_IP6_CONFIG_DOMAINS
+NM_IP6_CONFIG_ROUTES
+nm_ip6_config_new
+nm_ip6_config_get_addresses
+nm_ip6_config_get_nameservers
+nm_ip6_config_get_domains
+nm_ip6_config_get_routes
 <SUBSECTION Standard>
-NM_SERIAL_DEVICE
-NM_IS_SERIAL_DEVICE
-NM_TYPE_SERIAL_DEVICE
-nm_serial_device_get_type
-NM_SERIAL_DEVICE_CLASS
-NM_IS_SERIAL_DEVICE_CLASS
-NM_SERIAL_DEVICE_GET_CLASS
+NM_IP6_CONFIG
+NM_IS_IP6_CONFIG
+NM_TYPE_IP6_CONFIG
+nm_ip6_config_get_type
+NM_IP6_CONFIG_CLASS
+NM_IS_IP6_CONFIG_CLASS
+NM_IP6_CONFIG_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>nm-settings-system-interface</FILE>
-<TITLE>NMSettingsSystem</TITLE>
-NMSettingsSystemPermissions
-NM_SETTINGS_SYSTEM_INTERFACE_HOSTNAME
-NM_SETTINGS_SYSTEM_INTERFACE_CAN_MODIFY
-NM_SETTINGS_SYSTEM_INTERFACE_CHECK_PERMISSIONS
-NMSettingsSystemInterfaceProp
-NMSettingsSystemInterface
-NMSettingsSystemSaveHostnameFunc
-NMSettingsSystemGetPermissionsFunc
-nm_settings_system_interface_save_hostname
-nm_settings_system_interface_get_permissions
+<FILE>nm-device-modem</FILE>
+<TITLE>NMDeviceModem</TITLE>
+NM_DEVICE_MODEM_MODEM_CAPABILITIES
+NM_DEVICE_MODEM_CURRENT_CAPABILITIES
+NMDeviceModem
+NMDeviceModemClass
+nm_device_modem_get_modem_capabilities
+nm_device_modem_get_current_capabilities
 <SUBSECTION Standard>
-NM_SETTINGS_SYSTEM_INTERFACE
-NM_IS_SETTINGS_SYSTEM_INTERFACE
-NM_TYPE_SETTINGS_SYSTEM_INTERFACE
-nm_settings_system_interface_get_type
-NM_SETTINGS_SYSTEM_INTERFACE_GET_INTERFACE
+NM_DEVICE_MODEM
+NM_IS_DEVICE_MODEM
+NM_TYPE_DEVICE_MODEM
+nm_device_modem_get_type
+NM_DEVICE_MODEM_CLASS
+NM_IS_DEVICE_MODEM_CLASS
+NM_DEVICE_MODEM_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>nm-settings-service</FILE>
-<TITLE>NMSettingsService</TITLE>
-NM_SETTINGS_SERVICE_BUS
-NM_SETTINGS_SERVICE_SCOPE
-NMSettingsService
-NMSettingsServiceClass
-nm_settings_service_get_connection_by_path
-nm_settings_service_export
-nm_settings_service_export_connection
+<FILE>nm-wimax-nsp</FILE>
+<TITLE>NMWimaxNsp</TITLE>
+NM_WIMAX_NSP_NAME
+NM_WIMAX_NSP_SIGNAL_QUALITY
+NM_WIMAX_NSP_NETWORK_TYPE
+NMWimaxNspNetworkType
+NMWimaxNsp
+NMWimaxNspClass
+nm_wimax_nsp_new
+nm_wimax_nsp_get_name
+nm_wimax_nsp_get_signal_quality
+nm_wimax_nsp_get_network_type
+nm_wimax_nsp_filter_connections
 <SUBSECTION Standard>
-NM_SETTINGS_SERVICE
-NM_IS_SETTINGS_SERVICE
-NM_TYPE_SETTINGS_SERVICE
-nm_settings_service_get_type
-NM_SETTINGS_SERVICE_CLASS
-NM_IS_SETTINGS_SERVICE_CLASS
-NM_SETTINGS_SERVICE_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>nm-object</FILE>
-<TITLE>NMObject</TITLE>
-NM_OBJECT_DBUS_CONNECTION
-NM_OBJECT_DBUS_PATH
-NMObject
-NMObjectClass
-nm_object_get_connection
-nm_object_get_path
-<SUBSECTION Standard>
-NM_OBJECT
-NM_IS_OBJECT
-NM_TYPE_OBJECT
-nm_object_get_type
-NM_OBJECT_CLASS
-NM_IS_OBJECT_CLASS
-NM_OBJECT_GET_CLASS
+NM_WIMAX_NSP
+NM_IS_WIMAX_NSP
+NM_TYPE_WIMAX_NSP
+nm_wimax_nsp_get_type
+NM_WIMAX_NSP_CLASS
+NM_IS_WIMAX_NSP_CLASS
+NM_WIMAX_NSP_GET_CLASS
 </SECTION>
 
 <SECTION>
@@ -601,53 +502,116 @@ NM_DEVICE_BT_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>nm-settings-interface</FILE>
-<TITLE>NMSettings</TITLE>
-NMSettingsInterfaceError
-NM_SETTINGS_INTERFACE_ERROR
-nm_settings_interface_error_quark
-NM_TYPE_SETTINGS_INTERFACE_ERROR
-NM_SETTINGS_INTERFACE_NEW_CONNECTION
-NM_SETTINGS_INTERFACE_CONNECTIONS_READ
-NMSettingsInterface
-NMSettingsAddConnectionFunc
-nm_settings_interface_get_type
-nm_settings_interface_list_connections
-nm_settings_interface_get_connection_by_path
-nm_settings_interface_add_connection
+<FILE>nm-client</FILE>
+<TITLE>NMClient</TITLE>
+NM_CLIENT_VERSION
+NM_CLIENT_STATE
+NM_CLIENT_MANAGER_RUNNING
+NM_CLIENT_NETWORKING_ENABLED
+NM_CLIENT_WIRELESS_ENABLED
+NM_CLIENT_WIRELESS_HARDWARE_ENABLED
+NM_CLIENT_WWAN_ENABLED
+NM_CLIENT_WWAN_HARDWARE_ENABLED
+NM_CLIENT_WIMAX_ENABLED
+NM_CLIENT_WIMAX_HARDWARE_ENABLED
+NM_CLIENT_ACTIVE_CONNECTIONS
+NMClientPermission
+NMClientPermissionResult
+NMClient
+NMClientClass
+nm_client_new
+nm_client_get_devices
+nm_client_get_device_by_path
+NMClientActivateFn
+nm_client_activate_connection
+NMClientAddActivateFn
+nm_client_add_and_activate_connection
+nm_client_deactivate_connection
+nm_client_networking_get_enabled
+nm_client_networking_set_enabled
+nm_client_wireless_get_enabled
+nm_client_wireless_set_enabled
+nm_client_wireless_hardware_get_enabled
+nm_client_wwan_get_enabled
+nm_client_wwan_set_enabled
+nm_client_wwan_hardware_get_enabled
+nm_client_wimax_get_enabled
+nm_client_wimax_set_enabled
+nm_client_wimax_hardware_get_enabled
+nm_client_get_version
+nm_client_get_state
+nm_client_get_manager_running
+nm_client_get_active_connections
+nm_client_sleep
+nm_client_get_permission_result
+<SUBSECTION Standard>
+NM_CLIENT
+NM_IS_CLIENT
+NM_TYPE_CLIENT
+nm_client_get_type
+NM_CLIENT_CLASS
+NM_IS_CLIENT_CLASS
+NM_CLIENT_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>nm-dhcp4-config</FILE>
+<TITLE>NMDHCP4Config</TITLE>
+NMDHCP4Config
+NMDHCP4ConfigClass
+NM_DHCP4_CONFIG_OPTIONS
+nm_dhcp4_config_new
+nm_dhcp4_config_get_options
+nm_dhcp4_config_get_one_option
 <SUBSECTION Standard>
-NM_SETTINGS_INTERFACE
-NM_IS_SETTINGS_INTERFACE
-NM_TYPE_SETTINGS_INTERFACE
-nm_settings_interface_error_get_type
-NM_SETTINGS_INTERFACE_GET_INTERFACE
+NM_DHCP4_CONFIG
+NM_IS_DHCP4_CONFIG
+NM_TYPE_DHCP4_CONFIG
+nm_dhcp4_config_get_type
+NM_DHCP4_CONFIG_CLASS
+NM_IS_DHCP4_CONFIG_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>nm-device-wimax-bindings</FILE>
-DBUS_GLIB_CLIENT_WRAPPERS_org_freedesktop_NetworkManager_Device_WiMax
-org_freedesktop_NetworkManager_Device_WiMax_get_nsp_list
-org_freedesktop_NetworkManager_Device_WiMax_get_nsp_list_reply
-org_freedesktop_NetworkManager_Device_WiMax_get_nsp_list_async
-dbus_g_proxy_begin_call
+<FILE>nm-remote-connection</FILE>
+<TITLE>NMRemoteConnection</TITLE>
+NM_REMOTE_CONNECTION_UPDATED
+NM_REMOTE_CONNECTION_REMOVED
+NMRemoteConnection
+NMRemoteConnectionClass
+NMRemoteConnectionCommitFunc
+NMRemoteConnectionDeleteFunc
+NMRemoteConnectionGetSecretsFunc
+nm_remote_connection_new
+nm_remote_connection_commit_changes
+nm_remote_connection_delete
+nm_remote_connection_get_secrets
+<SUBSECTION Standard>
+NM_REMOTE_CONNECTION
+NM_IS_REMOTE_CONNECTION
+NM_TYPE_REMOTE_CONNECTION
+nm_remote_connection_get_type
+NM_REMOTE_CONNECTION_CLASS
+NM_IS_REMOTE_CONNECTION_CLASS
+NM_REMOTE_CONNECTION_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>nm-settings-connection-bindings</FILE>
-DBUS_GLIB_CLIENT_WRAPPERS_org_freedesktop_NetworkManager_Settings_Connection
-org_freedesktop_NetworkManager_Settings_Connection_update
-org_freedesktop_NetworkManager_Settings_Connection_update_reply
-org_freedesktop_NetworkManager_Settings_Connection_update_async
-dbus_g_proxy_begin_call
-org_freedesktop_NetworkManager_Settings_Connection_delete
-org_freedesktop_NetworkManager_Settings_Connection_delete_reply
-org_freedesktop_NetworkManager_Settings_Connection_delete_async
-org_freedesktop_NetworkManager_Settings_Connection_get_settings
-org_freedesktop_NetworkManager_Settings_Connection_get_settings_reply
-org_freedesktop_NetworkManager_Settings_Connection_get_settings_async
-org_freedesktop_NetworkManager_Settings_Connection_get_secrets
-org_freedesktop_NetworkManager_Settings_Connection_get_secrets_reply
-org_freedesktop_NetworkManager_Settings_Connection_get_secrets_async
+<FILE>nm-types</FILE>
+NM_TYPE_SSID
+nm_ssid_get_type
+NM_TYPE_UINT_ARRAY
+nm_uint_array_get_type
+NM_TYPE_STRING_ARRAY
+nm_string_array_get_type
+NM_TYPE_OBJECT_ARRAY
+nm_object_array_get_type
+NM_TYPE_IP6_ADDRESS_OBJECT_ARRAY
+nm_ip6_address_object_array_get_type
+NM_TYPE_IP6_ADDRESS_ARRAY
+nm_ip6_address_array_get_type
+NM_TYPE_IP6_ROUTE_OBJECT_ARRAY
+nm_ip6_route_object_array_get_type
 </SECTION>
 
 <SECTION>
@@ -680,25 +644,8 @@ dbus_glib_marshal_nm_secret_agent_NONE__BOXED_BOXED_POINTER
 </SECTION>
 
 <SECTION>
-<FILE>nm-types</FILE>
-NM_TYPE_SSID
-nm_ssid_get_type
-NM_TYPE_UINT_ARRAY
-nm_uint_array_get_type
-NM_TYPE_STRING_ARRAY
-nm_string_array_get_type
-NM_TYPE_OBJECT_ARRAY
-nm_object_array_get_type
-NM_TYPE_IP6_ADDRESS_OBJECT_ARRAY
-nm_ip6_address_object_array_get_type
-NM_TYPE_IP6_ADDRESS_ARRAY
-nm_ip6_address_array_get_type
-NM_TYPE_IP6_ROUTE_OBJECT_ARRAY
-nm_ip6_route_object_array_get_type
-</SECTION>
-
-<SECTION>
-<FILE>nm-device-modem-bindings</FILE>
-DBUS_GLIB_CLIENT_WRAPPERS_org_freedesktop_NetworkManager_Device_Modem
+<FILE>nm-vpn-plugin-utils</FILE>
+nm_vpn_plugin_utils_read_vpn_details
+nm_vpn_plugin_utils_get_secret_flags
 </SECTION>
 
diff --git a/docs/libnm-glib/libnm-glib.types b/docs/libnm-glib/libnm-glib.types
deleted file mode 100644
index 8b3b3d2a8..000000000
--- a/docs/libnm-glib/libnm-glib.types
+++ /dev/null
@@ -1,40 +0,0 @@
-#include <nm-client.h>
-#include <nm-object.h>
-#include <nm-device.h>
-#include <nm-device-ethernet.h>
-#include <nm-device-wifi.h>
-#include <nm-cdma-device.h>
-#include <nm-gsm-device.h>
-#include <nm-serial-device.h>
-#include <nm-device-bt.h>
-#include <nm-access-point.h>
-#include <nm-ip4-config.h>
-#include <nm-ip6-config.h>
-#include <nm-active-connection.h>
-#include <nm-dhcp4-config.h>
-#include <nm-dhcp6-config.h>
-#include <nm-remote-settings.h>
-#include <nm-exported-connection.h>
-#include <nm-remote-connection.h>
-#include <nm-vpn-connection.h>
-
-nm_client_get_type
-nm_object_get_type
-nm_device_get_type
-nm_device_ethernet_get_type
-nm_device_wifi_get_type
-nm_cdma_device_get_type
-nm_gsm_device_get_type
-nm_serial_device_get_type
-nm_device_bt_get_type
-nm_access_point_get_type
-nm_ip4_config_get_type
-nm_ip6_config_get_type
-nm_active_connection_get_type
-nm_dhcp4_config_get_type
-nm_dhcp6_config_get_type
-nm_remote_settings_get_type
-nm_exported_connection_get_type
-nm_remote_connection_get_type
-nm_vpn_connection_get_type
-
diff --git a/docs/libnm-glib/tmpl/nm-access-point.sgml b/docs/libnm-glib/tmpl/nm-access-point.sgml
deleted file mode 100644
index b3c2c6d66..000000000
--- a/docs/libnm-glib/tmpl/nm-access-point.sgml
+++ /dev/null
@@ -1,242 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMAccessPoint
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_ACCESS_POINT_FLAGS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_ACCESS_POINT_WPA_FLAGS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_ACCESS_POINT_RSN_FLAGS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_ACCESS_POINT_SSID ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_ACCESS_POINT_FREQUENCY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_ACCESS_POINT_HW_ADDRESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_ACCESS_POINT_MODE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_ACCESS_POINT_MAX_BITRATE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_ACCESS_POINT_STRENGTH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### STRUCT NMAccessPoint ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG NMAccessPoint:flags ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMAccessPoint:frequency ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMAccessPoint:hw-address ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMAccessPoint:max-bitrate ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMAccessPoint:mode ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMAccessPoint:rsn-flags ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMAccessPoint:ssid ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMAccessPoint:strength ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMAccessPoint:wpa-flags ##### -->
-<para>
-
-</para>
-
-<!-- ##### STRUCT NMAccessPointClass ##### -->
-<para>
-
-</para>
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
-
-<!-- ##### FUNCTION nm_access_point_new ##### -->
-<para>
-
-</para>
-
-@connection: 
-@path: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_access_point_get_flags ##### -->
-<para>
-
-</para>
-
-@ap: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_access_point_get_wpa_flags ##### -->
-<para>
-
-</para>
-
-@ap: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_access_point_get_rsn_flags ##### -->
-<para>
-
-</para>
-
-@ap: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_access_point_get_ssid ##### -->
-<para>
-
-</para>
-
-@ap: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_access_point_get_frequency ##### -->
-<para>
-
-</para>
-
-@ap: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_access_point_get_hw_address ##### -->
-<para>
-
-</para>
-
-@ap: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_access_point_get_mode ##### -->
-<para>
-
-</para>
-
-@ap: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_access_point_get_max_bitrate ##### -->
-<para>
-
-</para>
-
-@ap: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_access_point_get_strength ##### -->
-<para>
-
-</para>
-
-@ap: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-active-connection.sgml b/docs/libnm-glib/tmpl/nm-active-connection.sgml
deleted file mode 100644
index c642d1fc7..000000000
--- a/docs/libnm-glib/tmpl/nm-active-connection.sgml
+++ /dev/null
@@ -1,209 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMActiveConnection
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_ACTIVE_CONNECTION_SERVICE_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_ACTIVE_CONNECTION_CONNECTION ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_ACTIVE_CONNECTION_DEVICES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_ACTIVE_CONNECTION_STATE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_ACTIVE_CONNECTION_DEFAULT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_ACTIVE_CONNECTION_DEFAULT6 ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### STRUCT NMActiveConnection ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG NMActiveConnection:connection ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMActiveConnection:default ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMActiveConnection:default6 ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMActiveConnection:devices ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMActiveConnection:service-name ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMActiveConnection:specific-object ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMActiveConnection:state ##### -->
-<para>
-
-</para>
-
-<!-- ##### STRUCT NMActiveConnectionClass ##### -->
-<para>
-
-</para>
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
-
-<!-- ##### FUNCTION nm_active_connection_new ##### -->
-<para>
-
-</para>
-
-@connection: 
-@path: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_active_connection_get_service_name ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_active_connection_get_scope ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_active_connection_get_connection ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_active_connection_get_specific_object ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_active_connection_get_devices ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_active_connection_get_state ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_active_connection_get_default ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_active_connection_get_default6 ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-cdma-device.sgml b/docs/libnm-glib/tmpl/nm-cdma-device.sgml
deleted file mode 100644
index bcb72892f..000000000
--- a/docs/libnm-glib/tmpl/nm-cdma-device.sgml
+++ /dev/null
@@ -1,53 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMCdmaDevice
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT NMCdmaDevice ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### STRUCT NMCdmaDeviceClass ##### -->
-<para>
-
-</para>
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
-
-<!-- ##### FUNCTION nm_cdma_device_new ##### -->
-<para>
-
-</para>
-
-@connection: 
-@path: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-client.sgml b/docs/libnm-glib/tmpl/nm-client.sgml
deleted file mode 100644
index b30dffd86..000000000
--- a/docs/libnm-glib/tmpl/nm-client.sgml
+++ /dev/null
@@ -1,367 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMClient
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_CLIENT_STATE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_CLIENT_MANAGER_RUNNING ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_CLIENT_NETWORKING_ENABLED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_CLIENT_WIRELESS_ENABLED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_CLIENT_WIRELESS_HARDWARE_ENABLED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_CLIENT_WWAN_ENABLED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_CLIENT_WWAN_HARDWARE_ENABLED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_CLIENT_ACTIVE_CONNECTIONS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMClientPermission ##### -->
-<para>
-
-</para>
-
-@NM_CLIENT_PERMISSION_NONE: 
-@NM_CLIENT_PERMISSION_ENABLE_DISABLE_NETWORK: 
-@NM_CLIENT_PERMISSION_ENABLE_DISABLE_WIFI: 
-@NM_CLIENT_PERMISSION_ENABLE_DISABLE_WWAN: 
-@NM_CLIENT_PERMISSION_USE_USER_CONNECTIONS: 
-@NM_CLIENT_PERMISSION_LAST: 
-
-<!-- ##### ENUM NMClientPermissionResult ##### -->
-<para>
-
-</para>
-
-@NM_CLIENT_PERMISSION_RESULT_UNKNOWN: 
-@NM_CLIENT_PERMISSION_RESULT_YES: 
-@NM_CLIENT_PERMISSION_RESULT_AUTH: 
-@NM_CLIENT_PERMISSION_RESULT_NO: 
-
-<!-- ##### STRUCT NMClient ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SIGNAL NMClient::device-added ##### -->
-<para>
-
-</para>
-
-@nmclient: the object which received the signal.
-@arg1: 
-
-<!-- ##### SIGNAL NMClient::device-removed ##### -->
-<para>
-
-</para>
-
-@nmclient: the object which received the signal.
-@arg1: 
-
-<!-- ##### SIGNAL NMClient::permission-changed ##### -->
-<para>
-
-</para>
-
-@nmclient: the object which received the signal.
-@arg1: 
-@arg2: 
-
-<!-- ##### ARG NMClient:active-connections ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMClient:manager-running ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMClient:networking-enabled ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMClient:state ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMClient:wireless-enabled ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMClient:wireless-hardware-enabled ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMClient:wwan-enabled ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMClient:wwan-hardware-enabled ##### -->
-<para>
-
-</para>
-
-<!-- ##### STRUCT NMClientClass ##### -->
-<para>
-
-</para>
-
-@parent: 
-@device_added: 
-@device_removed: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
-
-<!-- ##### FUNCTION nm_client_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_client_get_devices ##### -->
-<para>
-
-</para>
-
-@client: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_client_get_device_by_path ##### -->
-<para>
-
-</para>
-
-@client: 
-@object_path: 
-@Returns: 
-
-
-<!-- ##### USER_FUNCTION NMClientActivateDeviceFn ##### -->
-<para>
-
-</para>
-
-@user_data: 
-@object_path: 
-@error: 
-
-
-<!-- ##### FUNCTION nm_client_activate_connection ##### -->
-<para>
-
-</para>
-
-@client: 
-@service_name: 
-@connection_path: 
-@device: 
-@specific_object: 
-@callback: 
-@user_data: 
-
-
-<!-- ##### FUNCTION nm_client_deactivate_connection ##### -->
-<para>
-
-</para>
-
-@client: 
-@active: 
-
-
-<!-- ##### FUNCTION nm_client_networking_get_enabled ##### -->
-<para>
-
-</para>
-
-@client: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_client_networking_set_enabled ##### -->
-<para>
-
-</para>
-
-@client: 
-@enabled: 
-
-
-<!-- ##### FUNCTION nm_client_wireless_get_enabled ##### -->
-<para>
-
-</para>
-
-@client: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_client_wireless_set_enabled ##### -->
-<para>
-
-</para>
-
-@client: 
-@enabled: 
-
-
-<!-- ##### FUNCTION nm_client_wireless_hardware_get_enabled ##### -->
-<para>
-
-</para>
-
-@client: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_client_wwan_get_enabled ##### -->
-<para>
-
-</para>
-
-@client: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_client_wwan_set_enabled ##### -->
-<para>
-
-</para>
-
-@client: 
-@enabled: 
-
-
-<!-- ##### FUNCTION nm_client_wwan_hardware_get_enabled ##### -->
-<para>
-
-</para>
-
-@client: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_client_get_state ##### -->
-<para>
-
-</para>
-
-@client: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_client_get_manager_running ##### -->
-<para>
-
-</para>
-
-@client: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_client_get_active_connections ##### -->
-<para>
-
-</para>
-
-@client: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_client_sleep ##### -->
-<para>
-
-</para>
-
-@client: 
-@sleep: 
-
-
-<!-- ##### FUNCTION nm_client_get_permission_result ##### -->
-<para>
-
-</para>
-
-@client: 
-@permission: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-device-bt.sgml b/docs/libnm-glib/tmpl/nm-device-bt.sgml
deleted file mode 100644
index d3ce4dc57..000000000
--- a/docs/libnm-glib/tmpl/nm-device-bt.sgml
+++ /dev/null
@@ -1,116 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMDeviceBt
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_DEVICE_BT_HW_ADDRESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_BT_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_BT_CAPABILITIES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### STRUCT NMDeviceBt ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG NMDeviceBt:bt-capabilities ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMDeviceBt:hw-address ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMDeviceBt:name ##### -->
-<para>
-
-</para>
-
-<!-- ##### STRUCT NMDeviceBtClass ##### -->
-<para>
-
-</para>
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
-
-<!-- ##### FUNCTION nm_device_bt_new ##### -->
-<para>
-
-</para>
-
-@connection: 
-@path: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_bt_get_hw_address ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_bt_get_name ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_bt_get_capabilities ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-device-ethernet.sgml b/docs/libnm-glib/tmpl/nm-device-ethernet.sgml
deleted file mode 100644
index ee82d5af5..000000000
--- a/docs/libnm-glib/tmpl/nm-device-ethernet.sgml
+++ /dev/null
@@ -1,137 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMDeviceEthernet
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_DEVICE_ETHERNET_HW_ADDRESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_ETHERNET_PERMANENT_HW_ADDRESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_ETHERNET_SPEED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_ETHERNET_CARRIER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### STRUCT NMDeviceEthernet ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG NMDeviceEthernet:carrier ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMDeviceEthernet:hw-address ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMDeviceEthernet:perm-hw-address ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMDeviceEthernet:speed ##### -->
-<para>
-
-</para>
-
-<!-- ##### STRUCT NMDeviceEthernetClass ##### -->
-<para>
-
-</para>
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
-
-<!-- ##### FUNCTION nm_device_ethernet_new ##### -->
-<para>
-
-</para>
-
-@connection: 
-@path: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_ethernet_get_hw_address ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_ethernet_get_permanent_hw_address ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_ethernet_get_speed ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_ethernet_get_carrier ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-device-modem-bindings.sgml b/docs/libnm-glib/tmpl/nm-device-modem-bindings.sgml
deleted file mode 100644
index b01b17342..000000000
--- a/docs/libnm-glib/tmpl/nm-device-modem-bindings.sgml
+++ /dev/null
@@ -1,31 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-nm-device-modem-bindings
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO DBUS_GLIB_CLIENT_WRAPPERS_org_freedesktop_NetworkManager_Device_Modem ##### -->
-<para>
-
-</para>
-
-
-
diff --git a/docs/libnm-glib/tmpl/nm-device-wifi.sgml b/docs/libnm-glib/tmpl/nm-device-wifi.sgml
deleted file mode 100644
index 0ef2031d2..000000000
--- a/docs/libnm-glib/tmpl/nm-device-wifi.sgml
+++ /dev/null
@@ -1,216 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMDeviceWifi
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_DEVICE_WIFI_HW_ADDRESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_WIFI_PERMANENT_HW_ADDRESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_WIFI_MODE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_WIFI_BITRATE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_WIFI_CAPABILITIES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### STRUCT NMDeviceWifi ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SIGNAL NMDeviceWifi::access-point-added ##### -->
-<para>
-
-</para>
-
-@nmdevicewifi: the object which received the signal.
-@arg1: 
-
-<!-- ##### SIGNAL NMDeviceWifi::access-point-removed ##### -->
-<para>
-
-</para>
-
-@nmdevicewifi: the object which received the signal.
-@arg1: 
-
-<!-- ##### ARG NMDeviceWifi:active-access-point ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMDeviceWifi:bitrate ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMDeviceWifi:hw-address ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMDeviceWifi:mode ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMDeviceWifi:perm-hw-address ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMDeviceWifi:wireless-capabilities ##### -->
-<para>
-
-</para>
-
-<!-- ##### STRUCT NMDeviceWifiClass ##### -->
-<para>
-
-</para>
-
-@parent: 
-@access_point_added: 
-@access_point_removed: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
-
-<!-- ##### FUNCTION nm_device_wifi_new ##### -->
-<para>
-
-</para>
-
-@connection: 
-@path: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_wifi_get_hw_address ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_wifi_get_permanent_hw_address ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_wifi_get_mode ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_wifi_get_bitrate ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_wifi_get_capabilities ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_wifi_get_active_access_point ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_wifi_get_access_point_by_path ##### -->
-<para>
-
-</para>
-
-@device: 
-@path: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_wifi_get_access_points ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-device-wimax-bindings.sgml b/docs/libnm-glib/tmpl/nm-device-wimax-bindings.sgml
deleted file mode 100644
index 8b79e1c17..000000000
--- a/docs/libnm-glib/tmpl/nm-device-wimax-bindings.sgml
+++ /dev/null
@@ -1,71 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-nm-device-wimax-bindings
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO DBUS_GLIB_CLIENT_WRAPPERS_org_freedesktop_NetworkManager_Device_WiMax ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION org_freedesktop_NetworkManager_Device_WiMax_get_nsp_list ##### -->
-<para>
-
-</para>
-
-@proxy: 
-@OUT_nsps: 
-@Returns: 
-
-
-<!-- ##### USER_FUNCTION org_freedesktop_NetworkManager_Device_WiMax_get_nsp_list_reply ##### -->
-<para>
-
-</para>
-
-@proxy: 
-@OUT_nsps: 
-@error: 
-@userdata: 
-
-
-<!-- ##### FUNCTION org_freedesktop_NetworkManager_Device_WiMax_get_nsp_list_async ##### -->
-<para>
-
-</para>
-
-@proxy: 
-@callback: 
-@Returns: 
-
-
-<!-- ##### FUNCTION dbus_g_proxy_begin_call ##### -->
-<para>
-
-</para>
-
-@Param1: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-device.sgml b/docs/libnm-glib/tmpl/nm-device.sgml
deleted file mode 100644
index 7c38adf61..000000000
--- a/docs/libnm-glib/tmpl/nm-device.sgml
+++ /dev/null
@@ -1,378 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMDevice
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_DEVICE_UDI ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_INTERFACE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_IP_INTERFACE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_DRIVER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_CAPABILITIES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_MANAGED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_FIRMWARE_MISSING ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_IP4_CONFIG ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_DHCP4_CONFIG ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_IP6_CONFIG ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_DHCP6_CONFIG ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_STATE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_VENDOR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_PRODUCT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### STRUCT NMDevice ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SIGNAL NMDevice::state-changed ##### -->
-<para>
-
-</para>
-
-@nmdevice: the object which received the signal.
-@arg1: 
-@arg2: 
-@arg3: 
-
-<!-- ##### ARG NMDevice:capabilities ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMDevice:dhcp4-config ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMDevice:dhcp6-config ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMDevice:driver ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMDevice:firmware-missing ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMDevice:interface ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMDevice:ip-interface ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMDevice:ip4-config ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMDevice:ip6-config ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMDevice:managed ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMDevice:product ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMDevice:state ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMDevice:udi ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMDevice:vendor ##### -->
-<para>
-
-</para>
-
-<!-- ##### STRUCT NMDeviceClass ##### -->
-<para>
-
-</para>
-
-@parent: 
-@state_changed: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
-
-<!-- ##### FUNCTION nm_device_new ##### -->
-<para>
-
-</para>
-
-@connection: 
-@path: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_get_iface ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_get_ip_iface ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_get_udi ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_get_driver ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_get_capabilities ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_get_managed ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_get_firmware_missing ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_get_ip4_config ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_get_dhcp4_config ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_get_ip6_config ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_get_dhcp6_config ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_get_state ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_get_product ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_get_vendor ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### USER_FUNCTION NMDeviceDeactivateFn ##### -->
-<para>
-
-</para>
-
-@device: 
-@error: 
-@user_data: 
-
-
-<!-- ##### FUNCTION nm_device_disconnect ##### -->
-<para>
-
-</para>
-
-@device: 
-@callback: 
-@user_data: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-dhcp4-config.sgml b/docs/libnm-glib/tmpl/nm-dhcp4-config.sgml
deleted file mode 100644
index 35a6e3069..000000000
--- a/docs/libnm-glib/tmpl/nm-dhcp4-config.sgml
+++ /dev/null
@@ -1,84 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMDHCP4Config
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT NMDHCP4Config ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG NMDHCP4Config:options ##### -->
-<para>
-
-</para>
-
-<!-- ##### STRUCT NMDHCP4ConfigClass ##### -->
-<para>
-
-</para>
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
-
-<!-- ##### MACRO NM_DHCP4_CONFIG_OPTIONS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_dhcp4_config_new ##### -->
-<para>
-
-</para>
-
-@connection: 
-@object_path: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_dhcp4_config_get_options ##### -->
-<para>
-
-</para>
-
-@config: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_dhcp4_config_get_one_option ##### -->
-<para>
-
-</para>
-
-@config: 
-@option: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-dhcp6-config.sgml b/docs/libnm-glib/tmpl/nm-dhcp6-config.sgml
deleted file mode 100644
index 3e00467cc..000000000
--- a/docs/libnm-glib/tmpl/nm-dhcp6-config.sgml
+++ /dev/null
@@ -1,84 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMDHCP6Config
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT NMDHCP6Config ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG NMDHCP6Config:options ##### -->
-<para>
-
-</para>
-
-<!-- ##### STRUCT NMDHCP6ConfigClass ##### -->
-<para>
-
-</para>
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
-
-<!-- ##### MACRO NM_DHCP6_CONFIG_OPTIONS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_dhcp6_config_new ##### -->
-<para>
-
-</para>
-
-@connection: 
-@object_path: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_dhcp6_config_get_options ##### -->
-<para>
-
-</para>
-
-@config: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_dhcp6_config_get_one_option ##### -->
-<para>
-
-</para>
-
-@config: 
-@option: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-exported-connection.sgml b/docs/libnm-glib/tmpl/nm-exported-connection.sgml
deleted file mode 100644
index c2ba3b21c..000000000
--- a/docs/libnm-glib/tmpl/nm-exported-connection.sgml
+++ /dev/null
@@ -1,56 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMExportedConnection
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT NMExportedConnection ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### STRUCT NMExportedConnectionClass ##### -->
-<para>
-
-</para>
-
-@parent: 
-@get_settings: 
-@update: 
-@delete: 
-@get_secrets: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
-
-<!-- ##### FUNCTION nm_exported_connection_new ##### -->
-<para>
-
-</para>
-
-@scope: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-gsm-device.sgml b/docs/libnm-glib/tmpl/nm-gsm-device.sgml
deleted file mode 100644
index bb4e7232f..000000000
--- a/docs/libnm-glib/tmpl/nm-gsm-device.sgml
+++ /dev/null
@@ -1,53 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMGsmDevice
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT NMGsmDevice ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### STRUCT NMGsmDeviceClass ##### -->
-<para>
-
-</para>
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
-
-<!-- ##### FUNCTION nm_gsm_device_new ##### -->
-<para>
-
-</para>
-
-@connection: 
-@path: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-ip4-config.sgml b/docs/libnm-glib/tmpl/nm-ip4-config.sgml
deleted file mode 100644
index 3fd603b2f..000000000
--- a/docs/libnm-glib/tmpl/nm-ip4-config.sgml
+++ /dev/null
@@ -1,179 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMIP4Config
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT NMIP4Config ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG NMIP4Config:addresses ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMIP4Config:domains ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMIP4Config:hostname ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMIP4Config:nameservers ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMIP4Config:routes ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMIP4Config:wins-servers ##### -->
-<para>
-
-</para>
-
-<!-- ##### STRUCT NMIP4ConfigClass ##### -->
-<para>
-
-</para>
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
-
-<!-- ##### MACRO NM_IP4_CONFIG_ADDRESSES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_IP4_CONFIG_HOSTNAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_IP4_CONFIG_NAMESERVERS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_IP4_CONFIG_DOMAINS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_IP4_CONFIG_ROUTES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_IP4_CONFIG_WINS_SERVERS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_ip4_config_new ##### -->
-<para>
-
-</para>
-
-@connection: 
-@object_path: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip4_config_get_addresses ##### -->
-<para>
-
-</para>
-
-@config: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip4_config_get_hostname ##### -->
-<para>
-
-</para>
-
-@config: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip4_config_get_nameservers ##### -->
-<para>
-
-</para>
-
-@config: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip4_config_get_domains ##### -->
-<para>
-
-</para>
-
-@config: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip4_config_get_routes ##### -->
-<para>
-
-</para>
-
-@config: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip4_config_get_wins_servers ##### -->
-<para>
-
-</para>
-
-@config: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-ip6-config.sgml b/docs/libnm-glib/tmpl/nm-ip6-config.sgml
deleted file mode 100644
index a9c44abd0..000000000
--- a/docs/libnm-glib/tmpl/nm-ip6-config.sgml
+++ /dev/null
@@ -1,137 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMIP6Config
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT NMIP6Config ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG NMIP6Config:addresses ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMIP6Config:domains ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMIP6Config:nameservers ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMIP6Config:routes ##### -->
-<para>
-
-</para>
-
-<!-- ##### STRUCT NMIP6ConfigClass ##### -->
-<para>
-
-</para>
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
-
-<!-- ##### MACRO NM_IP6_CONFIG_ADDRESSES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_IP6_CONFIG_NAMESERVERS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_IP6_CONFIG_DOMAINS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_IP6_CONFIG_ROUTES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_ip6_config_new ##### -->
-<para>
-
-</para>
-
-@connection: 
-@object_path: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip6_config_get_addresses ##### -->
-<para>
-
-</para>
-
-@config: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip6_config_get_nameservers ##### -->
-<para>
-
-</para>
-
-@config: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip6_config_get_domains ##### -->
-<para>
-
-</para>
-
-@config: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip6_config_get_routes ##### -->
-<para>
-
-</para>
-
-@config: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-object.sgml b/docs/libnm-glib/tmpl/nm-object.sgml
deleted file mode 100644
index d1919d391..000000000
--- a/docs/libnm-glib/tmpl/nm-object.sgml
+++ /dev/null
@@ -1,85 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMObject
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_OBJECT_DBUS_CONNECTION ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_OBJECT_DBUS_PATH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### STRUCT NMObject ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG NMObject:dbus-connection ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMObject:dbus-path ##### -->
-<para>
-
-</para>
-
-<!-- ##### STRUCT NMObjectClass ##### -->
-<para>
-
-</para>
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
-
-<!-- ##### FUNCTION nm_object_get_connection ##### -->
-<para>
-
-</para>
-
-@object: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_object_get_path ##### -->
-<para>
-
-</para>
-
-@object: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-remote-connection.sgml b/docs/libnm-glib/tmpl/nm-remote-connection.sgml
deleted file mode 100644
index d43534e13..000000000
--- a/docs/libnm-glib/tmpl/nm-remote-connection.sgml
+++ /dev/null
@@ -1,64 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMRemoteConnection
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT NMRemoteConnection ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG NMRemoteConnection:bus ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMRemoteConnection:init-result ##### -->
-<para>
-
-</para>
-
-<!-- ##### STRUCT NMRemoteConnectionClass ##### -->
-<para>
-
-</para>
-
-@parent_class: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
-
-<!-- ##### FUNCTION nm_remote_connection_new ##### -->
-<para>
-
-</para>
-
-@bus: 
-@scope: 
-@path: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-remote-settings-system.sgml b/docs/libnm-glib/tmpl/nm-remote-settings-system.sgml
deleted file mode 100644
index c14d4b2e4..000000000
--- a/docs/libnm-glib/tmpl/nm-remote-settings-system.sgml
+++ /dev/null
@@ -1,53 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMRemoteSettingsSystem
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT NMRemoteSettingsSystem ##### -->
-<para>
-
-</para>
-
-@parent: 
-
-<!-- ##### STRUCT NMRemoteSettingsSystemClass ##### -->
-<para>
-
-</para>
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
-
-<!-- ##### FUNCTION nm_remote_settings_system_new ##### -->
-<para>
-
-</para>
-
-@bus: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-remote-settings.sgml b/docs/libnm-glib/tmpl/nm-remote-settings.sgml
deleted file mode 100644
index 6f95df141..000000000
--- a/docs/libnm-glib/tmpl/nm-remote-settings.sgml
+++ /dev/null
@@ -1,89 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMRemoteSettings
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_REMOTE_SETTINGS_BUS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_REMOTE_SETTINGS_SCOPE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_REMOTE_SETTINGS_SERVICE_RUNNING ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### STRUCT NMRemoteSettings ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG NMRemoteSettings:bus ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMRemoteSettings:scope ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMRemoteSettings:service-running ##### -->
-<para>
-
-</para>
-
-<!-- ##### STRUCT NMRemoteSettingsClass ##### -->
-<para>
-
-</para>
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
-
-<!-- ##### FUNCTION nm_remote_settings_new ##### -->
-<para>
-
-</para>
-
-@bus: 
-@scope: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-secret-agent-glue.sgml b/docs/libnm-glib/tmpl/nm-secret-agent-glue.sgml
deleted file mode 100644
index 932de41e7..000000000
--- a/docs/libnm-glib/tmpl/nm-secret-agent-glue.sgml
+++ /dev/null
@@ -1,236 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-nm-secret-agent-glue
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO g_marshal_value_peek_boolean ##### -->
-<para>
-
-</para>
-
-@v: 
-
-
-<!-- ##### MACRO g_marshal_value_peek_char ##### -->
-<para>
-
-</para>
-
-@v: 
-
-
-<!-- ##### MACRO g_marshal_value_peek_uchar ##### -->
-<para>
-
-</para>
-
-@v: 
-
-
-<!-- ##### MACRO g_marshal_value_peek_int ##### -->
-<para>
-
-</para>
-
-@v: 
-
-
-<!-- ##### MACRO g_marshal_value_peek_uint ##### -->
-<para>
-
-</para>
-
-@v: 
-
-
-<!-- ##### MACRO g_marshal_value_peek_long ##### -->
-<para>
-
-</para>
-
-@v: 
-
-
-<!-- ##### MACRO g_marshal_value_peek_ulong ##### -->
-<para>
-
-</para>
-
-@v: 
-
-
-<!-- ##### MACRO g_marshal_value_peek_int64 ##### -->
-<para>
-
-</para>
-
-@v: 
-
-
-<!-- ##### MACRO g_marshal_value_peek_uint64 ##### -->
-<para>
-
-</para>
-
-@v: 
-
-
-<!-- ##### MACRO g_marshal_value_peek_enum ##### -->
-<para>
-
-</para>
-
-@v: 
-
-
-<!-- ##### MACRO g_marshal_value_peek_flags ##### -->
-<para>
-
-</para>
-
-@v: 
-
-
-<!-- ##### MACRO g_marshal_value_peek_float ##### -->
-<para>
-
-</para>
-
-@v: 
-
-
-<!-- ##### MACRO g_marshal_value_peek_double ##### -->
-<para>
-
-</para>
-
-@v: 
-
-
-<!-- ##### MACRO g_marshal_value_peek_string ##### -->
-<para>
-
-</para>
-
-@v: 
-
-
-<!-- ##### MACRO g_marshal_value_peek_param ##### -->
-<para>
-
-</para>
-
-@v: 
-
-
-<!-- ##### MACRO g_marshal_value_peek_boxed ##### -->
-<para>
-
-</para>
-
-@v: 
-
-
-<!-- ##### MACRO g_marshal_value_peek_pointer ##### -->
-<para>
-
-</para>
-
-@v: 
-
-
-<!-- ##### MACRO g_marshal_value_peek_object ##### -->
-<para>
-
-</para>
-
-@v: 
-
-
-<!-- ##### MACRO g_marshal_value_peek_variant ##### -->
-<para>
-
-</para>
-
-@v: 
-
-
-<!-- ##### FUNCTION dbus_glib_marshal_nm_secret_agent_VOID__BOXED_STRING_POINTER ##### -->
-<para>
-
-</para>
-
-@closure: 
-@return_value: 
-@n_param_values: 
-@param_values: 
-@invocation_hint: 
-@marshal_data: 
-
-
-<!-- ##### MACRO dbus_glib_marshal_nm_secret_agent_NONE__BOXED_STRING_POINTER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION dbus_glib_marshal_nm_secret_agent_VOID__BOXED_BOXED_STRING_BOXED_UINT_POINTER ##### -->
-<para>
-
-</para>
-
-@closure: 
-@return_value: 
-@n_param_values: 
-@param_values: 
-@invocation_hint: 
-@marshal_data: 
-
-
-<!-- ##### MACRO dbus_glib_marshal_nm_secret_agent_NONE__BOXED_BOXED_STRING_BOXED_UINT_POINTER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION dbus_glib_marshal_nm_secret_agent_VOID__BOXED_BOXED_POINTER ##### -->
-<para>
-
-</para>
-
-@closure: 
-@return_value: 
-@n_param_values: 
-@param_values: 
-@invocation_hint: 
-@marshal_data: 
-
-
-<!-- ##### MACRO dbus_glib_marshal_nm_secret_agent_NONE__BOXED_BOXED_POINTER ##### -->
-<para>
-
-</para>
-
-
-
diff --git a/docs/libnm-glib/tmpl/nm-serial-device.sgml b/docs/libnm-glib/tmpl/nm-serial-device.sgml
deleted file mode 100644
index 7f6403fe6..000000000
--- a/docs/libnm-glib/tmpl/nm-serial-device.sgml
+++ /dev/null
@@ -1,71 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSerialDevice
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT NMSerialDevice ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SIGNAL NMSerialDevice::ppp-stats ##### -->
-<para>
-
-</para>
-
-@nmserialdevice: the object which received the signal.
-@arg1: 
-@arg2: 
-
-<!-- ##### STRUCT NMSerialDeviceClass ##### -->
-<para>
-
-</para>
-
-@parent: 
-@ppp_stats: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
-
-<!-- ##### FUNCTION nm_serial_device_get_bytes_received ##### -->
-<para>
-
-</para>
-
-@self: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_serial_device_get_bytes_sent ##### -->
-<para>
-
-</para>
-
-@self: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-settings-connection-bindings.sgml b/docs/libnm-glib/tmpl/nm-settings-connection-bindings.sgml
deleted file mode 100644
index f6333a4f1..000000000
--- a/docs/libnm-glib/tmpl/nm-settings-connection-bindings.sgml
+++ /dev/null
@@ -1,164 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-nm-settings-connection-bindings
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO DBUS_GLIB_CLIENT_WRAPPERS_org_freedesktop_NetworkManager_Settings_Connection ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION org_freedesktop_NetworkManager_Settings_Connection_update ##### -->
-<para>
-
-</para>
-
-@proxy: 
-@IN_properties: 
-@Returns: 
-
-
-<!-- ##### USER_FUNCTION org_freedesktop_NetworkManager_Settings_Connection_update_reply ##### -->
-<para>
-
-</para>
-
-@proxy: 
-@error: 
-@userdata: 
-
-
-<!-- ##### FUNCTION org_freedesktop_NetworkManager_Settings_Connection_update_async ##### -->
-<para>
-
-</para>
-
-@proxy: 
-@IN_properties: 
-@callback: 
-@Returns: 
-
-
-<!-- ##### FUNCTION dbus_g_proxy_begin_call ##### -->
-<para>
-
-</para>
-
-@Param1: 
-@Returns: 
-
-
-<!-- ##### FUNCTION org_freedesktop_NetworkManager_Settings_Connection_delete ##### -->
-<para>
-
-</para>
-
-@proxy: 
-@Returns: 
-
-
-<!-- ##### USER_FUNCTION org_freedesktop_NetworkManager_Settings_Connection_delete_reply ##### -->
-<para>
-
-</para>
-
-@proxy: 
-@error: 
-@userdata: 
-
-
-<!-- ##### FUNCTION org_freedesktop_NetworkManager_Settings_Connection_delete_async ##### -->
-<para>
-
-</para>
-
-@proxy: 
-@callback: 
-@Returns: 
-
-
-<!-- ##### FUNCTION org_freedesktop_NetworkManager_Settings_Connection_get_settings ##### -->
-<para>
-
-</para>
-
-@proxy: 
-@OUT_settings: 
-@Returns: 
-
-
-<!-- ##### USER_FUNCTION org_freedesktop_NetworkManager_Settings_Connection_get_settings_reply ##### -->
-<para>
-
-</para>
-
-@proxy: 
-@OUT_settings: 
-@error: 
-@userdata: 
-
-
-<!-- ##### FUNCTION org_freedesktop_NetworkManager_Settings_Connection_get_settings_async ##### -->
-<para>
-
-</para>
-
-@proxy: 
-@callback: 
-@Returns: 
-
-
-<!-- ##### FUNCTION org_freedesktop_NetworkManager_Settings_Connection_get_secrets ##### -->
-<para>
-
-</para>
-
-@proxy: 
-@IN_setting_name: 
-@OUT_secrets: 
-@Returns: 
-
-
-<!-- ##### USER_FUNCTION org_freedesktop_NetworkManager_Settings_Connection_get_secrets_reply ##### -->
-<para>
-
-</para>
-
-@proxy: 
-@OUT_secrets: 
-@error: 
-@userdata: 
-
-
-<!-- ##### FUNCTION org_freedesktop_NetworkManager_Settings_Connection_get_secrets_async ##### -->
-<para>
-
-</para>
-
-@proxy: 
-@IN_setting_name: 
-@callback: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-settings-connection-interface.sgml b/docs/libnm-glib/tmpl/nm-settings-connection-interface.sgml
deleted file mode 100644
index 9e05931ad..000000000
--- a/docs/libnm-glib/tmpl/nm-settings-connection-interface.sgml
+++ /dev/null
@@ -1,119 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingsConnection
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTINGS_CONNECTION_INTERFACE_UPDATED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTINGS_CONNECTION_INTERFACE_REMOVED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### STRUCT NMSettingsConnectionInterface ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### USER_FUNCTION NMSettingsConnectionInterfaceUpdateFunc ##### -->
-<para>
-
-</para>
-
-@connection: 
-@error: 
-@user_data: 
-
-
-<!-- ##### USER_FUNCTION NMSettingsConnectionInterfaceDeleteFunc ##### -->
-<para>
-
-</para>
-
-@connection: 
-@error: 
-@user_data: 
-
-
-<!-- ##### USER_FUNCTION NMSettingsConnectionInterfaceGetSecretsFunc ##### -->
-<para>
-
-</para>
-
-@connection: 
-@secrets: 
-@error: 
-@user_data: 
-
-
-<!-- ##### FUNCTION nm_settings_connection_interface_update ##### -->
-<para>
-
-</para>
-
-@connection: 
-@callback: 
-@user_data: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_settings_connection_interface_delete ##### -->
-<para>
-
-</para>
-
-@connection: 
-@callback: 
-@user_data: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_settings_connection_interface_get_secrets ##### -->
-<para>
-
-</para>
-
-@connection: 
-@setting_name: 
-@hints: 
-@request_new: 
-@callback: 
-@user_data: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_settings_connection_interface_emit_updated ##### -->
-<para>
-
-</para>
-
-@connection: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-settings-interface.sgml b/docs/libnm-glib/tmpl/nm-settings-interface.sgml
deleted file mode 100644
index 846d5464e..000000000
--- a/docs/libnm-glib/tmpl/nm-settings-interface.sgml
+++ /dev/null
@@ -1,130 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettings
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### ENUM NMSettingsInterfaceError ##### -->
-<para>
-
-</para>
-
-@NM_SETTINGS_INTERFACE_ERROR_INVALID_CONNECTION: 
-@NM_SETTINGS_INTERFACE_ERROR_READ_ONLY_CONNECTION: 
-@NM_SETTINGS_INTERFACE_ERROR_INTERNAL_ERROR: 
-@NM_SETTINGS_INTERFACE_ERROR_SECRETS_UNAVAILABLE: 
-@NM_SETTINGS_INTERFACE_ERROR_SECRETS_REQUEST_CANCELED: 
-@NM_SETTINGS_INTERFACE_ERROR_PERMISSION_DENIED: 
-@NM_SETTINGS_INTERFACE_ERROR_INVALID_SETTING: 
-
-<!-- ##### MACRO NM_SETTINGS_INTERFACE_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_settings_interface_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_TYPE_SETTINGS_INTERFACE_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTINGS_INTERFACE_NEW_CONNECTION ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTINGS_INTERFACE_CONNECTIONS_READ ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### STRUCT NMSettingsInterface ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### USER_FUNCTION NMSettingsAddConnectionFunc ##### -->
-<para>
-
-</para>
-
-@settings: 
-@error: 
-@user_data: 
-
-
-<!-- ##### FUNCTION nm_settings_interface_get_type ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_settings_interface_list_connections ##### -->
-<para>
-
-</para>
-
-@settings: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_settings_interface_get_connection_by_path ##### -->
-<para>
-
-</para>
-
-@settings: 
-@path: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_settings_interface_add_connection ##### -->
-<para>
-
-</para>
-
-@settings: 
-@connection: 
-@callback: 
-@user_data: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-settings-service.sgml b/docs/libnm-glib/tmpl/nm-settings-service.sgml
deleted file mode 100644
index a79c966be..000000000
--- a/docs/libnm-glib/tmpl/nm-settings-service.sgml
+++ /dev/null
@@ -1,87 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingsService
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTINGS_SERVICE_BUS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTINGS_SERVICE_SCOPE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### STRUCT NMSettingsService ##### -->
-<para>
-
-</para>
-
-@parent: 
-
-<!-- ##### STRUCT NMSettingsServiceClass ##### -->
-<para>
-
-</para>
-
-@parent: 
-@list_connections: 
-@add_connection: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
-
-<!-- ##### FUNCTION nm_settings_service_get_connection_by_path ##### -->
-<para>
-
-</para>
-
-@self: 
-@path: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_settings_service_export ##### -->
-<para>
-
-</para>
-
-@self: 
-
-
-<!-- ##### FUNCTION nm_settings_service_export_connection ##### -->
-<para>
-
-</para>
-
-@self: 
-@exported: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-settings-system-interface.sgml b/docs/libnm-glib/tmpl/nm-settings-system-interface.sgml
deleted file mode 100644
index 9ee1ef69d..000000000
--- a/docs/libnm-glib/tmpl/nm-settings-system-interface.sgml
+++ /dev/null
@@ -1,125 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingsSystem
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### ENUM NMSettingsSystemPermissions ##### -->
-<para>
-
-</para>
-
-@NM_SETTINGS_SYSTEM_PERMISSION_NONE: 
-@NM_SETTINGS_SYSTEM_PERMISSION_CONNECTION_MODIFY: 
-@NM_SETTINGS_SYSTEM_PERMISSION_WIFI_SHARE_PROTECTED: 
-@NM_SETTINGS_SYSTEM_PERMISSION_WIFI_SHARE_OPEN: 
-@NM_SETTINGS_SYSTEM_PERMISSION_HOSTNAME_MODIFY: 
-
-<!-- ##### MACRO NM_SETTINGS_SYSTEM_INTERFACE_HOSTNAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTINGS_SYSTEM_INTERFACE_CAN_MODIFY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTINGS_SYSTEM_INTERFACE_CHECK_PERMISSIONS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingsSystemInterfaceProp ##### -->
-<para>
-
-</para>
-
-@NM_SETTINGS_SYSTEM_INTERFACE_PROP_FIRST: 
-@NM_SETTINGS_SYSTEM_INTERFACE_PROP_HOSTNAME: 
-@NM_SETTINGS_SYSTEM_INTERFACE_PROP_CAN_MODIFY: 
-
-<!-- ##### STRUCT NMSettingsSystemInterface ##### -->
-<para>
-
-</para>
-
-@g_iface: 
-@save_hostname: 
-@get_permissions: 
-@check_permissions: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
-
-<!-- ##### USER_FUNCTION NMSettingsSystemSaveHostnameFunc ##### -->
-<para>
-
-</para>
-
-@settings: 
-@error: 
-@user_data: 
-
-
-<!-- ##### USER_FUNCTION NMSettingsSystemGetPermissionsFunc ##### -->
-<para>
-
-</para>
-
-@settings: 
-@permissions: 
-@error: 
-@user_data: 
-
-
-<!-- ##### FUNCTION nm_settings_system_interface_save_hostname ##### -->
-<para>
-
-</para>
-
-@settings: 
-@hostname: 
-@callback: 
-@user_data: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_settings_system_interface_get_permissions ##### -->
-<para>
-
-</para>
-
-@settings: 
-@callback: 
-@user_data: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-types.sgml b/docs/libnm-glib/tmpl/nm-types.sgml
deleted file mode 100644
index f57d882e6..000000000
--- a/docs/libnm-glib/tmpl/nm-types.sgml
+++ /dev/null
@@ -1,136 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-nm-types
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_TYPE_SSID ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_ssid_get_type ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_TYPE_UINT_ARRAY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_uint_array_get_type ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_TYPE_STRING_ARRAY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_string_array_get_type ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_TYPE_OBJECT_ARRAY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_object_array_get_type ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_TYPE_IP6_ADDRESS_OBJECT_ARRAY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_ip6_address_object_array_get_type ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_TYPE_IP6_ADDRESS_ARRAY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_ip6_address_array_get_type ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_TYPE_IP6_ROUTE_OBJECT_ARRAY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_ip6_route_object_array_get_type ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-vpn-connection.sgml b/docs/libnm-glib/tmpl/nm-vpn-connection.sgml
deleted file mode 100644
index 8e4e18a80..000000000
--- a/docs/libnm-glib/tmpl/nm-vpn-connection.sgml
+++ /dev/null
@@ -1,105 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMVPNConnection
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_VPN_CONNECTION_VPN_STATE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_CONNECTION_BANNER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### STRUCT NMVPNConnection ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SIGNAL NMVPNConnection::vpn-state-changed ##### -->
-<para>
-
-</para>
-
-@nmvpnconnection: the object which received the signal.
-@arg1: 
-@arg2: 
-
-<!-- ##### ARG NMVPNConnection:banner ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMVPNConnection:vpn-state ##### -->
-<para>
-
-</para>
-
-<!-- ##### STRUCT NMVPNConnectionClass ##### -->
-<para>
-
-</para>
-
-@parent: 
-@vpn_state_changed: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
-
-<!-- ##### FUNCTION nm_vpn_connection_new ##### -->
-<para>
-
-</para>
-
-@dbus_connection: 
-@path: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_vpn_connection_get_vpn_state ##### -->
-<para>
-
-</para>
-
-@vpn: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_vpn_connection_get_banner ##### -->
-<para>
-
-</para>
-
-@vpn: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-vpn-plugin-ui-interface.sgml b/docs/libnm-glib/tmpl/nm-vpn-plugin-ui-interface.sgml
deleted file mode 100644
index ace182a8d..000000000
--- a/docs/libnm-glib/tmpl/nm-vpn-plugin-ui-interface.sgml
+++ /dev/null
@@ -1,259 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMVpnPluginUi
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT NMVpnPluginUiInterface ##### -->
-<para>
-
-</para>
-
-@g_iface: 
-@ui_factory: 
-@get_capabilities: 
-@import_from_file: 
-@export_to_file: 
-@get_suggested_name: 
-@delete_connection: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
-
-<!-- ##### STRUCT NMVpnPluginUiWidgetInterface ##### -->
-<para>
-
-</para>
-
-@g_iface: 
-@get_widget: 
-@update_connection: 
-@save_secrets: 
-@changed: 
-
-<!-- ##### USER_FUNCTION NMVpnPluginUiFactory ##### -->
-<para>
-
-</para>
-
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_vpn_plugin_ui_factory ##### -->
-<para>
-
-</para>
-
-@error: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_UI_CAPABILITY_NONE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_UI_CAPABILITY_IMPORT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_UI_CAPABILITY_EXPORT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_UI_INTERFACE_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_UI_INTERFACE_DESC ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_UI_INTERFACE_SERVICE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMVpnPluginUiInterfaceProp ##### -->
-<para>
-
-</para>
-
-@NM_VPN_PLUGIN_UI_INTERFACE_PROP_FIRST: 
-@NM_VPN_PLUGIN_UI_INTERFACE_PROP_NAME: 
-@NM_VPN_PLUGIN_UI_INTERFACE_PROP_DESC: 
-@NM_VPN_PLUGIN_UI_INTERFACE_PROP_SERVICE: 
-
-<!-- ##### FUNCTION nm_vpn_plugin_ui_interface_ui_factory ##### -->
-<para>
-
-</para>
-
-@iface: 
-@connection: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_vpn_plugin_ui_interface_get_capabilities ##### -->
-<para>
-
-</para>
-
-@iface: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_vpn_plugin_ui_interface_import ##### -->
-<para>
-
-</para>
-
-@iface: 
-@path: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_vpn_plugin_ui_interface_export ##### -->
-<para>
-
-</para>
-
-@iface: 
-@path: 
-@connection: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_vpn_plugin_ui_interface_get_suggested_name ##### -->
-<para>
-
-</para>
-
-@iface: 
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_vpn_plugin_ui_interface_delete_connection ##### -->
-<para>
-
-</para>
-
-@iface: 
-@connection: 
-@error: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_TYPE_VPN_PLUGIN_UI_WIDGET_INTERFACE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_UI_WIDGET_INTERFACE ##### -->
-<para>
-
-</para>
-
-@obj: 
-
-
-<!-- ##### MACRO NM_IS_VPN_PLUGIN_UI_WIDGET_INTERFACE ##### -->
-<para>
-
-</para>
-
-@obj: 
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_UI_WIDGET_INTERFACE_GET_INTERFACE ##### -->
-<para>
-
-</para>
-
-@obj: 
-
-
-<!-- ##### FUNCTION nm_vpn_plugin_ui_widget_interface_get_type ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_vpn_plugin_ui_widget_interface_get_widget ##### -->
-<para>
-
-</para>
-
-@iface: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_vpn_plugin_ui_widget_interface_update_connection ##### -->
-<para>
-
-</para>
-
-@iface: 
-@connection: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_vpn_plugin_ui_widget_interface_save_secrets ##### -->
-<para>
-
-</para>
-
-@iface: 
-@connection: 
-@error: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-vpn-plugin.sgml b/docs/libnm-glib/tmpl/nm-vpn-plugin.sgml
deleted file mode 100644
index 061e4edfd..000000000
--- a/docs/libnm-glib/tmpl/nm-vpn-plugin.sgml
+++ /dev/null
@@ -1,177 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMVPNPlugin
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_DBUS_SERVICE_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_STATE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMVPNPluginError ##### -->
-<para>
-
-</para>
-
-@NM_VPN_PLUGIN_ERROR_GENERAL: 
-@NM_VPN_PLUGIN_ERROR_STARTING_IN_PROGRESS: 
-@NM_VPN_PLUGIN_ERROR_ALREADY_STARTED: 
-@NM_VPN_PLUGIN_ERROR_STOPPING_IN_PROGRESS: 
-@NM_VPN_PLUGIN_ERROR_ALREADY_STOPPED: 
-@NM_VPN_PLUGIN_ERROR_WRONG_STATE: 
-@NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS: 
-@NM_VPN_PLUGIN_ERROR_LAUNCH_FAILED: 
-@NM_VPN_PLUGIN_ERROR_CONNECTION_INVALID: 
-
-<!-- ##### MACRO NM_VPN_PLUGIN_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_TYPE_VPN_PLUGIN_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### STRUCT NMVPNPlugin ##### -->
-<para>
-
-</para>
-
-@parent: 
-
-<!-- ##### STRUCT NMVPNPluginClass ##### -->
-<para>
-
-</para>
-
-@parent: 
-@connect: 
-@need_secrets: 
-@disconnect: 
-@state_changed: 
-@ip4_config: 
-@login_banner: 
-@failure: 
-@quit: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
-
-<!-- ##### FUNCTION nm_vpn_plugin_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_vpn_plugin_error_get_type ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_vpn_plugin_get_connection ##### -->
-<para>
-
-</para>
-
-@plugin: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_vpn_plugin_get_state ##### -->
-<para>
-
-</para>
-
-@plugin: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_vpn_plugin_set_state ##### -->
-<para>
-
-</para>
-
-@plugin: 
-@state: 
-
-
-<!-- ##### FUNCTION nm_vpn_plugin_set_login_banner ##### -->
-<para>
-
-</para>
-
-@plugin: 
-@banner: 
-
-
-<!-- ##### FUNCTION nm_vpn_plugin_failure ##### -->
-<para>
-
-</para>
-
-@plugin: 
-@reason: 
-
-
-<!-- ##### FUNCTION nm_vpn_plugin_set_ip4_config ##### -->
-<para>
-
-</para>
-
-@plugin: 
-@ip4_config: 
-
-
-<!-- ##### FUNCTION nm_vpn_plugin_disconnect ##### -->
-<para>
-
-</para>
-
-@plugin: 
-@err: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/Makefile.in b/docs/libnm-util/Makefile.in
index 5138306af..401e5091c 100644
--- a/docs/libnm-util/Makefile.in
+++ b/docs/libnm-util/Makefile.in
@@ -44,11 +44,16 @@ 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/gtk-doc.m4 $(top_srcdir)/m4/intltool.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)/configure.ac
+	$(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)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -65,7 +70,6 @@ SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -74,8 +78,6 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -92,6 +94,7 @@ DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCLIENT_VERSION = @DHCLIENT_VERSION@
 DHCPCD_PATH = @DHCPCD_PATH@
 DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -100,6 +103,7 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GIO_CFLAGS = @GIO_CFLAGS@
 GIO_LIBS = @GIO_LIBS@
@@ -108,8 +112,8 @@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_LIBS = @GLIB_LIBS@
 GMODULE_CFLAGS = @GMODULE_CFLAGS@
 GMODULE_LIBS = @GMODULE_LIBS@
-GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
 GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
 GREP = @GREP@
@@ -124,13 +128,23 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
 INTLLIBS = @INTLLIBS@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 IPTABLES_PATH = @IPTABLES_PATH@
+IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
+IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
@@ -138,6 +152,8 @@ LIBDL = @LIBDL@
 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
 LIBM = @LIBM@
 LIBNL_CFLAGS = @LIBNL_CFLAGS@
 LIBNL_LIBS = @LIBNL_LIBS@
@@ -146,13 +162,15 @@ LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
 NM = @NM@
 NMEDIT = @NMEDIT@
@@ -178,12 +196,9 @@ PKGCONFIG_PATH = @PKGCONFIG_PATH@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-POFILES = @POFILES@
 POLKIT_CFLAGS = @POLKIT_CFLAGS@
 POLKIT_LIBS = @POLKIT_LIBS@
 POSUB = @POSUB@
-PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
 PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
 RANLIB = @RANLIB@
 RESOLVCONF_PATH = @RESOLVCONF_PATH@
@@ -198,10 +213,13 @@ UUID_CFLAGS = @UUID_CFLAGS@
 UUID_LIBS = @UUID_LIBS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -323,17 +341,18 @@ GTKDOC_LIBS = \
 #
 GPATH = $(srcdir)
 TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
-EXTRA_DIST = \
+SETUP_FILES = \
 	$(content_files)		\
-	$(HTML_IMAGES)			\
 	$(DOC_MAIN_SGML_FILE)		\
 	$(DOC_MODULE)-sections.txt	\
 	$(DOC_MODULE)-overrides.txt
 
-DOC_STAMPS = scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
-	pdf-build.stamp \
-	$(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp \
-	$(srcdir)/pdf.stamp
+EXTRA_DIST = \
+	$(SETUP_FILES)
+
+DOC_STAMPS = setup-build.stamp scan-build.stamp tmpl-build.stamp sgml-build.stamp \
+	html-build.stamp pdf-build.stamp \
+	setup.stamp tmpl.stamp sgml.stamp html.stamp pdf.stamp
 
 SCANOBJ_FILES = \
 	$(DOC_MODULE).args 	 \
@@ -555,20 +574,38 @@ docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
 
 $(REPORT_FILES): sgml-build.stamp
 
+#### setup ####
+
+setup-build.stamp:
+	-@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
+	   echo 'gtk-doc: Preparing build'; \
+	   files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \
+	   if test "x$$files" != "x" ; then \
+	       for file in $$files ; do \
+	           test -f $(abs_srcdir)/$$file && \
+	               cp -p $(abs_srcdir)/$$file $(abs_builddir)/; \
+	       done \
+	   fi; \
+	   test -f $(abs_srcdir)/tmpl && \
+	       cp -rp $(abs_srcdir)/tmpl $(abs_builddir)/; \
+	fi
+	@touch setup-build.stamp
+
+setup.stamp: setup-build.stamp
+	@true
+
 #### scan ####
 
 scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
 	@echo 'gtk-doc: Scanning header files'
-	@-chmod -R u+w $(srcdir)
-	@_source_dir='' ; for i in $(DOC_SOURCE_DIR) ; do \
+	@_source_dir='' ; \
+	for i in $(DOC_SOURCE_DIR) ; do \
 	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
-	  done ; \
-	  cd $(srcdir) && \
-	  gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES)
-	@if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
-	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
+	done ; \
+	gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES)
+	@if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
+	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) ; \
 	else \
-	    cd $(srcdir) ; \
 	    for i in $(SCANOBJ_FILES) ; do \
                test -f $$i || touch $$i ; \
 	    done \
@@ -580,10 +617,14 @@ $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)
 
 #### templates ####
 
-tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
+tmpl-build.stamp: setup.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
 	@echo 'gtk-doc: Rebuilding template files'
-	@-chmod -R u+w $(srcdir)
-	@cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
+	@gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
+	@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
+	  if test -w $(abs_srcdir) ; then \
+	    cp -rp $(abs_builddir)/tmpl $(abs_srcdir)/; \
+	  fi \
+	fi
 	@touch tmpl-build.stamp
 
 tmpl.stamp: tmpl-build.stamp
@@ -597,11 +638,11 @@ $(srcdir)/tmpl/*.sgml:
 sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
 	@echo 'gtk-doc: Building XML'
 	@-chmod -R u+w $(srcdir)
-	@_source_dir='' ; for i in $(DOC_SOURCE_DIR) ; do \
+	@_source_dir='' ; \
+	for i in $(DOC_SOURCE_DIR) ; do \
 	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
-	  done ; \
-	  cd $(srcdir) && \
-	  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)
+	done ; \
+	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)
 	@touch sgml-build.stamp
 
 sgml.stamp: sgml-build.stamp
@@ -611,26 +652,32 @@ sgml.stamp: sgml-build.stamp
 
 html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
 	@echo 'gtk-doc: Building HTML'
-	@-chmod -R u+w $(srcdir)
-	@rm -rf $(srcdir)/html
-	@mkdir $(srcdir)/html
+	@rm -rf html
+	@mkdir html
 	@mkhtml_options=""; \
 	gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-path"; \
 	if test "$(?)" = "0"; then \
-	  mkhtml_options=--path="$(srcdir)"; \
+	  mkhtml_options=--path="$(abs_srcdir)"; \
 	fi; \
-	cd $(srcdir)/html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
-	@test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
+	cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
+	-@test "x$(HTML_IMAGES)" = "x" || \
+	for file in $(HTML_IMAGES) ; do \
+	  if test -f $(abs_srcdir)/$$file ; then \
+	    cp $(abs_srcdir)/$$file $(abs_builddir)/html; \
+	  fi; \
+	  if test -f $(abs_builddir)/$$file ; then \
+	    cp $(abs_builddir)/$$file $(abs_builddir)/html; \
+	  fi; \
+	done;
 	@echo 'gtk-doc: Fixing cross-references'
-	@cd $(srcdir) && gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+	@gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
 	@touch html-build.stamp
 
 #### pdf ####
 
 pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
 	@echo 'gtk-doc: Building PDF'
-	@-chmod -R u+w $(srcdir)
-	@rm -rf $(srcdir)/$(DOC_MODULE).pdf
+	@rm -rf $(DOC_MODULE).pdf
 	@mkpdf_imgdirs=""; \
 	if test "x$(HTML_IMAGES)" != "x"; then \
 	  for img in $(HTML_IMAGES); do \
@@ -641,7 +688,7 @@ pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
 	    fi; \
 	  done; \
 	fi; \
-	cd $(srcdir) && gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
+	gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
 	@touch pdf-build.stamp
 
 ##############
@@ -651,12 +698,15 @@ clean-local:
 	rm -rf .libs
 
 distclean-local:
-	cd $(srcdir) && \
-	  rm -rf xml $(REPORT_FILES) $(DOC_MODULE).pdf \
-	         $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
+	rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \
+	    $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
+	if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
+	    rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \
+	    rm -rf tmpl; \
+	fi
 
 maintainer-clean-local: clean
-	cd $(srcdir) && rm -rf xml html
+	rm -rf xml html
 
 install-data-local:
 	@installfiles=`echo $(srcdir)/html/*`; \
@@ -701,11 +751,11 @@ uninstall-local:
 dist-hook: dist-check-gtkdoc dist-hook-local
 	mkdir $(distdir)/tmpl
 	mkdir $(distdir)/html
-	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
-	cp $(srcdir)/html/* $(distdir)/html
-	-cp $(srcdir)/$(DOC_MODULE).pdf $(distdir)/
-	-cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
-	-cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
+	-cp $(build)/tmpl/*.sgml $(distdir)/tmpl
+	cp $(builddir)/html/* $(distdir)/html
+	-cp $(builddir)/$(DOC_MODULE).pdf $(distdir)/
+	-cp $(build)/$(DOC_MODULE).types $(distdir)/
+	-cp $(build)/$(DOC_MODULE)-sections.txt $(distdir)/
 	cd $(distdir) && rm -f $(DISTCLEANFILES)
 	$(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
 
diff --git a/docs/libnm-util/html/NMConnection.html b/docs/libnm-util/html/NMConnection.html
deleted file mode 100644
index 7d6600122..000000000
--- a/docs/libnm-util/html/NMConnection.html
+++ /dev/null
@@ -1,1062 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>NMConnection</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
-<link rel="home" href="index.html" title="libnm-util Reference Manual">
-<link rel="up" href="ch01.html" title="libnm-util API Reference">
-<link rel="prev" href="ch01.html" title="libnm-util API Reference">
-<link rel="next" href="NMSetting.html" title="NMSetting">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
-<link rel="stylesheet" href="style.css" type="text/css">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
-<tr valign="middle">
-<td><a accesskey="p" href="ch01.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="ch01.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">libnm-util Reference Manual</th>
-<td><a accesskey="n" href="NMSetting.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
-</tr>
-<tr><td colspan="5" class="shortcuts">
-<a href="#NMConnection.synopsis" class="shortcut">Top</a>
-                   | 
-                  <a href="#NMConnection.description" class="shortcut">Description</a>
-                   | 
-                  <a href="#NMConnection.object-hierarchy" class="shortcut">Object Hierarchy</a>
-                   | 
-                  <a href="#NMConnection.properties" class="shortcut">Properties</a>
-                   | 
-                  <a href="#NMConnection.signals" class="shortcut">Signals</a>
-</td></tr>
-</table>
-<div class="refentry" title="NMConnection">
-<a name="NMConnection"></a><div class="titlepage"></div>
-<div class="refnamediv"><table width="100%"><tr>
-<td valign="top">
-<h2><span class="refentrytitle"><a name="NMConnection.top_of_page"></a>NMConnection</span></h2>
-<p>NMConnection — Describes a connection to specific network or provider</p>
-</td>
-<td valign="top" align="right"></td>
-</tr></table></div>
-<div class="refsynopsisdiv" title="Synopsis">
-<a name="NMConnection.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">
-#include &lt;nm-connection.h&gt;
-
-enum                <a class="link" href="NMConnection.html#NMConnectionScope" title="enum NMConnectionScope">NMConnectionScope</a>;
-enum                <a class="link" href="NMConnection.html#NMConnectionError" title="enum NMConnectionError">NMConnectionError</a>;
-#define             <a class="link" href="NMConnection.html#NM-TYPE-CONNECTION-ERROR:CAPS" title="NM_TYPE_CONNECTION_ERROR">NM_TYPE_CONNECTION_ERROR</a>
-#define             <a class="link" href="NMConnection.html#NM-CONNECTION-ERROR:CAPS" title="NM_CONNECTION_ERROR">NM_CONNECTION_ERROR</a>
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              <a class="link" href="NMConnection.html#nm-connection-error-quark" title="nm_connection_error_quark ()">nm_connection_error_quark</a>           (<em class="parameter"><code><span class="type">void</span></code></em>);
-#define             <a class="link" href="NMConnection.html#NM-CONNECTION-SCOPE:CAPS" title="NM_CONNECTION_SCOPE">NM_CONNECTION_SCOPE</a>
-#define             <a class="link" href="NMConnection.html#NM-CONNECTION-PATH:CAPS" title="NM_CONNECTION_PATH">NM_CONNECTION_PATH</a>
-                    <a class="link" href="NMConnection.html#NMConnection-struct" title="NMConnection">NMConnection</a>;
-                    <a class="link" href="NMConnection.html#NMConnectionClass" title="NMConnectionClass">NMConnectionClass</a>;
-<a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               <a class="link" href="NMConnection.html#nm-connection-get-type" title="nm_connection_get_type ()">nm_connection_get_type</a>              (<em class="parameter"><code><span class="type">void</span></code></em>);
-<a class="link" href="NMConnection.html" title="NMConnection"><span class="returnvalue">NMConnection</span></a> *      <a class="link" href="NMConnection.html#nm-connection-new" title="nm_connection_new ()">nm_connection_new</a>                   (<em class="parameter"><code><span class="type">void</span></code></em>);
-<a class="link" href="NMConnection.html" title="NMConnection"><span class="returnvalue">NMConnection</span></a> *      <a class="link" href="NMConnection.html#nm-connection-new-from-hash" title="nm_connection_new_from_hash ()">nm_connection_new_from_hash</a>         (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *hash</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
-<a class="link" href="NMConnection.html" title="NMConnection"><span class="returnvalue">NMConnection</span></a> *      <a class="link" href="NMConnection.html#nm-connection-duplicate" title="nm_connection_duplicate ()">nm_connection_duplicate</a>             (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="NMConnection.html#nm-connection-add-setting" title="nm_connection_add_setting ()">nm_connection_add_setting</a>           (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> *setting</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="NMConnection.html#nm-connection-remove-setting" title="nm_connection_remove_setting ()">nm_connection_remove_setting</a>        (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> setting_type</code></em>);
-<a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *         <a class="link" href="NMConnection.html#nm-connection-get-setting" title="nm_connection_get_setting ()">nm_connection_get_setting</a>           (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> setting_type</code></em>);
-<a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *         <a class="link" href="NMConnection.html#nm-connection-get-setting-by-name" title="nm_connection_get_setting_by_name ()">nm_connection_get_setting_by_name</a>   (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> *name</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMConnection.html#nm-connection-replace-settings" title="nm_connection_replace_settings ()">nm_connection_replace_settings</a>      (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *new_settings</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMConnection.html#nm-connection-compare" title="nm_connection_compare ()">nm_connection_compare</a>               (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *a</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *b</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSetting.html#NMSettingCompareFlags" title="enum NMSettingCompareFlags"><span class="type">NMSettingCompareFlags</span></a> flags</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMConnection.html#nm-connection-diff" title="nm_connection_diff ()">nm_connection_diff</a>                  (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *a</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *b</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSetting.html#NMSettingCompareFlags" title="enum NMSettingCompareFlags"><span class="type">NMSettingCompareFlags</span></a> flags</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> **out_settings</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMConnection.html#nm-connection-verify" title="nm_connection_verify ()">nm_connection_verify</a>                (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
-const <span class="returnvalue">char</span> *        <a class="link" href="NMConnection.html#nm-connection-need-secrets" title="nm_connection_need_secrets ()">nm_connection_need_secrets</a>          (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> **hints</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="NMConnection.html#nm-connection-clear-secrets" title="nm_connection_clear_secrets ()">nm_connection_clear_secrets</a>         (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMConnection.html#nm-connection-update-secrets" title="nm_connection_update_secrets ()">nm_connection_update_secrets</a>        (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> *setting_name</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *setting_secrets</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="NMConnection.html#nm-connection-set-scope" title="nm_connection_set_scope ()">nm_connection_set_scope</a>             (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMConnection.html#NMConnectionScope" title="enum NMConnectionScope"><span class="type">NMConnectionScope</span></a> scope</code></em>);
-<a class="link" href="NMConnection.html#NMConnectionScope" title="enum NMConnectionScope"><span class="returnvalue">NMConnectionScope</span></a>   <a class="link" href="NMConnection.html#nm-connection-get-scope" title="nm_connection_get_scope ()">nm_connection_get_scope</a>             (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="NMConnection.html#nm-connection-set-path" title="nm_connection_set_path ()">nm_connection_set_path</a>              (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> *path</code></em>);
-const <span class="returnvalue">char</span> *        <a class="link" href="NMConnection.html#nm-connection-get-path" title="nm_connection_get_path ()">nm_connection_get_path</a>              (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="NMConnection.html#nm-connection-for-each-setting-value" title="nm_connection_for_each_setting_value ()">nm_connection_for_each_setting_value</a>
-                                                        (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSetting.html#NMSettingValueIterFn" title="NMSettingValueIterFn ()"><span class="type">NMSettingValueIterFn</span></a> func</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="returnvalue">GHashTable</span></a> *        <a class="link" href="NMConnection.html#nm-connection-to-hash" title="nm_connection_to_hash ()">nm_connection_to_hash</a>               (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="NMConnection.html#nm-connection-dump" title="nm_connection_dump ()">nm_connection_dump</a>                  (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);
-<a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *         <a class="link" href="NMConnection.html#nm-connection-create-setting" title="nm_connection_create_setting ()">nm_connection_create_setting</a>        (<em class="parameter"><code>const <span class="type">char</span> *name</code></em>);
-<a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               <a class="link" href="NMConnection.html#nm-connection-lookup-setting-type" title="nm_connection_lookup_setting_type ()">nm_connection_lookup_setting_type</a>   (<em class="parameter"><code>const <span class="type">char</span> *name</code></em>);
-<a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               <a class="link" href="NMConnection.html#nm-connection-lookup-setting-type-by-quark" title="nm_connection_lookup_setting_type_by_quark ()">nm_connection_lookup_setting_type_by_quark</a>
-                                                        (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="type">GQuark</span></a> error_quark</code></em>);
-</pre>
-</div>
-<div class="refsect1" title="Object Hierarchy">
-<a name="NMConnection.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="synopsis">
-  <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>
-   +----NMConnection
-</pre>
-</div>
-<div class="refsect1" title="Properties">
-<a name="NMConnection.properties"></a><h2>Properties</h2>
-<pre class="synopsis">
-  "<a class="link" href="NMConnection.html#NMConnection--path" title='The "path" property'>path</a>"                     <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write / Construct
-  "<a class="link" href="NMConnection.html#NMConnection--scope" title='The "scope" property'>scope</a>"                    <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write / Construct
-</pre>
-</div>
-<div class="refsect1" title="Signals">
-<a name="NMConnection.signals"></a><h2>Signals</h2>
-<pre class="synopsis">
-  "<a class="link" href="NMConnection.html#NMConnection-secrets-updated" title='The "secrets-updated" signal'>secrets-updated</a>"                                : Run First
-</pre>
-</div>
-<div class="refsect1" title="Description">
-<a name="NMConnection.description"></a><h2>Description</h2>
-<p>
-An <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> describes all the settings and configuration values that
-are necessary to configure network devices for operation on a specific
-network.  Connections are the fundamental operating object for
-NetworkManager; no device is connected without a <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>, or
-disconnected without having been connected with a <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>.
-</p>
-<p>
-Each <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> contains a list of <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> objects usually referenced
-by name (using <a class="link" href="NMConnection.html#nm-connection-get-setting-by-name" title="nm_connection_get_setting_by_name ()"><code class="function">nm_connection_get_setting_by_name()</code></a>) or by type (with
-<a class="link" href="NMConnection.html#nm-connection-get-setting" title="nm_connection_get_setting ()"><code class="function">nm_connection_get_setting()</code></a>).  The settings describe the actual parameters
-with which the network devices are configured, including device-specific
-parameters (MTU, SSID, APN, channel, rate, etc) and IP-level parameters
-(addresses, routes, addressing methods, etc).
-</p>
-<p>
-Most connections also have a <a class="link" href="NMConnection.html#NMConnectionScope" title="enum NMConnectionScope"><code class="literal">NMConnectionScope</code></a>; a connection will be
-provided over D-Bus either by the user settings service
-(org.freedesktop.NetworkManagerUserSettings) running in an active user
-session, or by the system-wide system settings service
-(org.freedesktop.NetworkManagerSystemSettings) which provides  connections
-for all users.
-</p>
-</div>
-<div class="refsect1" title="Details">
-<a name="NMConnection.details"></a><h2>Details</h2>
-<div class="refsect2" title="enum NMConnectionScope">
-<a name="NMConnectionScope"></a><h3>enum NMConnectionScope</h3>
-<pre class="programlisting">typedef enum {
-	NM_CONNECTION_SCOPE_UNKNOWN = 0,
-	NM_CONNECTION_SCOPE_SYSTEM,
-	NM_CONNECTION_SCOPE_USER
-} NMConnectionScope;
-</pre>
-<p>
-Connection scope indicated what settings service, if any, provides the
-connection.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><a name="NM-CONNECTION-SCOPE-UNKNOWN:CAPS"></a><span class="term"><code class="literal">NM_CONNECTION_SCOPE_UNKNOWN</code></span></p></td>
-<td>scope not known or not yet set
-</td>
-</tr>
-<tr>
-<td><p><a name="NM-CONNECTION-SCOPE-SYSTEM:CAPS"></a><span class="term"><code class="literal">NM_CONNECTION_SCOPE_SYSTEM</code></span></p></td>
-<td>connection is provided by the system settings
-  service
-</td>
-</tr>
-<tr>
-<td><p><a name="NM-CONNECTION-SCOPE-USER:CAPS"></a><span class="term"><code class="literal">NM_CONNECTION_SCOPE_USER</code></span></p></td>
-<td>connection is provided by a user settings service
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="enum NMConnectionError">
-<a name="NMConnectionError"></a><h3>enum NMConnectionError</h3>
-<pre class="programlisting">typedef enum
-{
-	NM_CONNECTION_ERROR_UNKNOWN = 0,
-	NM_CONNECTION_ERROR_CONNECTION_SETTING_NOT_FOUND
-} NMConnectionError;
-</pre>
-<p>
-Describes errors that may result from operations involving a <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><a name="NM-CONNECTION-ERROR-UNKNOWN:CAPS"></a><span class="term"><code class="literal">NM_CONNECTION_ERROR_UNKNOWN</code></span></p></td>
-<td>unknown or unclassified error
-</td>
-</tr>
-<tr>
-<td><p><a name="NM-CONNECTION-ERROR-CONNECTION-SETTING-NOT-FOUND:CAPS"></a><span class="term"><code class="literal">NM_CONNECTION_ERROR_CONNECTION_SETTING_NOT_FOUND</code></span></p></td>
-<td>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> object
-  did not contain the required <a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> object, which must be
-  present for all connections
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="NM_TYPE_CONNECTION_ERROR">
-<a name="NM-TYPE-CONNECTION-ERROR:CAPS"></a><h3>NM_TYPE_CONNECTION_ERROR</h3>
-<pre class="programlisting">#define NM_TYPE_CONNECTION_ERROR (nm_connection_error_get_type ()) 
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="NM_CONNECTION_ERROR">
-<a name="NM-CONNECTION-ERROR:CAPS"></a><h3>NM_CONNECTION_ERROR</h3>
-<pre class="programlisting">#define NM_CONNECTION_ERROR nm_connection_error_quark ()
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="nm_connection_error_quark ()">
-<a name="nm-connection-error-quark"></a><h3>nm_connection_error_quark ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              nm_connection_error_quark           (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
-<p>
-Registers an error quark for <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> if necessary.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the error quark used for <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> errors.
-</td>
-</tr></tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="NM_CONNECTION_SCOPE">
-<a name="NM-CONNECTION-SCOPE:CAPS"></a><h3>NM_CONNECTION_SCOPE</h3>
-<pre class="programlisting">#define NM_CONNECTION_SCOPE "scope"
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="NM_CONNECTION_PATH">
-<a name="NM-CONNECTION-PATH:CAPS"></a><h3>NM_CONNECTION_PATH</h3>
-<pre class="programlisting">#define NM_CONNECTION_PATH "path"
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="NMConnection">
-<a name="NMConnection-struct"></a><h3>NMConnection</h3>
-<pre class="programlisting">typedef struct _NMConnection NMConnection;</pre>
-<p>
-The NMConnection struct contains only private data.
-It should only be accessed through the functions described below.
-</p>
-</div>
-<hr>
-<div class="refsect2" title="NMConnectionClass">
-<a name="NMConnectionClass"></a><h3>NMConnectionClass</h3>
-<pre class="programlisting">typedef struct {
-	GObjectClass parent;
-
-	/* Signals */
-	void (*secrets_updated) (NMConnection *connection, const char * setting);
-} NMConnectionClass;
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="nm_connection_get_type ()">
-<a name="nm-connection-get-type"></a><h3>nm_connection_get_type ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               nm_connection_get_type              (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_connection_new ()">
-<a name="nm-connection-new"></a><h3>nm_connection_new ()</h3>
-<pre class="programlisting"><a class="link" href="NMConnection.html" title="NMConnection"><span class="returnvalue">NMConnection</span></a> *      nm_connection_new                   (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
-<p>
-Creates a new <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> object with no <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> objects.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the new empty <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> object
-</td>
-</tr></tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_connection_new_from_hash ()">
-<a name="nm-connection-new-from-hash"></a><h3>nm_connection_new_from_hash ()</h3>
-<pre class="programlisting"><a class="link" href="NMConnection.html" title="NMConnection"><span class="returnvalue">NMConnection</span></a> *      nm_connection_new_from_hash         (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *hash</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
-<p>
-Creates a new <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> from a hash table describing the connection.  See
-<a class="link" href="NMConnection.html#nm-connection-to-hash" title="nm_connection_to_hash ()"><code class="function">nm_connection_to_hash()</code></a> for a description of the expected hash table.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>hash</code></em> :</span></p></td>
-<td>the <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> describing the connection
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>on unsuccessful return, an error
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the new <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> object, populated with settings created
-from the values in the hash table, or NULL if the connection failed to
-validate
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_connection_duplicate ()">
-<a name="nm-connection-duplicate"></a><h3>nm_connection_duplicate ()</h3>
-<pre class="programlisting"><a class="link" href="NMConnection.html" title="NMConnection"><span class="returnvalue">NMConnection</span></a> *      nm_connection_duplicate             (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
-<p>
-Duplicates a <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
-<td>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> to duplicate
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a new <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> containing the same settings and properties
-as the source <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_connection_add_setting ()">
-<a name="nm-connection-add-setting"></a><h3>nm_connection_add_setting ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                nm_connection_add_setting           (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> *setting</code></em>);</pre>
-<p>
-Adds a <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> to the connection, replacing any previous <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> of the
-same name which has previously been added to the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>.  The
-connection takes ownership of the <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> object and does not increase
-the setting object's reference count.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
-<td>a <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>the <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> to add to the connection object
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_connection_remove_setting ()">
-<a name="nm-connection-remove-setting"></a><h3>nm_connection_remove_setting ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                nm_connection_remove_setting        (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> setting_type</code></em>);</pre>
-<p>
-Removes the <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> with the given <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> from the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>.  This
-operation dereferences the <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> object.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
-<td>a <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting_type</code></em> :</span></p></td>
-<td>the <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> of the setting object to remove
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_connection_get_setting ()">
-<a name="nm-connection-get-setting"></a><h3>nm_connection_get_setting ()</h3>
-<pre class="programlisting"><a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *         nm_connection_get_setting           (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> setting_type</code></em>);</pre>
-<p>
-Gets the <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> with the given <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a>, if one has been previously added
-to the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
-<td>a <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting_type</code></em> :</span></p></td>
-<td>the <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> of the setting object to return
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a>, or NULL if no setting of that type was previously
-added to the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_connection_get_setting_by_name ()">
-<a name="nm-connection-get-setting-by-name"></a><h3>nm_connection_get_setting_by_name ()</h3>
-<pre class="programlisting"><a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *         nm_connection_get_setting_by_name   (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> *name</code></em>);</pre>
-<p>
-Gets the <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> with the given name, if one has been previously added
-the the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
-<td>a <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>name</code></em> :</span></p></td>
-<td>a setting name
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a>, or NULL if no setting with that name was previously
-added to the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_connection_replace_settings ()">
-<a name="nm-connection-replace-settings"></a><h3>nm_connection_replace_settings ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_connection_replace_settings      (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *new_settings</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
-<td>a <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>new_settings</code></em> :</span></p></td>
-<td>a <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> of settings
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>location to store error, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the settings were valid and added to the connection, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a>
-if they were not
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_connection_compare ()">
-<a name="nm-connection-compare"></a><h3>nm_connection_compare ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_connection_compare               (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *a</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *b</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSetting.html#NMSettingCompareFlags" title="enum NMSettingCompareFlags"><span class="type">NMSettingCompareFlags</span></a> flags</code></em>);</pre>
-<p>
-Compares two <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> objects for similarity, with comparison behavior
-modified by a set of flags.  See <a class="link" href="NMSetting.html#nm-setting-compare" title="nm_setting_compare ()"><code class="function">nm_setting_compare()</code></a> for a description of
-each flag's behavior.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>a</code></em> :</span></p></td>
-<td>a <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>b</code></em> :</span></p></td>
-<td>a second <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> to compare with the first
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>flags</code></em> :</span></p></td>
-<td>compare flags, e.g. <a class="link" href="NMSetting.html#NM-SETTING-COMPARE-FLAG-EXACT:CAPS"><code class="literal">NM_SETTING_COMPARE_FLAG_EXACT</code></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the comparison succeeds, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if it does not
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_connection_diff ()">
-<a name="nm-connection-diff"></a><h3>nm_connection_diff ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_connection_diff                  (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *a</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *b</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSetting.html#NMSettingCompareFlags" title="enum NMSettingCompareFlags"><span class="type">NMSettingCompareFlags</span></a> flags</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> **out_settings</code></em>);</pre>
-<p>
-Compares two <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> objects for similarity, with comparison behavior
-modified by a set of flags.  See <a class="link" href="NMSetting.html#nm-setting-compare" title="nm_setting_compare ()"><code class="function">nm_setting_compare()</code></a> for a description of
-each flag's behavior.  If the connections differ, settings and keys within
-each setting that differ are added to the returned <em class="parameter"><code>out_settings</code></em> hash table.
-No values are returned, only key names.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>a</code></em> :</span></p></td>
-<td>a <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>b</code></em> :</span></p></td>
-<td>a second <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> to compare with the first
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>flags</code></em> :</span></p></td>
-<td>compare flags, e.g. <a class="link" href="NMSetting.html#NM-SETTING-COMPARE-FLAG-EXACT:CAPS"><code class="literal">NM_SETTING_COMPARE_FLAG_EXACT</code></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>out_settings</code></em> :</span></p></td>
-<td>if the connections differ, on return a hash table mapping
-setting names to second-level GHashTable, which contains key names that differ
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the connections contain the same values, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if they do
-not
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_connection_verify ()">
-<a name="nm-connection-verify"></a><h3>nm_connection_verify ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_connection_verify                (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
-<p>
-Validates the connection and all its settings.  Each setting's properties
-have allowed values, and some values are dependent on other values.  For
-example, if a WiFi connection is security enabled, the <a class="link" href="NMSettingWireless.html" title="NMSettingWireless"><span class="type">NMSettingWireless</span></a>
-setting object's 'security' property must contain the setting name of the
-<a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> object, which must also be present in the 
-connection for the connection to be valid.  As another example, the
-<a class="link" href="NMSettingWired.html" title="NMSettingWired"><span class="type">NMSettingWired</span></a> object's 'mac-address' property must be a validly formatted
-MAC address.  The returned <a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> contains information about which
-setting and which property failed validation, and how it failed validation.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
-<td>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> to verify
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>location to store error, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the connection is valid, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if it is not
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_connection_need_secrets ()">
-<a name="nm-connection-need-secrets"></a><h3>nm_connection_need_secrets ()</h3>
-<pre class="programlisting">const <span class="returnvalue">char</span> *        nm_connection_need_secrets          (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> **hints</code></em>);</pre>
-<p>
-Returns the name of the first setting object in the connection which would
-need secrets to make a successful connection.  The returned hints are only
-intended as a guide to what secrets may be required, because in some
-circumstances, there is no way to conclusively determine exactly which
-secrets are needed.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
-<td>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>hints</code></em> :</span></p></td>
-<td>the address of a pointer to a <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a>, initialized to NULL, which
-on return points to an allocated <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> containing the property names of
-secrets of the <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> which may be required; the caller owns the array
-and must free the each array element with <a href="http://library.gnome.org/devel/glib/unstable/glib-Memory-Allocation.html#g-free"><code class="function">g_free()</code></a>, as well as the array
-itself with <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#g-ptr-array-free"><code class="function">g_ptr_array_free()</code></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the setting name of the <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> object which has invalid or
-missing secrets
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_connection_clear_secrets ()">
-<a name="nm-connection-clear-secrets"></a><h3>nm_connection_clear_secrets ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                nm_connection_clear_secrets         (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
-<p>
-Clears and frees any secrets that may be stored in the connection, to avoid
-keeping secret data in memory when not needed.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
-<td>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>
-</td>
-</tr></tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_connection_update_secrets ()">
-<a name="nm-connection-update-secrets"></a><h3>nm_connection_update_secrets ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_connection_update_secrets        (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> *setting_name</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *setting_secrets</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
-<p>
-Update the specified setting's secrets, given a hash table of secrets
-intended for that setting (deserialized from D-Bus for example).
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
-<td>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting_name</code></em> :</span></p></td>
-<td>the setting object name to which the secrets apply
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting_secrets</code></em> :</span></p></td>
-<td>a <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> mapping string:<a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> of setting property names and
-secrets
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>location to store error, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the secrets were successfully updated and the connection
-is valid, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> on failure or if the setting was never added to the connection
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_connection_set_scope ()">
-<a name="nm-connection-set-scope"></a><h3>nm_connection_set_scope ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                nm_connection_set_scope             (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMConnection.html#NMConnectionScope" title="enum NMConnectionScope"><span class="type">NMConnectionScope</span></a> scope</code></em>);</pre>
-<p>
-Sets the scope of the connection.  This property is not serialized, and is
-only for the reference of the caller.  A connection may have no scope
-(internal, temporary connections), "system" scope (provided by the system
-settings service), or "user" scope, provided by a user settings service.  The
-creator of the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> object is responsible for setting the
-connection's scope if needed.  Sets the <a class="link" href="NMConnection.html#NMConnection--scope" title='The "scope" property'><span class="type">"scope"</span></a> property.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
-<td>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>scope</code></em> :</span></p></td>
-<td>the scope of the connection
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_connection_get_scope ()">
-<a name="nm-connection-get-scope"></a><h3>nm_connection_get_scope ()</h3>
-<pre class="programlisting"><a class="link" href="NMConnection.html#NMConnectionScope" title="enum NMConnectionScope"><span class="returnvalue">NMConnectionScope</span></a>   nm_connection_get_scope             (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
-<p>
-Returns the connection scope.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
-<td>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the scope of the connection, previously set by a call to
-<a class="link" href="NMConnection.html#nm-connection-set-scope" title="nm_connection_set_scope ()"><code class="function">nm_connection_set_scope()</code></a>.
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_connection_set_path ()">
-<a name="nm-connection-set-path"></a><h3>nm_connection_set_path ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                nm_connection_set_path              (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> *path</code></em>);</pre>
-<p>
-Sets the D-Bus path of the connection.  This property is not serialized, and
-is only for the reference of the caller.  Sets the <a class="link" href="NMConnection.html#NMConnection--path" title='The "path" property'><span class="type">"path"</span></a>
-property.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
-<td>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>path</code></em> :</span></p></td>
-<td>the D-Bus path of the connection as given by the settings service
-which provides the connection
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_connection_get_path ()">
-<a name="nm-connection-get-path"></a><h3>nm_connection_get_path ()</h3>
-<pre class="programlisting">const <span class="returnvalue">char</span> *        nm_connection_get_path              (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
-<p>
-Returns the connection's D-Bus path.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
-<td>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the D-Bus path of the connection, previously set by a call to
-<a class="link" href="NMConnection.html#nm-connection-set-path" title="nm_connection_set_path ()"><code class="function">nm_connection_set_path()</code></a>.
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_connection_for_each_setting_value ()">
-<a name="nm-connection-for-each-setting-value"></a><h3>nm_connection_for_each_setting_value ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                nm_connection_for_each_setting_value
-                                                        (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSetting.html#NMSettingValueIterFn" title="NMSettingValueIterFn ()"><span class="type">NMSettingValueIterFn</span></a> func</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
-<p>
-Iterates over the properties of each <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> object in the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>,
-calling the supplied user function for each property.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
-<td>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>func</code></em> :</span></p></td>
-<td>user-supplied function called for each setting's property
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
-<td>user data passed to <em class="parameter"><code>func</code></em> at each invocation
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_connection_to_hash ()">
-<a name="nm-connection-to-hash"></a><h3>nm_connection_to_hash ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="returnvalue">GHashTable</span></a> *        nm_connection_to_hash               (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
-<p>
-Converts the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> into a <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> describing the connection,
-suitable for marshalling over D-Bus or serializing.  The hash table mapping
-is string:<a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> with each element in the returned hash representing
-a <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> object.  The keys are setting object names, and the values
-are <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTables</span></a> mapping string:GValue, each of which represents the
-properties of the <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> object.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
-<td>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a new <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> describing the connection, its settings, and
-each setting's properties.  The caller owns the hash table and must unref
-the hash table with <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#g-hash-table-unref"><code class="function">g_hash_table_unref()</code></a> when it is no longer needed.
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_connection_dump ()">
-<a name="nm-connection-dump"></a><h3>nm_connection_dump ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                nm_connection_dump                  (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
-<p>
-Print the connection to stdout.  For debugging purposes ONLY, should NOT
-be used for serialization of the connection or machine-parsed in any way. The
-output format is not guaranteed to be stable and may change at any time.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
-<td>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>
-</td>
-</tr></tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_connection_create_setting ()">
-<a name="nm-connection-create-setting"></a><h3>nm_connection_create_setting ()</h3>
-<pre class="programlisting"><a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *         nm_connection_create_setting        (<em class="parameter"><code>const <span class="type">char</span> *name</code></em>);</pre>
-<p>
-Create a new <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> object of the desired type, given a setting name.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>name</code></em> :</span></p></td>
-<td>a setting name
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the new setting object, or NULL if the setting name was unknown
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_connection_lookup_setting_type ()">
-<a name="nm-connection-lookup-setting-type"></a><h3>nm_connection_lookup_setting_type ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               nm_connection_lookup_setting_type   (<em class="parameter"><code>const <span class="type">char</span> *name</code></em>);</pre>
-<p>
-Returns the <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> of the setting's class for a given setting name.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>name</code></em> :</span></p></td>
-<td>a setting name
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> of the setting's class
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_connection_lookup_setting_type_by_quark ()">
-<a name="nm-connection-lookup-setting-type-by-quark"></a><h3>nm_connection_lookup_setting_type_by_quark ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               nm_connection_lookup_setting_type_by_quark
-                                                        (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="type">GQuark</span></a> error_quark</code></em>);</pre>
-<p>
-Returns the <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> of the setting's class for a given setting error quark.
-Useful for figuring out which setting a returned error is for.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>error_quark</code></em> :</span></p></td>
-<td>a setting error quark
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> of the setting's class
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-</div>
-<div class="refsect1" title="Property Details">
-<a name="NMConnection.property-details"></a><h2>Property Details</h2>
-<div class="refsect2" title='The "path" property'>
-<a name="NMConnection--path"></a><h3>The <code class="literal">"path"</code> property</h3>
-<pre class="programlisting">  "path"                     <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write / Construct</pre>
-<p>
-The connection's D-Bus path, used only by the calling process as a record
-of the D-Bus path of the connection as provided by a settings service.
-</p>
-<p>Default value: NULL</p>
-</div>
-<hr>
-<div class="refsect2" title='The "scope" property'>
-<a name="NMConnection--scope"></a><h3>The <code class="literal">"scope"</code> property</h3>
-<pre class="programlisting">  "scope"                    <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write / Construct</pre>
-<p>
-The connection's scope, used only by the calling process as a record
-of which settings service the connection is provided by.  One of the
-NM_CONNECTION_SCOPE_* defines.
-</p>
-<p>Allowed values: &lt;= 2</p>
-<p>Default value: 0</p>
-</div>
-</div>
-<div class="refsect1" title="Signal Details">
-<a name="NMConnection.signal-details"></a><h2>Signal Details</h2>
-<div class="refsect2" title='The "secrets-updated" signal'>
-<a name="NMConnection-secrets-updated"></a><h3>The <code class="literal">"secrets-updated"</code> signal</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                user_function                      (<a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection,
-                                                        <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>        *setting_name,
-                                                        <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>      user_data)         : Run First</pre>
-<p>
-The ::secrets-updated signal is emitted when the secrets of a setting
-have been changed.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
-<td>the object on which the signal is emitted
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting_name</code></em> :</span></p></td>
-<td>the setting name of the <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> for which secrets were
-updated
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
-<td>user data set when the signal handler was connected.</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-</div>
-</div>
-<div class="footer">
-<hr>
-          Generated by GTK-Doc V1.15</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSetting.html b/docs/libnm-util/html/NMSetting.html
index a31c80d40..c77c59854 100644
--- a/docs/libnm-util/html/NMSetting.html
+++ b/docs/libnm-util/html/NMSetting.html
@@ -3,18 +3,18 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>NMSetting</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="libnm-util Reference Manual">
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
-<link rel="prev" href="NMConnection.html" title="NMConnection">
+<link rel="prev" href="ch01.html" title="libnm-util API Reference">
 <link rel="next" href="NMSettingConnection.html" title="NMSettingConnection">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
 <tr valign="middle">
-<td><a accesskey="p" href="NMConnection.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
+<td><a accesskey="p" href="ch01.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
 <td><a accesskey="u" href="ch01.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
 <th width="100%" align="center">libnm-util Reference Manual</th>
@@ -30,7 +30,7 @@
                   <a href="#NMSetting.properties" class="shortcut">Properties</a>
 </td></tr>
 </table>
-<div class="refentry" title="NMSetting">
+<div class="refentry">
 <a name="NMSetting"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
@@ -39,12 +39,12 @@
 </td>
 <td valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv" title="Synopsis">
+<div class="refsynopsisdiv">
 <a name="NMSetting.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">
+<a name="NMSettingError"></a><pre class="synopsis">
 #include &lt;nm-setting.h&gt;
 
-enum                <a class="link" href="NMSetting.html#NMSettingError" title="enum NMSettingError">NMSettingError</a>;
+enum                <a class="link" href="NMSetting.html#NMSettingError">NMSettingError</a>;
 #define             <a class="link" href="NMSetting.html#NM-TYPE-SETTING-ERROR:CAPS" title="NM_TYPE_SETTING_ERROR">NM_TYPE_SETTING_ERROR</a>
 #define             <a class="link" href="NMSetting.html#NM-SETTING-ERROR:CAPS" title="NM_SETTING_ERROR">NM_SETTING_ERROR</a>
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              <a class="link" href="NMSetting.html#nm-setting-error-quark" title="nm_setting_error_quark ()">nm_setting_error_quark</a>              (<em class="parameter"><code><span class="type">void</span></code></em>);
@@ -53,6 +53,7 @@ enum                <a class="link" href="NMSetting.html#NMSettingError" title="
 #define             <a class="link" href="NMSetting.html#NM-SETTING-PARAM-SECRET:CAPS" title="NM_SETTING_PARAM_SECRET">NM_SETTING_PARAM_SECRET</a>
 #define             <a class="link" href="NMSetting.html#NM-SETTING-PARAM-FUZZY-IGNORE:CAPS" title="NM_SETTING_PARAM_FUZZY_IGNORE">NM_SETTING_PARAM_FUZZY_IGNORE</a>
 #define             <a class="link" href="NMSetting.html#NM-SETTING-NAME:CAPS" title="NM_SETTING_NAME">NM_SETTING_NAME</a>
+enum                <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags">NMSettingSecretFlags</a>;
                     <a class="link" href="NMSetting.html#NMSetting-struct" title="NMSetting">NMSetting</a>;
                     <a class="link" href="NMSetting.html#NMSettingClass" title="NMSettingClass">NMSettingClass</a>;
 <span class="returnvalue">void</span>                (<a class="link" href="NMSetting.html#NMSettingValueIterFn" title="NMSettingValueIterFn ()">*NMSettingValueIterFn</a>)             (<em class="parameter"><code><a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> *setting</code></em>,
@@ -61,7 +62,9 @@ enum                <a class="link" href="NMSetting.html#NMSettingError" title="
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-GParamSpec.html#GParamFlags"><span class="type">GParamFlags</span></a> flags</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
 <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               <a class="link" href="NMSetting.html#nm-setting-get-type" title="nm_setting_get_type ()">nm_setting_get_type</a>                 (<em class="parameter"><code><span class="type">void</span></code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="returnvalue">GHashTable</span></a> *        <a class="link" href="NMSetting.html#nm-setting-to-hash" title="nm_setting_to_hash ()">nm_setting_to_hash</a>                  (<em class="parameter"><code><a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> *setting</code></em>);
+enum                <a class="link" href="NMSetting.html#NMSettingHashFlags" title="enum NMSettingHashFlags">NMSettingHashFlags</a>;
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="returnvalue">GHashTable</span></a> *        <a class="link" href="NMSetting.html#nm-setting-to-hash" title="nm_setting_to_hash ()">nm_setting_to_hash</a>                  (<em class="parameter"><code><a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> *setting</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="NMSetting.html#NMSettingHashFlags" title="enum NMSettingHashFlags"><span class="type">NMSettingHashFlags</span></a> flags</code></em>);
 <a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *         <a class="link" href="NMSetting.html#nm-setting-new-from-hash" title="nm_setting_new_from_hash ()">nm_setting_new_from_hash</a>            (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> setting_type</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *hash</code></em>);
 <a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *         <a class="link" href="NMSetting.html#nm-setting-duplicate" title="nm_setting_duplicate ()">nm_setting_duplicate</a>                (<em class="parameter"><code><a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> *setting</code></em>);
@@ -88,11 +91,23 @@ enum                <a class="link" href="NMSetting.html#NMSettingDiffResult" ti
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMSetting.html#nm-setting-update-secrets" title="nm_setting_update_secrets ()">nm_setting_update_secrets</a>           (<em class="parameter"><code><a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *secrets</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMSetting.html#nm-setting-get-secret-flags" title="nm_setting_get_secret_flags ()">nm_setting_get_secret_flags</a>         (<em class="parameter"><code><a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> *setting</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *secret_name</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> *out_flags</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMSetting.html#nm-setting-set-secret-flags" title="nm_setting_set_secret_flags ()">nm_setting_set_secret_flags</a>         (<em class="parameter"><code><a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> *setting</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *secret_name</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> flags</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
 </pre>
 </div>
-<div class="refsect1" title="Object Hierarchy">
+<div class="refsect1">
 <a name="NMSetting.object-hierarchy"></a><h2>Object Hierarchy</h2>
 <pre class="synopsis">
+  GEnum
+   +----NMSettingError
+</pre>
+<pre class="synopsis">
   <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>
    +----NMSetting
          +----<a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
@@ -107,31 +122,32 @@ enum                <a class="link" href="NMSetting.html#NMSettingDiffResult" ti
          +----<a class="link" href="NMSettingPPPOE.html" title="NMSettingPPPOE">NMSettingPPPOE</a>
          +----<a class="link" href="NMSettingSerial.html" title="NMSettingSerial">NMSettingSerial</a>
          +----<a class="link" href="NMSettingVPN.html" title="NMSettingVPN">NMSettingVPN</a>
+         +----NMSettingWimax
          +----<a class="link" href="NMSettingWired.html" title="NMSettingWired">NMSettingWired</a>
          +----<a class="link" href="NMSettingWireless.html" title="NMSettingWireless">NMSettingWireless</a>
          +----<a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity">NMSettingWirelessSecurity</a>
 </pre>
 </div>
-<div class="refsect1" title="Properties">
+<div class="refsect1">
 <a name="NMSetting.properties"></a><h2>Properties</h2>
 <pre class="synopsis">
   "<a class="link" href="NMSetting.html#NMSetting--name" title='The "name" property'>name</a>"                     <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write
 </pre>
 </div>
-<div class="refsect1" title="Description">
+<div class="refsect1">
 <a name="NMSetting.description"></a><h2>Description</h2>
 <p>
 Each <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> contains properties that describe configuration that applies
 to a specific network layer (like IPv4 or IPv6 configuration) or device type
 (like Ethernet, or WiFi).  A collection of individual settings together
-make up an <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>. Each property is strongly typed and usually has
+make up an <span class="type">NMConnection</span>. Each property is strongly typed and usually has
 a number of allowed values.  See each <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> subclass for a description
 of properties and allowed values.
 </p>
 </div>
-<div class="refsect1" title="Details">
+<div class="refsect1">
 <a name="NMSetting.details"></a><h2>Details</h2>
-<div class="refsect2" title="enum NMSettingError">
+<div class="refsect2">
 <a name="NMSettingError"></a><h3>enum NMSettingError</h3>
 <pre class="programlisting">typedef enum
 {
@@ -175,7 +191,7 @@ Describes errors that may result from operations involving a <a class="link" hre
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="NM_TYPE_SETTING_ERROR">
+<div class="refsect2">
 <a name="NM-TYPE-SETTING-ERROR:CAPS"></a><h3>NM_TYPE_SETTING_ERROR</h3>
 <pre class="programlisting">#define NM_TYPE_SETTING_ERROR (nm_setting_error_get_type ()) 
 </pre>
@@ -183,7 +199,7 @@ Describes errors that may result from operations involving a <a class="link" hre
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_ERROR">
+<div class="refsect2">
 <a name="NM-SETTING-ERROR:CAPS"></a><h3>NM_SETTING_ERROR</h3>
 <pre class="programlisting">#define NM_SETTING_ERROR nm_setting_error_quark ()
 </pre>
@@ -191,7 +207,7 @@ Describes errors that may result from operations involving a <a class="link" hre
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_error_quark ()">
+<div class="refsect2">
 <a name="nm-setting-error-quark"></a><h3>nm_setting_error_quark ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              nm_setting_error_quark              (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
@@ -201,13 +217,12 @@ Registers an error quark for <a class="link" href="NMSetting.html" title="NMSett
 <col align="left" valign="top">
 <tbody><tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the error quark used for NMSetting errors.
-</td>
+<td>the error quark used for NMSetting errors.</td>
 </tr></tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_PARAM_SERIALIZE">
+<div class="refsect2">
 <a name="NM-SETTING-PARAM-SERIALIZE:CAPS"></a><h3>NM_SETTING_PARAM_SERIALIZE</h3>
 <pre class="programlisting">#define NM_SETTING_PARAM_SERIALIZE    (1 &lt;&lt; (0 + G_PARAM_USER_SHIFT))
 </pre>
@@ -215,7 +230,7 @@ Registers an error quark for <a class="link" href="NMSetting.html" title="NMSett
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_PARAM_REQUIRED">
+<div class="refsect2">
 <a name="NM-SETTING-PARAM-REQUIRED:CAPS"></a><h3>NM_SETTING_PARAM_REQUIRED</h3>
 <pre class="programlisting">#define NM_SETTING_PARAM_REQUIRED     (1 &lt;&lt; (1 + G_PARAM_USER_SHIFT))
 </pre>
@@ -223,7 +238,7 @@ Registers an error quark for <a class="link" href="NMSetting.html" title="NMSett
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_PARAM_SECRET">
+<div class="refsect2">
 <a name="NM-SETTING-PARAM-SECRET:CAPS"></a><h3>NM_SETTING_PARAM_SECRET</h3>
 <pre class="programlisting">#define NM_SETTING_PARAM_SECRET       (1 &lt;&lt; (2 + G_PARAM_USER_SHIFT))
 </pre>
@@ -231,7 +246,7 @@ Registers an error quark for <a class="link" href="NMSetting.html" title="NMSett
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_PARAM_FUZZY_IGNORE">
+<div class="refsect2">
 <a name="NM-SETTING-PARAM-FUZZY-IGNORE:CAPS"></a><h3>NM_SETTING_PARAM_FUZZY_IGNORE</h3>
 <pre class="programlisting">#define NM_SETTING_PARAM_FUZZY_IGNORE (1 &lt;&lt; (3 + G_PARAM_USER_SHIFT))
 </pre>
@@ -239,7 +254,7 @@ Registers an error quark for <a class="link" href="NMSetting.html" title="NMSett
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_NAME">
+<div class="refsect2">
 <a name="NM-SETTING-NAME:CAPS"></a><h3>NM_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_NAME "name"
 </pre>
@@ -247,7 +262,57 @@ Registers an error quark for <a class="link" href="NMSetting.html" title="NMSett
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMSetting">
+<div class="refsect2">
+<a name="NMSettingSecretFlags"></a><h3>enum NMSettingSecretFlags</h3>
+<pre class="programlisting">typedef enum {
+	NM_SETTING_SECRET_FLAG_NONE         = 0x00000000,
+	NM_SETTING_SECRET_FLAG_AGENT_OWNED  = 0x00000001,
+	NM_SETTING_SECRET_FLAG_NOT_SAVED    = 0x00000002,
+	NM_SETTING_SECRET_FLAG_NOT_REQUIRED = 0x00000004
+
+	/* NOTE: if adding flags, update nm-setting-private.h as well */
+} NMSettingSecretFlags;
+</pre>
+<p>
+These flags indicate specific behavior related to handling of a secret.  Each
+secret has a corresponding set of these flags which indicate how the secret
+is to be stored and/or requested when it is needed.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><a name="NM-SETTING-SECRET-FLAG-NONE:CAPS"></a><span class="term"><code class="literal">NM_SETTING_SECRET_FLAG_NONE</code></span></p></td>
+<td>the system is responsible for providing and
+storing this secret (default)
+</td>
+</tr>
+<tr>
+<td><p><a name="NM-SETTING-SECRET-FLAG-AGENT-OWNED:CAPS"></a><span class="term"><code class="literal">NM_SETTING_SECRET_FLAG_AGENT_OWNED</code></span></p></td>
+<td>a user secret agent is responsible
+for providing and storing this secret; when it is required agents will be
+asked to retrieve it
+</td>
+</tr>
+<tr>
+<td><p><a name="NM-SETTING-SECRET-FLAG-NOT-SAVED:CAPS"></a><span class="term"><code class="literal">NM_SETTING_SECRET_FLAG_NOT_SAVED</code></span></p></td>
+<td>this secret should not be saved, but
+should be requested from the user each time it is needed
+</td>
+</tr>
+<tr>
+<td><p><a name="NM-SETTING-SECRET-FLAG-NOT-REQUIRED:CAPS"></a><span class="term"><code class="literal">NM_SETTING_SECRET_FLAG_NOT_REQUIRED</code></span></p></td>
+<td>in situations where it cannot be
+automatically determined that the secret is required (some VPNs and PPP
+providers dont require all secrets) this flag indicates that the specific
+secret is not required
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
 <a name="NMSetting-struct"></a><h3>NMSetting</h3>
 <pre class="programlisting">typedef struct _NMSetting NMSetting;</pre>
 <p>
@@ -256,7 +321,7 @@ It should only be accessed through the functions described below.
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMSettingClass">
+<div class="refsect2">
 <a name="NMSettingClass"></a><h3>NMSettingClass</h3>
 <pre class="programlisting">typedef struct {
 	GObjectClass parent;
@@ -273,6 +338,18 @@ It should only be accessed through the functions described below.
 	                                  GValue     *value,
 	                                  GError    **error);
 
+	gboolean    (*get_secret_flags)  (NMSetting  *setting,
+	                                  const char *secret_name,
+	                                  gboolean verify_secret,
+	                                  NMSettingSecretFlags *out_flags,
+	                                  GError **error);
+
+	gboolean    (*set_secret_flags)  (NMSetting  *setting,
+	                                  const char *secret_name,
+	                                  gboolean verify_secret,
+	                                  NMSettingSecretFlags flags,
+	                                  GError **error);
+
 	/* Padding for future expansion */
 	void (*_reserved1) (void);
 	void (*_reserved2) (void);
@@ -284,7 +361,7 @@ It should only be accessed through the functions described below.
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMSettingValueIterFn ()">
+<div class="refsect2">
 <a name="NMSettingValueIterFn"></a><h3>NMSettingValueIterFn ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                (*NMSettingValueIterFn)             (<em class="parameter"><code><a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> *setting</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *key</code></em>,
@@ -293,56 +370,53 @@ It should only be accessed through the functions described below.
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
 <p>
 </p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-get-type"></a><h3>nm_setting_get_type ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               nm_setting_get_type                 (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMSettingHashFlags"></a><h3>enum NMSettingHashFlags</h3>
+<pre class="programlisting">typedef enum {
+	NM_SETTING_HASH_FLAG_ALL = 0x00000000,
+	NM_SETTING_HASH_FLAG_NO_SECRETS = 0x00000001,
+	NM_SETTING_HASH_FLAG_ONLY_SECRETS = 0x00000002,
+} NMSettingHashFlags;
+</pre>
+<p>
+These flags determine which properties are added to the resulting hash
+when calling <a class="link" href="NMSetting.html#nm-setting-to-hash" title="nm_setting_to_hash ()"><code class="function">nm_setting_to_hash()</code></a>.
+</p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
+<td><p><a name="NM-SETTING-HASH-FLAG-ALL:CAPS"></a><span class="term"><code class="literal">NM_SETTING_HASH_FLAG_ALL</code></span></p></td>
+<td>hash all properties (including secrets)
 </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>key</code></em> :</span></p></td>
-<td>
+<td><p><a name="NM-SETTING-HASH-FLAG-NO-SECRETS:CAPS"></a><span class="term"><code class="literal">NM_SETTING_HASH_FLAG_NO_SECRETS</code></span></p></td>
+<td>do not include secrets
 </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>flags</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
-<td>
+<td><p><a name="NM-SETTING-HASH-FLAG-ONLY-SECRETS:CAPS"></a><span class="term"><code class="literal">NM_SETTING_HASH_FLAG_ONLY_SECRETS</code></span></p></td>
+<td>only hash secrets
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_get_type ()">
-<a name="nm-setting-get-type"></a><h3>nm_setting_get_type ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               nm_setting_get_type                 (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_setting_to_hash ()">
+<div class="refsect2">
 <a name="nm-setting-to-hash"></a><h3>nm_setting_to_hash ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="returnvalue">GHashTable</span></a> *        nm_setting_to_hash                  (<em class="parameter"><code><a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> *setting</code></em>);</pre>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="returnvalue">GHashTable</span></a> *        nm_setting_to_hash                  (<em class="parameter"><code><a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> *setting</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="NMSetting.html#NMSettingHashFlags" title="enum NMSettingHashFlags"><span class="type">NMSettingHashFlags</span></a> flags</code></em>);</pre>
 <p>
 Converts the <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> into a <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> mapping each setting property
 name to a GValue describing that property, suitable for marshalling over
@@ -357,15 +431,20 @@ D-Bus or serializing.  The mapping is string:GValue.
 </td>
 </tr>
 <tr>
+<td><p><span class="term"><em class="parameter"><code>flags</code></em> :</span></p></td>
+<td>hash flags, e.g. <a class="link" href="NMSetting.html#NM-SETTING-HASH-FLAG-ALL:CAPS"><code class="literal">NM_SETTING_HASH_FLAG_ALL</code></a>
+</td>
+</tr>
+<tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a new <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> describing the setting's properties
+<td>a new <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> describing the setting's properties. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>][<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> utf8 GObject.Value]</span>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_new_from_hash ()">
+<div class="refsect2">
 <a name="nm-setting-new-from-hash"></a><h3>nm_setting_new_from_hash ()</h3>
 <pre class="programlisting"><a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *         nm_setting_new_from_hash            (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> setting_type</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *hash</code></em>);</pre>
@@ -382,26 +461,23 @@ property names and value types.
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>setting_type</code></em> :</span></p></td>
-<td>the <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> type which the hash contains properties for
-</td>
+<td>the <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> type which the hash contains properties for</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>hash</code></em> :</span></p></td>
 <td>the <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> containing a string:GValue mapping of properties
-that apply to the setting
-</td>
+that apply to the setting</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a new <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> object populated with the properties from the
-hash table, or NULL on failure
-</td>
+<td>a new <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> object populated with the properties from the
+hash table, or NULL on failure</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_duplicate ()">
+<div class="refsect2">
 <a name="nm-setting-duplicate"></a><h3>nm_setting_duplicate ()</h3>
 <pre class="programlisting"><a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *         nm_setting_duplicate                (<em class="parameter"><code><a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> *setting</code></em>);</pre>
 <p>
@@ -412,20 +488,19 @@ Duplicates a <a class="link" href="NMSetting.html" title="NMSetting"><span class
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>the <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> to duplicate
-</td>
+<td>the <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> to duplicate</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a new <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> containing the same properties and values as the
-source <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a>
+<td>a new <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> containing the same properties and values as the
+source <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a>. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_get_name ()">
+<div class="refsect2">
 <a name="nm-setting-get-name"></a><h3>nm_setting_get_name ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_get_name                 (<em class="parameter"><code><a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> *setting</code></em>);</pre>
 <p>
@@ -441,15 +516,14 @@ Returns the type name of the <a class="link" href="NMSetting.html" title="NMSett
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a string containing the type name of the <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> object,
-like 'ppp' or 'wireless' or 'wired'.
-</td>
+<td>a string containing the type name of the <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> object,
+like 'ppp' or 'wireless' or 'wired'.</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_verify ()">
+<div class="refsect2">
 <a name="nm-setting-verify"></a><h3>nm_setting_verify ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_verify                   (<em class="parameter"><code><a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> *all_settings</code></em>,
@@ -465,14 +539,12 @@ failed validation, and in what way that property failed validation.
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>the <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> to verify
-</td>
+<td>the <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> to verify</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>all_settings</code></em> :</span></p></td>
 <td>a <a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> of all settings in the connection from which <em class="parameter"><code>setting</code></em>
-came
-</td>
+came</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
@@ -481,14 +553,14 @@ came
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the setting is valid, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if it is not
-</td>
+<td>
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the setting is valid, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if it is not</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="enum NMSettingCompareFlags">
+<div class="refsect2">
 <a name="NMSettingCompareFlags"></a><h3>enum NMSettingCompareFlags</h3>
 <pre class="programlisting">typedef enum {
 	NM_SETTING_COMPARE_FLAG_EXACT = 0x00000000,
@@ -530,7 +602,7 @@ two connections.
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_compare ()">
+<div class="refsect2">
 <a name="nm-setting-compare"></a><h3>nm_setting_compare ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_compare                  (<em class="parameter"><code><a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> *a</code></em>,
                                                          <em class="parameter"><code><a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> *b</code></em>,
@@ -550,8 +622,7 @@ for a description of each flag's behavior.
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>b</code></em> :</span></p></td>
-<td>a second <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> to compare with the first
-</td>
+<td>a second <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> to compare with the first</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>flags</code></em> :</span></p></td>
@@ -560,14 +631,14 @@ for a description of each flag's behavior.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the comparison succeeds, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if it does not
-</td>
+<td>
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the comparison succeeds, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if it does not</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="enum NMSettingDiffResult">
+<div class="refsect2">
 <a name="NMSettingDiffResult"></a><h3>enum NMSettingDiffResult</h3>
 <pre class="programlisting">typedef enum {
 	NM_SETTING_DIFF_RESULT_UNKNOWN = 0x00000000,
@@ -600,7 +671,7 @@ These values indicate the result of a setting difference operation.
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_diff ()">
+<div class="refsect2">
 <a name="nm-setting-diff"></a><h3>nm_setting_diff ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_diff                     (<em class="parameter"><code><a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> *a</code></em>,
                                                          <em class="parameter"><code><a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> *b</code></em>,
@@ -624,8 +695,7 @@ one or more <a class="link" href="NMSetting.html#NMSettingDiffResult" title="enu
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>b</code></em> :</span></p></td>
-<td>a second <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> to compare with the first
-</td>
+<td>a second <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> to compare with the first</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>flags</code></em> :</span></p></td>
@@ -635,12 +705,11 @@ one or more <a class="link" href="NMSetting.html#NMSettingDiffResult" title="enu
 <tr>
 <td><p><span class="term"><em class="parameter"><code>invert_results</code></em> :</span></p></td>
 <td>this parameter is used internally by libnm-util and should
-be set to <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a>.  If <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> inverts the meaning of the <a class="link" href="NMSetting.html#NMSettingDiffResult" title="enum NMSettingDiffResult"><span class="type">NMSettingDiffResult</span></a>.
-</td>
+be set to <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a>.  If <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> inverts the meaning of the <a class="link" href="NMSetting.html#NMSettingDiffResult" title="enum NMSettingDiffResult"><span class="type">NMSettingDiffResult</span></a>.</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>results</code></em> :</span></p></td>
-<td> if the settings differ, on return a
+<td>if the settings differ, on return a
 hash table mapping the differing keys to one or more <a class="link" href="NMSetting.html#NMSettingDiffResult" title="enum NMSettingDiffResult"><span class="type">NMSettingDiffResult</span></a>
 values OR-ed together.  If the settings do not differ, any hash table passed
 in is unmodified.  If no hash table is passed in, a new one is created. <span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> utf8 guint32]</span>
@@ -648,14 +717,14 @@ in is unmodified.  If no hash table is passed in, a new one is created. <span cl
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the settings contain the same values, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if they do not
-</td>
+<td>
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the settings contain the same values, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if they do not</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_enumerate_values ()">
+<div class="refsect2">
 <a name="nm-setting-enumerate-values"></a><h3>nm_setting_enumerate_values ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_setting_enumerate_values         (<em class="parameter"><code><a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a class="link" href="NMSetting.html#NMSettingValueIterFn" title="NMSettingValueIterFn ()"><span class="type">NMSettingValueIterFn</span></a> func</code></em>,
@@ -674,19 +743,18 @@ user function for each property.
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>func</code></em> :</span></p></td>
-<td>user-supplied function called for each property of the setting
+<td>user-supplied function called for each property of the setting. <span class="annotation">[<acronym title="The callback is valid only during the call to the method."><span class="acronym">scope call</span></acronym>]</span>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
-<td>user data passed to <em class="parameter"><code>func</code></em> at each invocation
-</td>
+<td>user data passed to <em class="parameter"><code>func</code></em> at each invocation</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_to_string ()">
+<div class="refsect2">
 <a name="nm-setting-to-string"></a><h3>nm_setting_to_string ()</h3>
 <pre class="programlisting"><span class="returnvalue">char</span> *              nm_setting_to_string                (<em class="parameter"><code><a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> *setting</code></em>);</pre>
 <p>
@@ -704,7 +772,7 @@ output format is not guaranteed to be stable and may change at any time.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> an allocated string containing a textual representation of the
+<td>an allocated string containing a textual representation of the
 setting's properties and values (including secrets!), which the caller should
 free with <a href="http://library.gnome.org/devel/glib/unstable/glib-Memory-Allocation.html#g-free"><code class="function">g_free()</code></a>
 </td>
@@ -713,7 +781,7 @@ free with <a href="http://library.gnome.org/devel/glib/unstable/glib-Memory-Allo
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_clear_secrets ()">
+<div class="refsect2">
 <a name="nm-setting-clear-secrets"></a><h3>nm_setting_clear_secrets ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_setting_clear_secrets            (<em class="parameter"><code><a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> *setting</code></em>);</pre>
 <p>
@@ -731,7 +799,7 @@ leakage of information.
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_need_secrets ()">
+<div class="refsect2">
 <a name="nm-setting-need-secrets"></a><h3>nm_setting_need_secrets ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="returnvalue">GPtrArray</span></a> *         nm_setting_need_secrets             (<em class="parameter"><code><a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> *setting</code></em>);</pre>
 <p>
@@ -750,17 +818,17 @@ is no way to conclusively determine exactly which secrets are needed.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> containing the property names of secrets of the
+<td>a <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> containing the property names of secrets of the
 <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> which may be required; the caller owns the array
 and must free the each array element with <a href="http://library.gnome.org/devel/glib/unstable/glib-Memory-Allocation.html#g-free"><code class="function">g_free()</code></a>, as well as the array
-itself with <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#g-ptr-array-free"><code class="function">g_ptr_array_free()</code></a>
+itself with <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#g-ptr-array-free"><code class="function">g_ptr_array_free()</code></a>. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>][<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> utf8]</span>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_update_secrets ()">
+<div class="refsect2">
 <a name="nm-setting-update-secrets"></a><h3>nm_setting_update_secrets ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_update_secrets           (<em class="parameter"><code><a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *secrets</code></em>,
@@ -780,27 +848,106 @@ setting (deserialized from D-Bus for example).
 <tr>
 <td><p><span class="term"><em class="parameter"><code>secrets</code></em> :</span></p></td>
 <td>a <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> mapping string:<a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> of setting property names and
-secrets
+secrets</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
+<td>location to store error, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>
 </td>
 </tr>
 <tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the secrets were successfully updated and the connection
+is valid, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> on failure or if the setting was never added to the connection</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-get-secret-flags"></a><h3>nm_setting_get_secret_flags ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_get_secret_flags         (<em class="parameter"><code><a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> *setting</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *secret_name</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> *out_flags</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
+<p>
+For a given secret, retrieves the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> describing how to
+handle that secret.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
+<td>the <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>secret_name</code></em> :</span></p></td>
+<td>the secret key name to get flags for</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>out_flags</code></em> :</span></p></td>
+<td>on success, the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> for the secret</td>
+</tr>
+<tr>
 <td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
 <td>location to store error, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the secrets were successfully updated and the connection
-is valid, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> on failure or if the setting was never added to the connection
+<td>TRUE on success (if the given secret name was a valid property of
+this setting, and if that property is secret), FALSE if not</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-set-secret-flags"></a><h3>nm_setting_set_secret_flags ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_set_secret_flags         (<em class="parameter"><code><a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> *setting</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *secret_name</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> flags</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
+<p>
+For a given secret, retrieves the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> describing how to
+handle that secret.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
+<td>the <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>secret_name</code></em> :</span></p></td>
+<td>the secret key name to set flags for</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>flags</code></em> :</span></p></td>
+<td>the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> for the secret</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
+<td>location to store error, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>
 </td>
 </tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>TRUE on success (if the given secret name was a valid property of
+this setting, and if that property is secret), FALSE if not</td>
+</tr>
 </tbody>
 </table></div>
 </div>
 </div>
-<div class="refsect1" title="Property Details">
+<div class="refsect1">
 <a name="NMSetting.property-details"></a><h2>Property Details</h2>
-<div class="refsect2" title='The "name" property'>
+<div class="refsect2">
 <a name="NMSetting--name"></a><h3>The <code class="literal">"name"</code> property</h3>
 <pre class="programlisting">  "name"                     <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -814,6 +961,6 @@ example 'ppp' or 'wireless' or 'wired'.
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.15</div>
+          Generated by GTK-Doc V1.17</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSetting8021x.html b/docs/libnm-util/html/NMSetting8021x.html
index 7b25578e0..8ef172c14 100644
--- a/docs/libnm-util/html/NMSetting8021x.html
+++ b/docs/libnm-util/html/NMSetting8021x.html
@@ -3,12 +3,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>NMSetting8021x</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="libnm-util Reference Manual">
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingOlpcMesh.html" title="NMSettingOlpcMesh">
 <link rel="next" href="NMSettingIP4Config.html" title="NMSettingIP4Config">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,7 +30,7 @@
                   <a href="#NMSetting8021x.properties" class="shortcut">Properties</a>
 </td></tr>
 </table>
-<div class="refentry" title="NMSetting8021x">
+<div class="refentry">
 <a name="NMSetting8021x"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
@@ -39,15 +39,15 @@
 </td>
 <td valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv" title="Synopsis">
+<div class="refsynopsisdiv">
 <a name="NMSetting8021x.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">
+<a name="NMSetting8021xError"></a><pre class="synopsis">
 #include &lt;nm-setting-8021x.h&gt;
 
 enum                <a class="link" href="NMSetting8021x.html#NMSetting8021xCKFormat" title="enum NMSetting8021xCKFormat">NMSetting8021xCKFormat</a>;
 enum                <a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme" title="enum NMSetting8021xCKScheme">NMSetting8021xCKScheme</a>;
 #define             <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-SETTING-NAME:CAPS" title="NM_SETTING_802_1X_SETTING_NAME">NM_SETTING_802_1X_SETTING_NAME</a>
-enum                <a class="link" href="NMSetting8021x.html#NMSetting8021xError" title="enum NMSetting8021xError">NMSetting8021xError</a>;
+enum                <a class="link" href="NMSetting8021x.html#NMSetting8021xError">NMSetting8021xError</a>;
 #define             <a class="link" href="NMSetting8021x.html#NM-TYPE-SETTING-802-1X-ERROR:CAPS" title="NM_TYPE_SETTING_802_1X_ERROR">NM_TYPE_SETTING_802_1X_ERROR</a>
 #define             <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-ERROR:CAPS" title="NM_SETTING_802_1X_ERROR">NM_SETTING_802_1X_ERROR</a>
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-error-quark" title="nm_setting_802_1x_error_quark ()">nm_setting_802_1x_error_quark</a>       (<em class="parameter"><code><span class="type">void</span></code></em>);
@@ -66,12 +66,15 @@ enum                <a class="link" href="NMSetting8021x.html#NMSetting8021xErro
 #define             <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-PHASE2-CA-PATH:CAPS" title="NM_SETTING_802_1X_PHASE2_CA_PATH">NM_SETTING_802_1X_PHASE2_CA_PATH</a>
 #define             <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-PHASE2-CLIENT-CERT:CAPS" title="NM_SETTING_802_1X_PHASE2_CLIENT_CERT">NM_SETTING_802_1X_PHASE2_CLIENT_CERT</a>
 #define             <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-PASSWORD:CAPS" title="NM_SETTING_802_1X_PASSWORD">NM_SETTING_802_1X_PASSWORD</a>
+#define             <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-PASSWORD-FLAGS:CAPS" title="NM_SETTING_802_1X_PASSWORD_FLAGS">NM_SETTING_802_1X_PASSWORD_FLAGS</a>
 #define             <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-PRIVATE-KEY:CAPS" title="NM_SETTING_802_1X_PRIVATE_KEY">NM_SETTING_802_1X_PRIVATE_KEY</a>
 #define             <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-PRIVATE-KEY-PASSWORD:CAPS" title="NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD">NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD</a>
+#define             <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-PRIVATE-KEY-PASSWORD-FLAGS:CAPS" title="NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS">NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS</a>
 #define             <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-PHASE2-PRIVATE-KEY:CAPS" title="NM_SETTING_802_1X_PHASE2_PRIVATE_KEY">NM_SETTING_802_1X_PHASE2_PRIVATE_KEY</a>
 #define             <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-PHASE2-PRIVATE-KEY-PASSWORD:CAPS" title="NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD">NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD</a>
+#define             <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-PHASE2-PRIVATE-KEY-PASSWORD-FLAGS:CAPS" title="NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS">NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS</a>
 #define             <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-PIN:CAPS" title="NM_SETTING_802_1X_PIN">NM_SETTING_802_1X_PIN</a>
-#define             <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-PSK:CAPS" title="NM_SETTING_802_1X_PSK">NM_SETTING_802_1X_PSK</a>
+#define             <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-PIN-FLAGS:CAPS" title="NM_SETTING_802_1X_PIN_FLAGS">NM_SETTING_802_1X_PIN_FLAGS</a>
 #define             <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-SYSTEM-CA-CERTS:CAPS" title="NM_SETTING_802_1X_SYSTEM_CA_CERTS">NM_SETTING_802_1X_SYSTEM_CA_CERTS</a>
                     <a class="link" href="NMSetting8021x.html#NMSetting8021x-struct" title="NMSetting8021x">NMSetting8021x</a>;
                     <a class="link" href="NMSetting8021x.html#NMSetting8021xClass" title="NMSetting8021xClass">NMSetting8021xClass</a>;
@@ -96,8 +99,10 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
 <a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme" title="enum NMSetting8021xCKScheme"><span class="returnvalue">NMSetting8021xCKScheme</span></a>  <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-ca-cert-scheme" title="nm_setting_802_1x_get_ca_cert_scheme ()">nm_setting_802_1x_get_ca_cert_scheme</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
-const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *  <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-ca-cert-blob" title="nm_setting_802_1x_get_ca_cert_blob ()">nm_setting_802_1x_get_ca_cert_blob</a>  (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
-const <span class="returnvalue">char</span> *        <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-ca-cert-path" title="nm_setting_802_1x_get_ca_cert_path ()">nm_setting_802_1x_get_ca_cert_path</a>  (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
+const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *      <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-ca-cert-blob" title="nm_setting_802_1x_get_ca_cert_blob ()">nm_setting_802_1x_get_ca_cert_blob</a>
+                                                        (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
+const <span class="returnvalue">char</span> *            <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-ca-cert-path" title="nm_setting_802_1x_get_ca_cert_path ()">nm_setting_802_1x_get_ca_cert_path</a>
+                                                        (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-ca-cert" title="nm_setting_802_1x_set_ca_cert ()">nm_setting_802_1x_set_ca_cert</a>       (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *value</code></em>,
                                                          <em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme" title="enum NMSetting8021xCKScheme"><span class="type">NMSetting8021xCKScheme</span></a> scheme</code></em>,
@@ -105,9 +110,9 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
 <a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme" title="enum NMSetting8021xCKScheme"><span class="returnvalue">NMSetting8021xCKScheme</span></a>  <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-client-cert-scheme" title="nm_setting_802_1x_get_client_cert_scheme ()">nm_setting_802_1x_get_client_cert_scheme</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
-const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *  <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-client-cert-blob" title="nm_setting_802_1x_get_client_cert_blob ()">nm_setting_802_1x_get_client_cert_blob</a>
+const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *      <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-client-cert-blob" title="nm_setting_802_1x_get_client_cert_blob ()">nm_setting_802_1x_get_client_cert_blob</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
-const <span class="returnvalue">char</span> *        <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-client-cert-path" title="nm_setting_802_1x_get_client_cert_path ()">nm_setting_802_1x_get_client_cert_path</a>
+const <span class="returnvalue">char</span> *            <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-client-cert-path" title="nm_setting_802_1x_get_client_cert_path ()">nm_setting_802_1x_get_client_cert_path</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-client-cert" title="nm_setting_802_1x_set_client_cert ()">nm_setting_802_1x_set_client_cert</a>   (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *value</code></em>,
@@ -125,9 +130,9 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
 <a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme" title="enum NMSetting8021xCKScheme"><span class="returnvalue">NMSetting8021xCKScheme</span></a>  <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-ca-cert-scheme" title="nm_setting_802_1x_get_phase2_ca_cert_scheme ()">nm_setting_802_1x_get_phase2_ca_cert_scheme</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
-const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *  <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-ca-cert-blob" title="nm_setting_802_1x_get_phase2_ca_cert_blob ()">nm_setting_802_1x_get_phase2_ca_cert_blob</a>
+const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *      <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-ca-cert-blob" title="nm_setting_802_1x_get_phase2_ca_cert_blob ()">nm_setting_802_1x_get_phase2_ca_cert_blob</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
-const <span class="returnvalue">char</span> *        <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-ca-cert-path" title="nm_setting_802_1x_get_phase2_ca_cert_path ()">nm_setting_802_1x_get_phase2_ca_cert_path</a>
+const <span class="returnvalue">char</span> *            <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-ca-cert-path" title="nm_setting_802_1x_get_phase2_ca_cert_path ()">nm_setting_802_1x_get_phase2_ca_cert_path</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-phase2-ca-cert" title="nm_setting_802_1x_set_phase2_ca_cert ()">nm_setting_802_1x_set_phase2_ca_cert</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
@@ -137,9 +142,9 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
 <a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme" title="enum NMSetting8021xCKScheme"><span class="returnvalue">NMSetting8021xCKScheme</span></a>  <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-client-cert-scheme" title="nm_setting_802_1x_get_phase2_client_cert_scheme ()">nm_setting_802_1x_get_phase2_client_cert_scheme</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
-const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *  <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-client-cert-blob" title="nm_setting_802_1x_get_phase2_client_cert_blob ()">nm_setting_802_1x_get_phase2_client_cert_blob</a>
+const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *      <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-client-cert-blob" title="nm_setting_802_1x_get_phase2_client_cert_blob ()">nm_setting_802_1x_get_phase2_client_cert_blob</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
-const <span class="returnvalue">char</span> *        <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-client-cert-path" title="nm_setting_802_1x_get_phase2_client_cert_path ()">nm_setting_802_1x_get_phase2_client_cert_path</a>
+const <span class="returnvalue">char</span> *            <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-client-cert-path" title="nm_setting_802_1x_get_phase2_client_cert_path ()">nm_setting_802_1x_get_phase2_client_cert_path</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-phase2-client-cert" title="nm_setting_802_1x_set_phase2_client_cert ()">nm_setting_802_1x_set_phase2_client_cert</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
@@ -148,13 +153,15 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
                                                          <em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKFormat" title="enum NMSetting8021xCKFormat"><span class="type">NMSetting8021xCKFormat</span></a> *out_format</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
 const <span class="returnvalue">char</span> *        <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-password" title="nm_setting_802_1x_get_password ()">nm_setting_802_1x_get_password</a>      (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
+<a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="returnvalue">NMSettingSecretFlags</span></a>  <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-password-flags" title="nm_setting_802_1x_get_password_flags ()">nm_setting_802_1x_get_password_flags</a>
+                                                        (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
 const <span class="returnvalue">char</span> *        <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-pin" title="nm_setting_802_1x_get_pin ()">nm_setting_802_1x_get_pin</a>           (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
-const <span class="returnvalue">char</span> *        <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-psk" title="nm_setting_802_1x_get_psk ()">nm_setting_802_1x_get_psk</a>           (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
+<a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="returnvalue">NMSettingSecretFlags</span></a>  <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-pin-flags" title="nm_setting_802_1x_get_pin_flags ()">nm_setting_802_1x_get_pin_flags</a>   (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
 <a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme" title="enum NMSetting8021xCKScheme"><span class="returnvalue">NMSetting8021xCKScheme</span></a>  <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-private-key-scheme" title="nm_setting_802_1x_get_private_key_scheme ()">nm_setting_802_1x_get_private_key_scheme</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
-const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *  <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-private-key-blob" title="nm_setting_802_1x_get_private_key_blob ()">nm_setting_802_1x_get_private_key_blob</a>
+const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *      <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-private-key-blob" title="nm_setting_802_1x_get_private_key_blob ()">nm_setting_802_1x_get_private_key_blob</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
-const <span class="returnvalue">char</span> *        <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-private-key-path" title="nm_setting_802_1x_get_private_key_path ()">nm_setting_802_1x_get_private_key_path</a>
+const <span class="returnvalue">char</span> *            <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-private-key-path" title="nm_setting_802_1x_get_private_key_path ()">nm_setting_802_1x_get_private_key_path</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-private-key" title="nm_setting_802_1x_set_private_key ()">nm_setting_802_1x_set_private_key</a>   (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *value</code></em>,
@@ -162,15 +169,17 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
                                                          <em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme" title="enum NMSetting8021xCKScheme"><span class="type">NMSetting8021xCKScheme</span></a> scheme</code></em>,
                                                          <em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKFormat" title="enum NMSetting8021xCKFormat"><span class="type">NMSetting8021xCKFormat</span></a> *out_format</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
-const <span class="returnvalue">char</span> *        <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-private-key-password" title="nm_setting_802_1x_get_private_key_password ()">nm_setting_802_1x_get_private_key_password</a>
+const <span class="returnvalue">char</span> *            <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-private-key-password" title="nm_setting_802_1x_get_private_key_password ()">nm_setting_802_1x_get_private_key_password</a>
+                                                        (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
+<a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="returnvalue">NMSettingSecretFlags</span></a>  <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-private-key-password-flags" title="nm_setting_802_1x_get_private_key_password_flags ()">nm_setting_802_1x_get_private_key_password_flags</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
 <a class="link" href="NMSetting8021x.html#NMSetting8021xCKFormat" title="enum NMSetting8021xCKFormat"><span class="returnvalue">NMSetting8021xCKFormat</span></a>  <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-private-key-format" title="nm_setting_802_1x_get_private_key_format ()">nm_setting_802_1x_get_private_key_format</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
 <a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme" title="enum NMSetting8021xCKScheme"><span class="returnvalue">NMSetting8021xCKScheme</span></a>  <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-scheme" title="nm_setting_802_1x_get_phase2_private_key_scheme ()">nm_setting_802_1x_get_phase2_private_key_scheme</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
-const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *  <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-blob" title="nm_setting_802_1x_get_phase2_private_key_blob ()">nm_setting_802_1x_get_phase2_private_key_blob</a>
+const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *      <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-blob" title="nm_setting_802_1x_get_phase2_private_key_blob ()">nm_setting_802_1x_get_phase2_private_key_blob</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
-const <span class="returnvalue">char</span> *        <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-path" title="nm_setting_802_1x_get_phase2_private_key_path ()">nm_setting_802_1x_get_phase2_private_key_path</a>
+const <span class="returnvalue">char</span> *            <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-path" title="nm_setting_802_1x_get_phase2_private_key_path ()">nm_setting_802_1x_get_phase2_private_key_path</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-phase2-private-key" title="nm_setting_802_1x_set_phase2_private_key ()">nm_setting_802_1x_set_phase2_private_key</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
@@ -179,67 +188,27 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
                                                          <em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme" title="enum NMSetting8021xCKScheme"><span class="type">NMSetting8021xCKScheme</span></a> scheme</code></em>,
                                                          <em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKFormat" title="enum NMSetting8021xCKFormat"><span class="type">NMSetting8021xCKFormat</span></a> *out_format</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
-const <span class="returnvalue">char</span> *        <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-password" title="nm_setting_802_1x_get_phase2_private_key_password ()">nm_setting_802_1x_get_phase2_private_key_password</a>
-                                                        (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
-<a class="link" href="NMSetting8021x.html#NMSetting8021xCKFormat" title="enum NMSetting8021xCKFormat"><span class="returnvalue">NMSetting8021xCKFormat</span></a>  <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-format" title="nm_setting_802_1x_get_phase2_private_key_format ()">nm_setting_802_1x_get_phase2_private_key_format</a>
-                                                        (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
-enum                <a class="link" href="NMSetting8021x.html#NMSetting8021xCKType" title="enum NMSetting8021xCKType">NMSetting8021xCKType</a>;
-const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *  <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-ca-cert" title="nm_setting_802_1x_get_ca_cert ()">nm_setting_802_1x_get_ca_cert</a>       (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-ca-cert-from-file" title="nm_setting_802_1x_set_ca_cert_from_file ()">nm_setting_802_1x_set_ca_cert_from_file</a>
-                                                        (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> *filename</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKType" title="enum NMSetting8021xCKType"><span class="type">NMSetting8021xCKType</span></a> *out_ck_type</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
-const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *  <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-client-cert" title="nm_setting_802_1x_get_client_cert ()">nm_setting_802_1x_get_client_cert</a>   (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-client-cert-from-file" title="nm_setting_802_1x_set_client_cert_from_file ()">nm_setting_802_1x_set_client_cert_from_file</a>
-                                                        (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> *filename</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKType" title="enum NMSetting8021xCKType"><span class="type">NMSetting8021xCKType</span></a> *out_ck_type</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
-const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *  <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-ca-cert" title="nm_setting_802_1x_get_phase2_ca_cert ()">nm_setting_802_1x_get_phase2_ca_cert</a>
-                                                        (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-phase2-ca-cert-from-file" title="nm_setting_802_1x_set_phase2_ca_cert_from_file ()">nm_setting_802_1x_set_phase2_ca_cert_from_file</a>
-                                                        (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> *filename</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKType" title="enum NMSetting8021xCKType"><span class="type">NMSetting8021xCKType</span></a> *out_ck_type</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
-const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *  <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-client-cert" title="nm_setting_802_1x_get_phase2_client_cert ()">nm_setting_802_1x_get_phase2_client_cert</a>
-                                                        (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-phase2-client-cert-from-file" title="nm_setting_802_1x_set_phase2_client_cert_from_file ()">nm_setting_802_1x_set_phase2_client_cert_from_file</a>
-                                                        (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> *filename</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKType" title="enum NMSetting8021xCKType"><span class="type">NMSetting8021xCKType</span></a> *out_ck_type</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
-const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *  <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-private-key" title="nm_setting_802_1x_get_private_key ()">nm_setting_802_1x_get_private_key</a>   (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-private-key-from-file" title="nm_setting_802_1x_set_private_key_from_file ()">nm_setting_802_1x_set_private_key_from_file</a>
-                                                        (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> *filename</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> *password</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKType" title="enum NMSetting8021xCKType"><span class="type">NMSetting8021xCKType</span></a> *out_ck_type</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
-<a class="link" href="NMSetting8021x.html#NMSetting8021xCKType" title="enum NMSetting8021xCKType"><span class="returnvalue">NMSetting8021xCKType</span></a>  <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-private-key-type" title="nm_setting_802_1x_get_private_key_type ()">nm_setting_802_1x_get_private_key_type</a>
+const <span class="returnvalue">char</span> *            <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-password" title="nm_setting_802_1x_get_phase2_private_key_password ()">nm_setting_802_1x_get_phase2_private_key_password</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
-const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *  <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key" title="nm_setting_802_1x_get_phase2_private_key ()">nm_setting_802_1x_get_phase2_private_key</a>
+<a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="returnvalue">NMSettingSecretFlags</span></a>  <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-password-flags" title="nm_setting_802_1x_get_phase2_private_key_password_flags ()">nm_setting_802_1x_get_phase2_private_key_password_flags</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-phase2-private-key-from-file" title="nm_setting_802_1x_set_phase2_private_key_from_file ()">nm_setting_802_1x_set_phase2_private_key_from_file</a>
-                                                        (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> *filename</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> *password</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKType" title="enum NMSetting8021xCKType"><span class="type">NMSetting8021xCKType</span></a> *out_ck_type</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
-<a class="link" href="NMSetting8021x.html#NMSetting8021xCKType" title="enum NMSetting8021xCKType"><span class="returnvalue">NMSetting8021xCKType</span></a>  <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-type" title="nm_setting_802_1x_get_phase2_private_key_type ()">nm_setting_802_1x_get_phase2_private_key_type</a>
+<a class="link" href="NMSetting8021x.html#NMSetting8021xCKFormat" title="enum NMSetting8021xCKFormat"><span class="returnvalue">NMSetting8021xCKFormat</span></a>  <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-format" title="nm_setting_802_1x_get_phase2_private_key_format ()">nm_setting_802_1x_get_phase2_private_key_format</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
 </pre>
 </div>
-<div class="refsect1" title="Object Hierarchy">
+<div class="refsect1">
 <a name="NMSetting8021x.object-hierarchy"></a><h2>Object Hierarchy</h2>
 <pre class="synopsis">
+  GEnum
+   +----NMSetting8021xError
+</pre>
+<pre class="synopsis">
   <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>
    +----<a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
          +----NMSetting8021x
 </pre>
 </div>
-<div class="refsect1" title="Properties">
+<div class="refsect1">
 <a name="NMSetting8021x.properties"></a><h2>Properties</h2>
 <pre class="synopsis">
   "<a class="link" href="NMSetting8021x.html#NMSetting8021x--anonymous-identity" title='The "anonymous-identity" property'>anonymous-identity</a>"       <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write
@@ -249,6 +218,7 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.htm
   "<a class="link" href="NMSetting8021x.html#NMSetting8021x--eap" title='The "eap" property'>eap</a>"                      <span class="type">GSList_gchararray_</span>*   : Read / Write
   "<a class="link" href="NMSetting8021x.html#NMSetting8021x--identity" title='The "identity" property'>identity</a>"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write
   "<a class="link" href="NMSetting8021x.html#NMSetting8021x--password" title='The "password" property'>password</a>"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write
+  "<a class="link" href="NMSetting8021x.html#NMSetting8021x--password-flags" title='The "password-flags" property'>password-flags</a>"           <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write
   "<a class="link" href="NMSetting8021x.html#NMSetting8021x--phase1-fast-provisioning" title='The "phase1-fast-provisioning" property'>phase1-fast-provisioning</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write
   "<a class="link" href="NMSetting8021x.html#NMSetting8021x--phase1-peaplabel" title='The "phase1-peaplabel" property'>phase1-peaplabel</a>"         <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write
   "<a class="link" href="NMSetting8021x.html#NMSetting8021x--phase1-peapver" title='The "phase1-peapver" property'>phase1-peapver</a>"           <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write
@@ -259,12 +229,14 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.htm
   "<a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-client-cert" title='The "phase2-client-cert" property'>phase2-client-cert</a>"       <span class="type">GArray_guchar_</span>*       : Read / Write
   "<a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-private-key" title='The "phase2-private-key" property'>phase2-private-key</a>"       <span class="type">GArray_guchar_</span>*       : Read / Write
   "<a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-private-key-password" title='The "phase2-private-key-password" property'>phase2-private-key-password</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write
+  "<a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-private-key-password-flags" title='The "phase2-private-key-password-flags" property'>phase2-private-key-password-flags</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write
   "<a class="link" href="NMSetting8021x.html#NMSetting8021x--private-key" title='The "private-key" property'>private-key</a>"              <span class="type">GArray_guchar_</span>*       : Read / Write
   "<a class="link" href="NMSetting8021x.html#NMSetting8021x--private-key-password" title='The "private-key-password" property'>private-key-password</a>"     <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write
+  "<a class="link" href="NMSetting8021x.html#NMSetting8021x--private-key-password-flags" title='The "private-key-password-flags" property'>private-key-password-flags</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write
   "<a class="link" href="NMSetting8021x.html#NMSetting8021x--system-ca-certs" title='The "system-ca-certs" property'>system-ca-certs</a>"          <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write / Construct
 </pre>
 </div>
-<div class="refsect1" title="Description">
+<div class="refsect1">
 <a name="NMSetting8021x.description"></a><h2>Description</h2>
 <p>
 The <a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> object is a <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> subclass that describes
@@ -295,9 +267,9 @@ following books.
       ISBN: 978-1587051548
 </p>
 </div>
-<div class="refsect1" title="Details">
+<div class="refsect1">
 <a name="NMSetting8021x.details"></a><h2>Details</h2>
-<div class="refsect2" title="enum NMSetting8021xCKFormat">
+<div class="refsect2">
 <a name="NMSetting8021xCKFormat"></a><h3>enum NMSetting8021xCKFormat</h3>
 <pre class="programlisting">typedef enum {
 	NM_SETTING_802_1X_CK_FORMAT_UNKNOWN = 0,
@@ -307,10 +279,39 @@ following books.
 } NMSetting8021xCKFormat;
 </pre>
 <p>
+<a class="link" href="NMSetting8021x.html#NMSetting8021xCKFormat" title="enum NMSetting8021xCKFormat"><span class="type">NMSetting8021xCKFormat</span></a> values indicate the general type of a certificate
+or private key
 </p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><a name="NM-SETTING-802-1X-CK-FORMAT-UNKNOWN:CAPS"></a><span class="term"><code class="literal">NM_SETTING_802_1X_CK_FORMAT_UNKNOWN</code></span></p></td>
+<td>unknown file format
+</td>
+</tr>
+<tr>
+<td><p><a name="NM-SETTING-802-1X-CK-FORMAT-X509:CAPS"></a><span class="term"><code class="literal">NM_SETTING_802_1X_CK_FORMAT_X509</code></span></p></td>
+<td>file contains an X.509 format certificate
+</td>
+</tr>
+<tr>
+<td><p><a name="NM-SETTING-802-1X-CK-FORMAT-RAW-KEY:CAPS"></a><span class="term"><code class="literal">NM_SETTING_802_1X_CK_FORMAT_RAW_KEY</code></span></p></td>
+<td>file contains an old-style OpenSSL PEM
+or DER private key
+</td>
+</tr>
+<tr>
+<td><p><a name="NM-SETTING-802-1X-CK-FORMAT-PKCS12:CAPS"></a><span class="term"><code class="literal">NM_SETTING_802_1X_CK_FORMAT_PKCS12</code></span></p></td>
+<td>file contains a PKCS<span class="type">12</span> certificate
+and private key
+</td>
+</tr>
+</tbody>
+</table></div>
 </div>
 <hr>
-<div class="refsect2" title="enum NMSetting8021xCKScheme">
+<div class="refsect2">
 <a name="NMSetting8021xCKScheme"></a><h3>enum NMSetting8021xCKScheme</h3>
 <pre class="programlisting">typedef enum {
 	NM_SETTING_802_1X_CK_SCHEME_UNKNOWN = 0,
@@ -319,10 +320,36 @@ following books.
 } NMSetting8021xCKScheme;
 </pre>
 <p>
+<a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme" title="enum NMSetting8021xCKScheme"><span class="type">NMSetting8021xCKScheme</span></a> values indicate how a certificate or private key is
+stored in the setting properties, either as a blob of the item's data, or as
+a path to a certificate or private key file on the filesystem
 </p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><a name="NM-SETTING-802-1X-CK-SCHEME-UNKNOWN:CAPS"></a><span class="term"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_UNKNOWN</code></span></p></td>
+<td>unknown certificate or private key
+scheme
+</td>
+</tr>
+<tr>
+<td><p><a name="NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"></a><span class="term"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code></span></p></td>
+<td>certificate or key is stored as the raw
+item data
+</td>
+</tr>
+<tr>
+<td><p><a name="NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"></a><span class="term"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code></span></p></td>
+<td>certificate or key is stored as a path
+to a file containing the certificate or key data
+</td>
+</tr>
+</tbody>
+</table></div>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_802_1X_SETTING_NAME">
+<div class="refsect2">
 <a name="NM-SETTING-802-1X-SETTING-NAME:CAPS"></a><h3>NM_SETTING_802_1X_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_SETTING_NAME "802-1x"
 </pre>
@@ -330,7 +357,7 @@ following books.
 </p>
 </div>
 <hr>
-<div class="refsect2" title="enum NMSetting8021xError">
+<div class="refsect2">
 <a name="NMSetting8021xError"></a><h3>enum NMSetting8021xError</h3>
 <pre class="programlisting">typedef enum
 {
@@ -343,7 +370,7 @@ following books.
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_TYPE_SETTING_802_1X_ERROR">
+<div class="refsect2">
 <a name="NM-TYPE-SETTING-802-1X-ERROR:CAPS"></a><h3>NM_TYPE_SETTING_802_1X_ERROR</h3>
 <pre class="programlisting">#define NM_TYPE_SETTING_802_1X_ERROR (nm_setting_802_1x_error_get_type ()) 
 </pre>
@@ -351,7 +378,7 @@ following books.
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_802_1X_ERROR">
+<div class="refsect2">
 <a name="NM-SETTING-802-1X-ERROR:CAPS"></a><h3>NM_SETTING_802_1X_ERROR</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_ERROR nm_setting_802_1x_error_quark ()
 </pre>
@@ -359,7 +386,7 @@ following books.
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_error_quark ()">
+<div class="refsect2">
 <a name="nm-setting-802-1x-error-quark"></a><h3>nm_setting_802_1x_error_quark ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              nm_setting_802_1x_error_quark       (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
@@ -369,13 +396,12 @@ Registers an error quark for <a class="link" href="NMSetting8021x.html" title="N
 <col align="left" valign="top">
 <tbody><tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the error quark used for <a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> errors.
-</td>
+<td>the error quark used for <a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> errors.</td>
 </tr></tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_802_1X_EAP">
+<div class="refsect2">
 <a name="NM-SETTING-802-1X-EAP:CAPS"></a><h3>NM_SETTING_802_1X_EAP</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_EAP "eap"
 </pre>
@@ -383,7 +409,7 @@ Registers an error quark for <a class="link" href="NMSetting8021x.html" title="N
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_802_1X_IDENTITY">
+<div class="refsect2">
 <a name="NM-SETTING-802-1X-IDENTITY:CAPS"></a><h3>NM_SETTING_802_1X_IDENTITY</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_IDENTITY "identity"
 </pre>
@@ -391,7 +417,7 @@ Registers an error quark for <a class="link" href="NMSetting8021x.html" title="N
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_802_1X_ANONYMOUS_IDENTITY">
+<div class="refsect2">
 <a name="NM-SETTING-802-1X-ANONYMOUS-IDENTITY:CAPS"></a><h3>NM_SETTING_802_1X_ANONYMOUS_IDENTITY</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_ANONYMOUS_IDENTITY "anonymous-identity"
 </pre>
@@ -399,7 +425,7 @@ Registers an error quark for <a class="link" href="NMSetting8021x.html" title="N
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_802_1X_CA_CERT">
+<div class="refsect2">
 <a name="NM-SETTING-802-1X-CA-CERT:CAPS"></a><h3>NM_SETTING_802_1X_CA_CERT</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_CA_CERT "ca-cert"
 </pre>
@@ -407,7 +433,7 @@ Registers an error quark for <a class="link" href="NMSetting8021x.html" title="N
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_802_1X_CA_PATH">
+<div class="refsect2">
 <a name="NM-SETTING-802-1X-CA-PATH:CAPS"></a><h3>NM_SETTING_802_1X_CA_PATH</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_CA_PATH "ca-path"
 </pre>
@@ -415,7 +441,7 @@ Registers an error quark for <a class="link" href="NMSetting8021x.html" title="N
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_802_1X_CLIENT_CERT">
+<div class="refsect2">
 <a name="NM-SETTING-802-1X-CLIENT-CERT:CAPS"></a><h3>NM_SETTING_802_1X_CLIENT_CERT</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_CLIENT_CERT "client-cert"
 </pre>
@@ -423,7 +449,7 @@ Registers an error quark for <a class="link" href="NMSetting8021x.html" title="N
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_802_1X_PHASE1_PEAPVER">
+<div class="refsect2">
 <a name="NM-SETTING-802-1X-PHASE1-PEAPVER:CAPS"></a><h3>NM_SETTING_802_1X_PHASE1_PEAPVER</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_PHASE1_PEAPVER "phase1-peapver"
 </pre>
@@ -431,7 +457,7 @@ Registers an error quark for <a class="link" href="NMSetting8021x.html" title="N
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_802_1X_PHASE1_PEAPLABEL">
+<div class="refsect2">
 <a name="NM-SETTING-802-1X-PHASE1-PEAPLABEL:CAPS"></a><h3>NM_SETTING_802_1X_PHASE1_PEAPLABEL</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_PHASE1_PEAPLABEL "phase1-peaplabel"
 </pre>
@@ -439,7 +465,7 @@ Registers an error quark for <a class="link" href="NMSetting8021x.html" title="N
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING">
+<div class="refsect2">
 <a name="NM-SETTING-802-1X-PHASE1-FAST-PROVISIONING:CAPS"></a><h3>NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING "phase1-fast-provisioning"
 </pre>
@@ -447,7 +473,7 @@ Registers an error quark for <a class="link" href="NMSetting8021x.html" title="N
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_802_1X_PHASE2_AUTH">
+<div class="refsect2">
 <a name="NM-SETTING-802-1X-PHASE2-AUTH:CAPS"></a><h3>NM_SETTING_802_1X_PHASE2_AUTH</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_PHASE2_AUTH "phase2-auth"
 </pre>
@@ -455,7 +481,7 @@ Registers an error quark for <a class="link" href="NMSetting8021x.html" title="N
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_802_1X_PHASE2_AUTHEAP">
+<div class="refsect2">
 <a name="NM-SETTING-802-1X-PHASE2-AUTHEAP:CAPS"></a><h3>NM_SETTING_802_1X_PHASE2_AUTHEAP</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_PHASE2_AUTHEAP "phase2-autheap"
 </pre>
@@ -463,7 +489,7 @@ Registers an error quark for <a class="link" href="NMSetting8021x.html" title="N
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_802_1X_PHASE2_CA_CERT">
+<div class="refsect2">
 <a name="NM-SETTING-802-1X-PHASE2-CA-CERT:CAPS"></a><h3>NM_SETTING_802_1X_PHASE2_CA_CERT</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_PHASE2_CA_CERT "phase2-ca-cert"
 </pre>
@@ -471,7 +497,7 @@ Registers an error quark for <a class="link" href="NMSetting8021x.html" title="N
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_802_1X_PHASE2_CA_PATH">
+<div class="refsect2">
 <a name="NM-SETTING-802-1X-PHASE2-CA-PATH:CAPS"></a><h3>NM_SETTING_802_1X_PHASE2_CA_PATH</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_PHASE2_CA_PATH "phase2-ca-path"
 </pre>
@@ -479,7 +505,7 @@ Registers an error quark for <a class="link" href="NMSetting8021x.html" title="N
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_802_1X_PHASE2_CLIENT_CERT">
+<div class="refsect2">
 <a name="NM-SETTING-802-1X-PHASE2-CLIENT-CERT:CAPS"></a><h3>NM_SETTING_802_1X_PHASE2_CLIENT_CERT</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_PHASE2_CLIENT_CERT "phase2-client-cert"
 </pre>
@@ -487,7 +513,7 @@ Registers an error quark for <a class="link" href="NMSetting8021x.html" title="N
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_802_1X_PASSWORD">
+<div class="refsect2">
 <a name="NM-SETTING-802-1X-PASSWORD:CAPS"></a><h3>NM_SETTING_802_1X_PASSWORD</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_PASSWORD "password"
 </pre>
@@ -495,7 +521,15 @@ Registers an error quark for <a class="link" href="NMSetting8021x.html" title="N
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_802_1X_PRIVATE_KEY">
+<div class="refsect2">
+<a name="NM-SETTING-802-1X-PASSWORD-FLAGS:CAPS"></a><h3>NM_SETTING_802_1X_PASSWORD_FLAGS</h3>
+<pre class="programlisting">#define NM_SETTING_802_1X_PASSWORD_FLAGS "password-flags"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="NM-SETTING-802-1X-PRIVATE-KEY:CAPS"></a><h3>NM_SETTING_802_1X_PRIVATE_KEY</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_PRIVATE_KEY "private-key"
 </pre>
@@ -503,7 +537,7 @@ Registers an error quark for <a class="link" href="NMSetting8021x.html" title="N
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD">
+<div class="refsect2">
 <a name="NM-SETTING-802-1X-PRIVATE-KEY-PASSWORD:CAPS"></a><h3>NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD "private-key-password"
 </pre>
@@ -511,7 +545,15 @@ Registers an error quark for <a class="link" href="NMSetting8021x.html" title="N
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_802_1X_PHASE2_PRIVATE_KEY">
+<div class="refsect2">
+<a name="NM-SETTING-802-1X-PRIVATE-KEY-PASSWORD-FLAGS:CAPS"></a><h3>NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS</h3>
+<pre class="programlisting">#define NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS "private-key-password-flags"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="NM-SETTING-802-1X-PHASE2-PRIVATE-KEY:CAPS"></a><h3>NM_SETTING_802_1X_PHASE2_PRIVATE_KEY</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_PHASE2_PRIVATE_KEY "phase2-private-key"
 </pre>
@@ -519,7 +561,7 @@ Registers an error quark for <a class="link" href="NMSetting8021x.html" title="N
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD">
+<div class="refsect2">
 <a name="NM-SETTING-802-1X-PHASE2-PRIVATE-KEY-PASSWORD:CAPS"></a><h3>NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD "phase2-private-key-password"
 </pre>
@@ -527,7 +569,15 @@ Registers an error quark for <a class="link" href="NMSetting8021x.html" title="N
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_802_1X_PIN">
+<div class="refsect2">
+<a name="NM-SETTING-802-1X-PHASE2-PRIVATE-KEY-PASSWORD-FLAGS:CAPS"></a><h3>NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS</h3>
+<pre class="programlisting">#define NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS "phase2-private-key-password-flags"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="NM-SETTING-802-1X-PIN:CAPS"></a><h3>NM_SETTING_802_1X_PIN</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_PIN "pin"
 </pre>
@@ -535,15 +585,15 @@ Registers an error quark for <a class="link" href="NMSetting8021x.html" title="N
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_802_1X_PSK">
-<a name="NM-SETTING-802-1X-PSK:CAPS"></a><h3>NM_SETTING_802_1X_PSK</h3>
-<pre class="programlisting">#define NM_SETTING_802_1X_PSK "psk"
+<div class="refsect2">
+<a name="NM-SETTING-802-1X-PIN-FLAGS:CAPS"></a><h3>NM_SETTING_802_1X_PIN_FLAGS</h3>
+<pre class="programlisting">#define NM_SETTING_802_1X_PIN_FLAGS "pin-flags"
 </pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_802_1X_SYSTEM_CA_CERTS">
+<div class="refsect2">
 <a name="NM-SETTING-802-1X-SYSTEM-CA-CERTS:CAPS"></a><h3>NM_SETTING_802_1X_SYSTEM_CA_CERTS</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_SYSTEM_CA_CERTS "system-ca-certs"
 </pre>
@@ -551,14 +601,14 @@ Registers an error quark for <a class="link" href="NMSetting8021x.html" title="N
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMSetting8021x">
+<div class="refsect2">
 <a name="NMSetting8021x-struct"></a><h3>NMSetting8021x</h3>
 <pre class="programlisting">typedef struct _NMSetting8021x NMSetting8021x;</pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMSetting8021xClass">
+<div class="refsect2">
 <a name="NMSetting8021xClass"></a><h3>NMSetting8021xClass</h3>
 <pre class="programlisting">typedef struct {
 	NMSettingClass parent;
@@ -574,22 +624,14 @@ Registers an error quark for <a class="link" href="NMSetting8021x.html" title="N
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_get_type ()">
+<div class="refsect2">
 <a name="nm-setting-802-1x-get-type"></a><h3>nm_setting_802_1x_get_type ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               nm_setting_802_1x_get_type          (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_new ()">
+<div class="refsect2">
 <a name="nm-setting-802-1x-new"></a><h3>nm_setting_802_1x_new ()</h3>
 <pre class="programlisting"><a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *         nm_setting_802_1x_new               (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
@@ -599,13 +641,12 @@ Creates a new <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">
 <col align="left" valign="top">
 <tbody><tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the new empty <a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> object
-</td>
+<td>the new empty <a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> object</td>
 </tr></tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_get_num_eap_methods ()">
+<div class="refsect2">
 <a name="nm-setting-802-1x-get-num-eap-methods"></a><h3>nm_setting_802_1x_get_num_eap_methods ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_setting_802_1x_get_num_eap_methods
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
@@ -626,14 +667,13 @@ allowed EAP methods.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the number of allowed EAP methods
-</td>
+<td>the number of allowed EAP methods</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_get_eap_method ()">
+<div class="refsect2">
 <a name="nm-setting-802-1x-get-eap-method"></a><h3>nm_setting_802_1x_get_eap_method ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_802_1x_get_eap_method    (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> i</code></em>);</pre>
@@ -650,19 +690,18 @@ Returns the name of the allowed EAP method at index <em class="parameter"><code>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>i</code></em> :</span></p></td>
-<td>the index of the EAP method name to return
-</td>
+<td>the index of the EAP method name to return</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the name of the allowed EAP method at index <em class="parameter"><code>i</code></em>
+<td>the name of the allowed EAP method at index <em class="parameter"><code>i</code></em>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_add_eap_method ()">
+<div class="refsect2">
 <a name="nm-setting-802-1x-add-eap-method"></a><h3>nm_setting_802_1x_add_eap_method ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_802_1x_add_eap_method    (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *eap</code></em>);</pre>
@@ -681,20 +720,18 @@ allowed EAP methods.
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>eap</code></em> :</span></p></td>
-<td>the name of the EAP method to allow for this connection
-</td>
+<td>the name of the EAP method to allow for this connection</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> TRUE if the EAP method was successfully added, FALSE if it was
- not a valid method or if it was already allowed.
-</td>
+<td>TRUE if the EAP method was successfully added, FALSE if it was
+not a valid method or if it was already allowed.</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_remove_eap_method ()">
+<div class="refsect2">
 <a name="nm-setting-802-1x-remove-eap-method"></a><h3>nm_setting_802_1x_remove_eap_method ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_setting_802_1x_remove_eap_method (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> i</code></em>);</pre>
@@ -711,14 +748,13 @@ Removes the allowed EAP method at the specified index.
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>i</code></em> :</span></p></td>
-<td>the index of the EAP method to remove
-</td>
+<td>the index of the EAP method to remove</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_clear_eap_methods ()">
+<div class="refsect2">
 <a name="nm-setting-802-1x-clear-eap-methods"></a><h3>nm_setting_802_1x_clear_eap_methods ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_setting_802_1x_clear_eap_methods (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
 <p>
@@ -734,7 +770,7 @@ Clears all allowed EAP methods.
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_get_identity ()">
+<div class="refsect2">
 <a name="nm-setting-802-1x-get-identity"></a><h3>nm_setting_802_1x_get_identity ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_802_1x_get_identity      (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
 <p>
@@ -751,14 +787,13 @@ authenticate the user.  Often this is a username or login name.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the user identifier
-</td>
+<td>the user identifier</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_get_anonymous_identity ()">
+<div class="refsect2">
 <a name="nm-setting-802-1x-get-anonymous-identity"></a><h3>nm_setting_802_1x_get_anonymous_identity ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_802_1x_get_anonymous_identity
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
@@ -778,14 +813,13 @@ a secure form, if applicable for that EAP method.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the anonymous identifier
-</td>
+<td>the anonymous identifier</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_get_system_ca_certs ()">
+<div class="refsect2">
 <a name="nm-setting-802-1x-get-system-ca-certs"></a><h3>nm_setting_802_1x_get_system_ca_certs ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_802_1x_get_system_ca_certs
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
@@ -807,14 +841,13 @@ of these properties.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> TRUE if a system CA certificate path should be used, FALSE if not
-</td>
+<td>TRUE if a system CA certificate path should be used, FALSE if not</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_get_ca_path ()">
+<div class="refsect2">
 <a name="nm-setting-802-1x-get-ca-path"></a><h3>nm_setting_802_1x_get_ca_path ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_802_1x_get_ca_path       (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
 <p>
@@ -834,14 +867,13 @@ certificates for verifying the network to client.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the CA certificate directory path
-</td>
+<td>the CA certificate directory path</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_get_phase2_ca_path ()">
+<div class="refsect2">
 <a name="nm-setting-802-1x-get-phase2-ca-path"></a><h3>nm_setting_802_1x_get_phase2_ca_path ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_802_1x_get_phase2_ca_path
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
@@ -862,21 +894,20 @@ to add more CA certificates for verifying the network to client.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the "phase 2" CA certificate directory path
-</td>
+<td>the "phase 2" CA certificate directory path</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_get_ca_cert_scheme ()">
+<div class="refsect2">
 <a name="nm-setting-802-1x-get-ca-cert-scheme"></a><h3>nm_setting_802_1x_get_ca_cert_scheme ()</h3>
 <pre class="programlisting"><a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme" title="enum NMSetting8021xCKScheme"><span class="returnvalue">NMSetting8021xCKScheme</span></a>  nm_setting_802_1x_get_ca_cert_scheme
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
 <p>
 Returns the scheme used to store the CA certificate.  If the returned scheme
-is <code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code>, use <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-ca-cert-blob" title="nm_setting_802_1x_get_ca_cert_blob ()"><code class="function">nm_setting_802_1x_get_ca_cert_blob()</code></a>;
-if <code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code>, use <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-ca-cert-path" title="nm_setting_802_1x_get_ca_cert_path ()"><code class="function">nm_setting_802_1x_get_ca_cert_path()</code></a>.
+is <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code></a>, use <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-ca-cert-blob" title="nm_setting_802_1x_get_ca_cert_blob ()"><code class="function">nm_setting_802_1x_get_ca_cert_blob()</code></a>;
+if <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code></a>, use <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-ca-cert-path" title="nm_setting_802_1x_get_ca_cert_path ()"><code class="function">nm_setting_802_1x_get_ca_cert_path()</code></a>.
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
@@ -888,19 +919,19 @@ if <code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code>, use <a class="
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> scheme used to store the CA certificate (blob or path)
-</td>
+<td>scheme used to store the CA certificate (blob or path)</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_get_ca_cert_blob ()">
+<div class="refsect2">
 <a name="nm-setting-802-1x-get-ca-cert-blob"></a><h3>nm_setting_802_1x_get_ca_cert_blob ()</h3>
-<pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *  nm_setting_802_1x_get_ca_cert_blob  (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
+<pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *      nm_setting_802_1x_get_ca_cert_blob
+                                                        (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
 <p>
 Returns the CA certificate blob if the CA certificate is stored using the
-<code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code> scheme.  Not all EAP methods use a
+<a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code></a> scheme.  Not all EAP methods use a
 CA certificate (LEAP for example), and those that can take advantage of the
 CA certificate allow it to be unset.  Note that lack of a CA certificate
 reduces security by allowing man-in-the-middle attacks, because the identity
@@ -916,19 +947,19 @@ of the network cannot be confirmed by the client.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the CA certificate data
-</td>
+<td>the CA certificate data</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_get_ca_cert_path ()">
+<div class="refsect2">
 <a name="nm-setting-802-1x-get-ca-cert-path"></a><h3>nm_setting_802_1x_get_ca_cert_path ()</h3>
-<pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_802_1x_get_ca_cert_path  (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
+<pre class="programlisting">const <span class="returnvalue">char</span> *            nm_setting_802_1x_get_ca_cert_path
+                                                        (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
 <p>
 Returns the CA certificate path if the CA certificate is stored using the
-<code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code> scheme.  Not all EAP methods use a
+<a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code></a> scheme.  Not all EAP methods use a
 CA certificate (LEAP for example), and those that can take advantage of the
 CA certificate allow it to be unset.  Note that lack of a CA certificate
 reduces security by allowing man-in-the-middle attacks, because the identity
@@ -944,14 +975,13 @@ of the network cannot be confirmed by the client.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> path to the CA certificate file
-</td>
+<td>path to the CA certificate file</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_set_ca_cert ()">
+<div class="refsect2">
 <a name="nm-setting-802-1x-set-ca-cert"></a><h3>nm_setting_802_1x_set_ca_cert ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_802_1x_set_ca_cert       (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *value</code></em>,
@@ -960,9 +990,9 @@ of the network cannot be confirmed by the client.
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
 <p>
 Reads a certificate from disk and sets the <a class="link" href="NMSetting8021x.html#NMSetting8021x--ca-cert" title='The "ca-cert" property'><span class="type">"ca-cert"</span></a> property
-with the raw certificate data if using the <code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code>
+with the raw certificate data if using the <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code></a>
 scheme, or with the path to the certificate file if using the
-<code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code> scheme.
+<a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code></a> scheme.
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
@@ -974,45 +1004,40 @@ scheme, or with the path to the certificate file if using the
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
-<td>when <em class="parameter"><code>scheme</code></em> is set to either <code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code> or
-  <code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code>, pass the path of the CA certificate file
-  (PEM or DER format).  The path must be UTF-8 encoded; use
-  <a href="http://library.gnome.org/devel/glib/unstable/glib-Character-Set-Conversion.html#g-filename-to-utf8"><code class="function">g_filename_to_utf8()</code></a> to convert if needed.  Passing NULL with any <em class="parameter"><code>scheme</code></em>
-  clears the CA certificate.
-</td>
+<td>when <em class="parameter"><code>scheme</code></em> is set to either <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code></a> or
+<a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code></a>, pass the path of the CA certificate file
+(PEM or DER format).  The path must be UTF-8 encoded; use
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Character-Set-Conversion.html#g-filename-to-utf8"><code class="function">g_filename_to_utf8()</code></a> to convert if needed.  Passing NULL with any <em class="parameter"><code>scheme</code></em>
+clears the CA certificate.</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>scheme</code></em> :</span></p></td>
-<td>desired storage scheme for the certificate
-</td>
+<td>desired storage scheme for the certificate</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>out_format</code></em> :</span></p></td>
-<td>on successful return, the type of the certificate added
-</td>
+<td>on successful return, the type of the certificate added</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>on unsuccessful return, an error
-</td>
+<td>on unsuccessful return, an error</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> TRUE if the operation succeeded, FALSE if it was unsuccessful
-</td>
+<td>TRUE if the operation succeeded, FALSE if it was unsuccessful</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_get_client_cert_scheme ()">
+<div class="refsect2">
 <a name="nm-setting-802-1x-get-client-cert-scheme"></a><h3>nm_setting_802_1x_get_client_cert_scheme ()</h3>
 <pre class="programlisting"><a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme" title="enum NMSetting8021xCKScheme"><span class="returnvalue">NMSetting8021xCKScheme</span></a>  nm_setting_802_1x_get_client_cert_scheme
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
 <p>
 Returns the scheme used to store the client certificate.  If the returned scheme
-is <code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code>, use <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-client-cert-blob" title="nm_setting_802_1x_get_client_cert_blob ()"><code class="function">nm_setting_802_1x_get_client_cert_blob()</code></a>;
-if <code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code>, use <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-client-cert-path" title="nm_setting_802_1x_get_client_cert_path ()"><code class="function">nm_setting_802_1x_get_client_cert_path()</code></a>.
+is <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code></a>, use <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-client-cert-blob" title="nm_setting_802_1x_get_client_cert_blob ()"><code class="function">nm_setting_802_1x_get_client_cert_blob()</code></a>;
+if <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code></a>, use <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-client-cert-path" title="nm_setting_802_1x_get_client_cert_path ()"><code class="function">nm_setting_802_1x_get_client_cert_path()</code></a>.
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
@@ -1024,16 +1049,15 @@ if <code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code>, use <a class="
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> scheme used to store the client certificate (blob or path)
-</td>
+<td>scheme used to store the client certificate (blob or path)</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_get_client_cert_blob ()">
+<div class="refsect2">
 <a name="nm-setting-802-1x-get-client-cert-blob"></a><h3>nm_setting_802_1x_get_client_cert_blob ()</h3>
-<pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *  nm_setting_802_1x_get_client_cert_blob
+<pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *      nm_setting_802_1x_get_client_cert_blob
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
 <p>
 Client certificates are used to identify the connecting client to the network
@@ -1050,16 +1074,15 @@ authentication method.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the client certificate data
-</td>
+<td>the client certificate data</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_get_client_cert_path ()">
+<div class="refsect2">
 <a name="nm-setting-802-1x-get-client-cert-path"></a><h3>nm_setting_802_1x_get_client_cert_path ()</h3>
-<pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_802_1x_get_client_cert_path
+<pre class="programlisting">const <span class="returnvalue">char</span> *            nm_setting_802_1x_get_client_cert_path
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
 <p>
 Client certificates are used to identify the connecting client to the network
@@ -1076,14 +1099,13 @@ authentication method.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> path to the client certificate file
-</td>
+<td>path to the client certificate file</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_set_client_cert ()">
+<div class="refsect2">
 <a name="nm-setting-802-1x-set-client-cert"></a><h3>nm_setting_802_1x_set_client_cert ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_802_1x_set_client_cert   (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *value</code></em>,
@@ -1093,8 +1115,8 @@ authentication method.
 <p>
 Reads a certificate from disk and sets the <a class="link" href="NMSetting8021x.html#NMSetting8021x--client-cert" title='The "client-cert" property'><span class="type">"client-cert"</span></a>
 property with the raw certificate data if using the
-<code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code> scheme, or with the path to the certificate
-file if using the <code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code> scheme.
+<a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code></a> scheme, or with the path to the certificate
+file if using the <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code></a> scheme.
 </p>
 <p>
 Client certificates are used to identify the connecting client to the network
@@ -1111,38 +1133,33 @@ authentication method.
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
-<td>when <em class="parameter"><code>scheme</code></em> is set to either <code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code> or
-  <code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code>, pass the path of the client certificate
-  file (PEM, DER, or PKCS<span class="type">12</span> format).  The path must be UTF-8 encoded; use
-  <a href="http://library.gnome.org/devel/glib/unstable/glib-Character-Set-Conversion.html#g-filename-to-utf8"><code class="function">g_filename_to_utf8()</code></a> to convert if needed.  Passing NULL with any <em class="parameter"><code>scheme</code></em>
-  clears the client certificate.
-</td>
+<td>when <em class="parameter"><code>scheme</code></em> is set to either <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code></a> or
+<a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code></a>, pass the path of the client certificate
+file (PEM, DER, or PKCS<span class="type">12</span> format).  The path must be UTF-8 encoded; use
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Character-Set-Conversion.html#g-filename-to-utf8"><code class="function">g_filename_to_utf8()</code></a> to convert if needed.  Passing NULL with any <em class="parameter"><code>scheme</code></em>
+clears the client certificate.</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>scheme</code></em> :</span></p></td>
-<td>desired storage scheme for the certificate
-</td>
+<td>desired storage scheme for the certificate</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>out_format</code></em> :</span></p></td>
-<td>on successful return, the type of the certificate added
-</td>
+<td>on successful return, the type of the certificate added</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>on unsuccessful return, an error
-</td>
+<td>on unsuccessful return, an error</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> TRUE if the operation succeeded, FALSE if it was unsuccessful
-</td>
+<td>TRUE if the operation succeeded, FALSE if it was unsuccessful</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_get_phase1_peapver ()">
+<div class="refsect2">
 <a name="nm-setting-802-1x-get-phase1-peapver"></a><h3>nm_setting_802_1x_get_phase1_peapver ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_802_1x_get_phase1_peapver
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
@@ -1156,16 +1173,15 @@ authentication method.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the "phase 1" PEAP version to be used when authenticating with
- EAP-PEAP as contained in the <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase1-peapver" title='The "phase1-peapver" property'><span class="type">"phase1-peapver"</span></a> property.  Valid
- values are NULL (unset), "0" (PEAP version 0), and "1" (PEAP version 1).
-</td>
+<td>the "phase 1" PEAP version to be used when authenticating with
+EAP-PEAP as contained in the <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase1-peapver" title='The "phase1-peapver" property'><span class="type">"phase1-peapver"</span></a> property.  Valid
+values are NULL (unset), "0" (PEAP version 0), and "1" (PEAP version 1).</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_get_phase1_peaplabel ()">
+<div class="refsect2">
 <a name="nm-setting-802-1x-get-phase1-peaplabel"></a><h3>nm_setting_802_1x_get_phase1_peaplabel ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_802_1x_get_phase1_peaplabel
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
@@ -1179,18 +1195,17 @@ authentication method.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> whether the "phase 1" PEAP label is new-style or old-style, to be
- used when authenticating with EAP-PEAP, as contained in the
- <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase1-peaplabel" title='The "phase1-peaplabel" property'><span class="type">"phase1-peaplabel"</span></a> property.  Valid values are NULL (unset),
- "0" (use old-style label), and "1" (use new-style label).  See the
- wpa_supplicant documentation for more details.
-</td>
+<td>whether the "phase 1" PEAP label is new-style or old-style, to be
+used when authenticating with EAP-PEAP, as contained in the
+<a class="link" href="NMSetting8021x.html#NMSetting8021x--phase1-peaplabel" title='The "phase1-peaplabel" property'><span class="type">"phase1-peaplabel"</span></a> property.  Valid values are NULL (unset),
+"0" (use old-style label), and "1" (use new-style label).  See the
+wpa_supplicant documentation for more details.</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_get_phase1_fast_provisioning ()">
+<div class="refsect2">
 <a name="nm-setting-802-1x-get-phase1-fast-provisioning"></a><h3>nm_setting_802_1x_get_phase1_fast_provisioning ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_802_1x_get_phase1_fast_provisioning
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
@@ -1204,16 +1219,15 @@ authentication method.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> whether "phase 1" PEAP fast provisioning should be used, as specified
- by the <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase1-fast-provisioning" title='The "phase1-fast-provisioning" property'><span class="type">"phase1-fast-provisioning"</span></a> property.  See the
- wpa_supplicant documentation for more details.
-</td>
+<td>whether "phase 1" PEAP fast provisioning should be used, as specified
+by the <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase1-fast-provisioning" title='The "phase1-fast-provisioning" property'><span class="type">"phase1-fast-provisioning"</span></a> property.  See the
+wpa_supplicant documentation for more details.</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_get_phase2_auth ()">
+<div class="refsect2">
 <a name="nm-setting-802-1x-get-phase2-auth"></a><h3>nm_setting_802_1x_get_phase2_auth ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_802_1x_get_phase2_auth   (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
 <div class="variablelist"><table border="0">
@@ -1226,15 +1240,14 @@ authentication method.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the "phase 2" non-EAP (ex MD5) allowed authentication method as
-  specified by the <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-auth" title='The "phase2-auth" property'><span class="type">"phase2-auth"</span></a> property.
-</td>
+<td>the "phase 2" non-EAP (ex MD5) allowed authentication method as
+specified by the <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-auth" title='The "phase2-auth" property'><span class="type">"phase2-auth"</span></a> property.</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_get_phase2_autheap ()">
+<div class="refsect2">
 <a name="nm-setting-802-1x-get-phase2-autheap"></a><h3>nm_setting_802_1x_get_phase2_autheap ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_802_1x_get_phase2_autheap
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
@@ -1248,22 +1261,21 @@ authentication method.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the "phase 2" EAP-based (ex TLS) allowed authentication method as
-  specified by the <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-autheap" title='The "phase2-autheap" property'><span class="type">"phase2-autheap"</span></a> property.
-</td>
+<td>the "phase 2" EAP-based (ex TLS) allowed authentication method as
+specified by the <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-autheap" title='The "phase2-autheap" property'><span class="type">"phase2-autheap"</span></a> property.</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_get_phase2_ca_cert_scheme ()">
+<div class="refsect2">
 <a name="nm-setting-802-1x-get-phase2-ca-cert-scheme"></a><h3>nm_setting_802_1x_get_phase2_ca_cert_scheme ()</h3>
 <pre class="programlisting"><a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme" title="enum NMSetting8021xCKScheme"><span class="returnvalue">NMSetting8021xCKScheme</span></a>  nm_setting_802_1x_get_phase2_ca_cert_scheme
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
 <p>
 Returns the scheme used to store the "phase 2" CA certificate.  If the
-returned scheme is <code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code>, use
-<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-ca-cert-blob" title="nm_setting_802_1x_get_ca_cert_blob ()"><code class="function">nm_setting_802_1x_get_ca_cert_blob()</code></a>; if <code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code>,
+returned scheme is <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code></a>, use
+<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-ca-cert-blob" title="nm_setting_802_1x_get_ca_cert_blob ()"><code class="function">nm_setting_802_1x_get_ca_cert_blob()</code></a>; if <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code></a>,
 use <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-ca-cert-path" title="nm_setting_802_1x_get_ca_cert_path ()"><code class="function">nm_setting_802_1x_get_ca_cert_path()</code></a>.
 </p>
 <div class="variablelist"><table border="0">
@@ -1276,20 +1288,19 @@ use <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-ca-cert-path
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> scheme used to store the "phase 2" CA certificate (blob or path)
-</td>
+<td>scheme used to store the "phase 2" CA certificate (blob or path)</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_get_phase2_ca_cert_blob ()">
+<div class="refsect2">
 <a name="nm-setting-802-1x-get-phase2-ca-cert-blob"></a><h3>nm_setting_802_1x_get_phase2_ca_cert_blob ()</h3>
-<pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *  nm_setting_802_1x_get_phase2_ca_cert_blob
+<pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *      nm_setting_802_1x_get_phase2_ca_cert_blob
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
 <p>
 Returns the "phase 2" CA certificate blob if the CA certificate is stored
-using the <code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code> scheme.  Not all EAP methods use
+using the <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code></a> scheme.  Not all EAP methods use
 a CA certificate (LEAP for example), and those that can take advantage of the
 CA certificate allow it to be unset.  Note that lack of a CA certificate
 reduces security by allowing man-in-the-middle attacks, because the identity
@@ -1305,20 +1316,19 @@ of the network cannot be confirmed by the client.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the "phase 2" CA certificate data
-</td>
+<td>the "phase 2" CA certificate data</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_get_phase2_ca_cert_path ()">
+<div class="refsect2">
 <a name="nm-setting-802-1x-get-phase2-ca-cert-path"></a><h3>nm_setting_802_1x_get_phase2_ca_cert_path ()</h3>
-<pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_802_1x_get_phase2_ca_cert_path
+<pre class="programlisting">const <span class="returnvalue">char</span> *            nm_setting_802_1x_get_phase2_ca_cert_path
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
 <p>
 Returns the "phase 2" CA certificate path if the CA certificate is stored
-using the <code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code> scheme.  Not all EAP methods use
+using the <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code></a> scheme.  Not all EAP methods use
 a CA certificate (LEAP for example), and those that can take advantage of the
 CA certificate allow it to be unset.  Note that lack of a CA certificate
 reduces security by allowing man-in-the-middle attacks, because the identity
@@ -1334,14 +1344,13 @@ of the network cannot be confirmed by the client.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> path to the "phase 2" CA certificate file
-</td>
+<td>path to the "phase 2" CA certificate file</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_set_phase2_ca_cert ()">
+<div class="refsect2">
 <a name="nm-setting-802-1x-set-phase2-ca-cert"></a><h3>nm_setting_802_1x_set_phase2_ca_cert ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_802_1x_set_phase2_ca_cert
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
@@ -1352,8 +1361,8 @@ of the network cannot be confirmed by the client.
 <p>
 Reads a certificate from disk and sets the <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-ca-cert" title='The "phase2-ca-cert" property'><span class="type">"phase2-ca-cert"</span></a>
 property with the raw certificate data if using the
-<code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code> scheme, or with the path to the certificate
-file if using the <code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code> scheme.
+<a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code></a> scheme, or with the path to the certificate
+file if using the <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code></a> scheme.
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
@@ -1365,46 +1374,41 @@ file if using the <code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
-<td>when <em class="parameter"><code>scheme</code></em> is set to either <code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code> or
-  <code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code>, pass the path of the "phase2" CA
-  certificate file (PEM or DER format).  The path must be UTF-8 encoded; use
-  <a href="http://library.gnome.org/devel/glib/unstable/glib-Character-Set-Conversion.html#g-filename-to-utf8"><code class="function">g_filename_to_utf8()</code></a> to convert if needed.  Passing NULL with any <em class="parameter"><code>scheme</code></em>
-  clears the "phase2" CA certificate.
-</td>
+<td>when <em class="parameter"><code>scheme</code></em> is set to either <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code></a> or
+<a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code></a>, pass the path of the "phase2" CA
+certificate file (PEM or DER format).  The path must be UTF-8 encoded; use
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Character-Set-Conversion.html#g-filename-to-utf8"><code class="function">g_filename_to_utf8()</code></a> to convert if needed.  Passing NULL with any <em class="parameter"><code>scheme</code></em>
+clears the "phase2" CA certificate.</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>scheme</code></em> :</span></p></td>
-<td>desired storage scheme for the certificate
-</td>
+<td>desired storage scheme for the certificate</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>out_format</code></em> :</span></p></td>
-<td>on successful return, the type of the certificate added
-</td>
+<td>on successful return, the type of the certificate added</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>on unsuccessful return, an error
-</td>
+<td>on unsuccessful return, an error</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> TRUE if the operation succeeded, FALSE if it was unsuccessful
-</td>
+<td>TRUE if the operation succeeded, FALSE if it was unsuccessful</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_get_phase2_client_cert_scheme ()">
+<div class="refsect2">
 <a name="nm-setting-802-1x-get-phase2-client-cert-scheme"></a><h3>nm_setting_802_1x_get_phase2_client_cert_scheme ()</h3>
 <pre class="programlisting"><a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme" title="enum NMSetting8021xCKScheme"><span class="returnvalue">NMSetting8021xCKScheme</span></a>  nm_setting_802_1x_get_phase2_client_cert_scheme
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
 <p>
 Returns the scheme used to store the "phase 2" client certificate.  If the
-returned scheme is <code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code>, use
+returned scheme is <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code></a>, use
 <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-client-cert-blob" title="nm_setting_802_1x_get_client_cert_blob ()"><code class="function">nm_setting_802_1x_get_client_cert_blob()</code></a>; if
-<code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code>, use
+<a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code></a>, use
 <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-client-cert-path" title="nm_setting_802_1x_get_client_cert_path ()"><code class="function">nm_setting_802_1x_get_client_cert_path()</code></a>.
 </p>
 <div class="variablelist"><table border="0">
@@ -1417,16 +1421,15 @@ returned scheme is <code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> scheme used to store the "phase 2" client certificate (blob or path)
-</td>
+<td>scheme used to store the "phase 2" client certificate (blob or path)</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_get_phase2_client_cert_blob ()">
+<div class="refsect2">
 <a name="nm-setting-802-1x-get-phase2-client-cert-blob"></a><h3>nm_setting_802_1x_get_phase2_client_cert_blob ()</h3>
-<pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *  nm_setting_802_1x_get_phase2_client_cert_blob
+<pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *      nm_setting_802_1x_get_phase2_client_cert_blob
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
 <p>
 Client certificates are used to identify the connecting client to the network
@@ -1443,16 +1446,15 @@ authentication method.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the "phase 2" client certificate data
-</td>
+<td>the "phase 2" client certificate data</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_get_phase2_client_cert_path ()">
+<div class="refsect2">
 <a name="nm-setting-802-1x-get-phase2-client-cert-path"></a><h3>nm_setting_802_1x_get_phase2_client_cert_path ()</h3>
-<pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_802_1x_get_phase2_client_cert_path
+<pre class="programlisting">const <span class="returnvalue">char</span> *            nm_setting_802_1x_get_phase2_client_cert_path
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
 <p>
 Client certificates are used to identify the connecting client to the network
@@ -1469,14 +1471,13 @@ authentication method.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> path to the "phase 2" client certificate file
-</td>
+<td>path to the "phase 2" client certificate file</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_set_phase2_client_cert ()">
+<div class="refsect2">
 <a name="nm-setting-802-1x-set-phase2-client-cert"></a><h3>nm_setting_802_1x_set_phase2_client_cert ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_802_1x_set_phase2_client_cert
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
@@ -1487,8 +1488,8 @@ authentication method.
 <p>
 Reads a certificate from disk and sets the <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-client-cert" title='The "phase2-client-cert" property'><span class="type">"phase2-client-cert"</span></a>
 property with the raw certificate data if using the
-<code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code> scheme, or with the path to the certificate
-file if using the <code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code> scheme.
+<a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code></a> scheme, or with the path to the certificate
+file if using the <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code></a> scheme.
 </p>
 <p>
 Client certificates are used to identify the connecting client to the network
@@ -1505,38 +1506,33 @@ authentication method.
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
-<td>when <em class="parameter"><code>scheme</code></em> is set to either <code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code> or
-  <code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code>, pass the path of the "phase2" client
-  certificate file (PEM, DER, or PKCS<span class="type">12</span> format).  The path must be UTF-8
-  encoded; use <a href="http://library.gnome.org/devel/glib/unstable/glib-Character-Set-Conversion.html#g-filename-to-utf8"><code class="function">g_filename_to_utf8()</code></a> to convert if needed.  Passing NULL with
-  any <em class="parameter"><code>scheme</code></em> clears the "phase2" client certificate.
-</td>
+<td>when <em class="parameter"><code>scheme</code></em> is set to either <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code></a> or
+<a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code></a>, pass the path of the "phase2" client
+certificate file (PEM, DER, or PKCS<span class="type">12</span> format).  The path must be UTF-8
+encoded; use <a href="http://library.gnome.org/devel/glib/unstable/glib-Character-Set-Conversion.html#g-filename-to-utf8"><code class="function">g_filename_to_utf8()</code></a> to convert if needed.  Passing NULL with
+any <em class="parameter"><code>scheme</code></em> clears the "phase2" client certificate.</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>scheme</code></em> :</span></p></td>
-<td>desired storage scheme for the certificate
-</td>
+<td>desired storage scheme for the certificate</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>out_format</code></em> :</span></p></td>
-<td>on successful return, the type of the certificate added
-</td>
+<td>on successful return, the type of the certificate added</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>on unsuccessful return, an error
-</td>
+<td>on unsuccessful return, an error</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> TRUE if the operation succeeded, FALSE if it was unsuccessful
-</td>
+<td>TRUE if the operation succeeded, FALSE if it was unsuccessful</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_get_password ()">
+<div class="refsect2">
 <a name="nm-setting-802-1x-get-password"></a><h3>nm_setting_802_1x_get_password ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_802_1x_get_password      (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
 <div class="variablelist"><table border="0">
@@ -1549,155 +1545,17 @@ authentication method.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the password used by the authentication method, if any, as specified
-  by the <a class="link" href="NMSetting8021x.html#NMSetting8021x--password" title='The "password" property'><span class="type">"password"</span></a> property
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_setting_802_1x_get_pin ()">
-<a name="nm-setting-802-1x-get-pin"></a><h3>nm_setting_802_1x_get_pin ()</h3>
-<pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_802_1x_get_pin           (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>the <a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the PIN used by the authentication method, if any, as specified
-  by the <span class="type">"pin"</span> property
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_setting_802_1x_get_psk ()">
-<a name="nm-setting-802-1x-get-psk"></a><h3>nm_setting_802_1x_get_psk ()</h3>
-<pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_802_1x_get_psk           (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>the <a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the Pre-Shared-Key used by the authentication method, if any, as
-  specified by the <span class="type">"psk"</span> property
-</td>
+<td>the password used by the authentication method, if any, as specified
+by the <a class="link" href="NMSetting8021x.html#NMSetting8021x--password" title='The "password" property'><span class="type">"password"</span></a> property</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_get_private_key_scheme ()">
-<a name="nm-setting-802-1x-get-private-key-scheme"></a><h3>nm_setting_802_1x_get_private_key_scheme ()</h3>
-<pre class="programlisting"><a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme" title="enum NMSetting8021xCKScheme"><span class="returnvalue">NMSetting8021xCKScheme</span></a>  nm_setting_802_1x_get_private_key_scheme
+<div class="refsect2">
+<a name="nm-setting-802-1x-get-password-flags"></a><h3>nm_setting_802_1x_get_password_flags ()</h3>
+<pre class="programlisting"><a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="returnvalue">NMSettingSecretFlags</span></a>  nm_setting_802_1x_get_password_flags
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
-<p>
-Returns the scheme used to store the private key.  If the returned scheme is
-<code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code>, use
-<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-client-cert-blob" title="nm_setting_802_1x_get_client_cert_blob ()"><code class="function">nm_setting_802_1x_get_client_cert_blob()</code></a>; if
-<code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code>, use
-<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-client-cert-path" title="nm_setting_802_1x_get_client_cert_path ()"><code class="function">nm_setting_802_1x_get_client_cert_path()</code></a>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>the <a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> scheme used to store the private key (blob or path)
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_setting_802_1x_get_private_key_blob ()">
-<a name="nm-setting-802-1x-get-private-key-blob"></a><h3>nm_setting_802_1x_get_private_key_blob ()</h3>
-<pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *  nm_setting_802_1x_get_private_key_blob
-                                                        (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
-<p>
-Private keys are used to authenticate the connecting client to the network
-when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
-authentication method.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>the <a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the private key data
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_setting_802_1x_get_private_key_path ()">
-<a name="nm-setting-802-1x-get-private-key-path"></a><h3>nm_setting_802_1x_get_private_key_path ()</h3>
-<pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_802_1x_get_private_key_path
-                                                        (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
-<p>
-Private keys are used to authenticate the connecting client to the network
-when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
-authentication method.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>the <a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> path to the private key file
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_setting_802_1x_set_private_key ()">
-<a name="nm-setting-802-1x-set-private-key"></a><h3>nm_setting_802_1x_set_private_key ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_802_1x_set_private_key   (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> *value</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> *password</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme" title="enum NMSetting8021xCKScheme"><span class="type">NMSetting8021xCKScheme</span></a> scheme</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKFormat" title="enum NMSetting8021xCKFormat"><span class="type">NMSetting8021xCKFormat</span></a> *out_format</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
-<p>
-Reads a private key from disk and sets the <a class="link" href="NMSetting8021x.html#NMSetting8021x--private-key" title='The "private-key" property'><span class="type">"private-key"</span></a>
-property with the raw private key data if using the
-<code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code> scheme, or with the path to the private key
-file if using the <code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code> scheme.
-</p>
-<p>
-Private keys are used to authenticate the connecting client to the network
-when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
-authentication method.
-</p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
 <tbody>
@@ -1707,47 +1565,17 @@ authentication method.
 </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
-<td>when <em class="parameter"><code>scheme</code></em> is set to either <code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code> or
-  <code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code>, pass the path of the private key file
-  (PEM, DER, or PKCS<span class="type">12</span> format).  The path must be UTF-8 encoded; use
-  <a href="http://library.gnome.org/devel/glib/unstable/glib-Character-Set-Conversion.html#g-filename-to-utf8"><code class="function">g_filename_to_utf8()</code></a> to convert if needed.  Passing NULL with any <em class="parameter"><code>scheme</code></em>
-  clears the private key.
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>password</code></em> :</span></p></td>
-<td>password used to decrypt the private key
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>scheme</code></em> :</span></p></td>
-<td>desired storage scheme for the private key
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>out_format</code></em> :</span></p></td>
-<td>on successful return, the type of the private key added
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>on unsuccessful return, an error
-</td>
-</tr>
-<tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> TRUE if the operation succeeded, FALSE if it was unsuccessful
+<td>the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> pertaining to the <a class="link" href="NMSetting8021x.html#NMSetting8021x--password" title='The "password" property'><span class="type">"password"</span></a>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_get_private_key_password ()">
-<a name="nm-setting-802-1x-get-private-key-password"></a><h3>nm_setting_802_1x_get_private_key_password ()</h3>
-<pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_802_1x_get_private_key_password
-                                                        (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
+<div class="refsect2">
+<a name="nm-setting-802-1x-get-pin"></a><h3>nm_setting_802_1x_get_pin ()</h3>
+<pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_802_1x_get_pin           (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
 <tbody>
@@ -1758,20 +1586,16 @@ authentication method.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the private key password used to decrypt the private key if
- previously set with <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-private-key-from-file" title="nm_setting_802_1x_set_private_key_from_file ()"><code class="function">nm_setting_802_1x_set_private_key_from_file()</code></a>,
- <code class="function">nm_setting_802_1x_set_private_key_path()</code>, or the
- <a class="link" href="NMSetting8021x.html#NMSetting8021x--private-key-password" title='The "private-key-password" property'><span class="type">"private-key-password"</span></a> property.
-</td>
+<td>the PIN used by the authentication method, if any, as specified
+by the <span class="type">"pin"</span> property</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_get_private_key_format ()">
-<a name="nm-setting-802-1x-get-private-key-format"></a><h3>nm_setting_802_1x_get_private_key_format ()</h3>
-<pre class="programlisting"><a class="link" href="NMSetting8021x.html#NMSetting8021xCKFormat" title="enum NMSetting8021xCKFormat"><span class="returnvalue">NMSetting8021xCKFormat</span></a>  nm_setting_802_1x_get_private_key_format
-                                                        (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
+<div class="refsect2">
+<a name="nm-setting-802-1x-get-pin-flags"></a><h3>nm_setting_802_1x_get_pin_flags ()</h3>
+<pre class="programlisting"><a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="returnvalue">NMSettingSecretFlags</span></a>  nm_setting_802_1x_get_pin_flags   (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
 <tbody>
@@ -1782,23 +1606,23 @@ authentication method.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the data format of the private key data stored in the
-  <a class="link" href="NMSetting8021x.html#NMSetting8021x--private-key" title='The "private-key" property'><span class="type">"private-key"</span></a> property
+<td>the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> pertaining to the
+<span class="type">"pin"</span>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_get_phase2_private_key_scheme ()">
-<a name="nm-setting-802-1x-get-phase2-private-key-scheme"></a><h3>nm_setting_802_1x_get_phase2_private_key_scheme ()</h3>
-<pre class="programlisting"><a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme" title="enum NMSetting8021xCKScheme"><span class="returnvalue">NMSetting8021xCKScheme</span></a>  nm_setting_802_1x_get_phase2_private_key_scheme
+<div class="refsect2">
+<a name="nm-setting-802-1x-get-private-key-scheme"></a><h3>nm_setting_802_1x_get_private_key_scheme ()</h3>
+<pre class="programlisting"><a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme" title="enum NMSetting8021xCKScheme"><span class="returnvalue">NMSetting8021xCKScheme</span></a>  nm_setting_802_1x_get_private_key_scheme
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
 <p>
-Returns the scheme used to store the "phase 2" private key.  If the returned
-scheme is <code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code>, use
+Returns the scheme used to store the private key.  If the returned scheme is
+<a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code></a>, use
 <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-client-cert-blob" title="nm_setting_802_1x_get_client_cert_blob ()"><code class="function">nm_setting_802_1x_get_client_cert_blob()</code></a>; if
-<code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code>, use
+<a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code></a>, use
 <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-client-cert-path" title="nm_setting_802_1x_get_client_cert_path ()"><code class="function">nm_setting_802_1x_get_client_cert_path()</code></a>.
 </p>
 <div class="variablelist"><table border="0">
@@ -1811,22 +1635,26 @@ scheme is <code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code>, use
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> scheme used to store the "phase 2" private key (blob or path)
-</td>
+<td>scheme used to store the private key (blob or path)</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_get_phase2_private_key_blob ()">
-<a name="nm-setting-802-1x-get-phase2-private-key-blob"></a><h3>nm_setting_802_1x_get_phase2_private_key_blob ()</h3>
-<pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *  nm_setting_802_1x_get_phase2_private_key_blob
+<div class="refsect2">
+<a name="nm-setting-802-1x-get-private-key-blob"></a><h3>nm_setting_802_1x_get_private_key_blob ()</h3>
+<pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *      nm_setting_802_1x_get_private_key_blob
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
 <p>
 Private keys are used to authenticate the connecting client to the network
 when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
 authentication method.
 </p>
+<p>
+WARNING: the private key property is not a "secret" property, and thus
+unencrypted private key data may be readable by unprivileged users.  Private
+keys should always be encrypted with a private key password.
+</p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
 <tbody>
@@ -1837,16 +1665,15 @@ authentication method.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the "phase 2" private key data
-</td>
+<td>the private key data</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_get_phase2_private_key_path ()">
-<a name="nm-setting-802-1x-get-phase2-private-key-path"></a><h3>nm_setting_802_1x_get_phase2_private_key_path ()</h3>
-<pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_802_1x_get_phase2_private_key_path
+<div class="refsect2">
+<a name="nm-setting-802-1x-get-private-key-path"></a><h3>nm_setting_802_1x_get_private_key_path ()</h3>
+<pre class="programlisting">const <span class="returnvalue">char</span> *            nm_setting_802_1x_get_private_key_path
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
 <p>
 Private keys are used to authenticate the connecting client to the network
@@ -1863,33 +1690,46 @@ authentication method.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> path to the "phase 2" private key file
-</td>
+<td>path to the private key file</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_set_phase2_private_key ()">
-<a name="nm-setting-802-1x-set-phase2-private-key"></a><h3>nm_setting_802_1x_set_phase2_private_key ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_802_1x_set_phase2_private_key
-                                                        (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
+<div class="refsect2">
+<a name="nm-setting-802-1x-set-private-key"></a><h3>nm_setting_802_1x_set_private_key ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_802_1x_set_private_key   (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *value</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *password</code></em>,
                                                          <em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme" title="enum NMSetting8021xCKScheme"><span class="type">NMSetting8021xCKScheme</span></a> scheme</code></em>,
                                                          <em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKFormat" title="enum NMSetting8021xCKFormat"><span class="type">NMSetting8021xCKFormat</span></a> *out_format</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
 <p>
-Reads a "phase 2" private key from disk and sets the
-<a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-private-key" title='The "phase2-private-key" property'><span class="type">"phase2-private-key"</span></a> property with the raw private key data if
-using the <code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code> scheme, or with the path to the
-private key file if using the <code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code> scheme.
-</p>
-<p>
 Private keys are used to authenticate the connecting client to the network
 when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
 authentication method.
 </p>
+<p>
+This function reads a private key from disk and sets the
+<a class="link" href="NMSetting8021x.html#NMSetting8021x--private-key" title='The "private-key" property'><span class="type">"private-key"</span></a> property with the private key file data if using
+the <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code></a> scheme, or with the path to the private
+key file if using the <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code></a> scheme.
+</p>
+<p>
+If <em class="parameter"><code>password</code></em> is given, this function attempts to decrypt the private key to
+verify that <em class="parameter"><code>password</code></em> is correct, and if it is, updates the
+<a class="link" href="NMSetting8021x.html#NMSetting8021x--private-key-password" title='The "private-key-password" property'><span class="type">"private-key-password"</span></a> property with the given <em class="parameter"><code>password</code></em>.  If
+the decryption is unsuccessful, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> is returned, <em class="parameter"><code>error</code></em> is set, and no
+internal data is changed.  If no <em class="parameter"><code>password</code></em> is given, the private key is
+assumed to be valid, no decryption is performed, and the password may be set
+at a later time.
+</p>
+<p>
+WARNING: the private key property is not a "secret" property, and thus
+unencrypted private key data using the BLOB scheme may be readable by
+unprivileged users.  Private keys should always be encrypted with a private
+key password to prevent unauthorized access to unencrypted private key data.
+</p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
 <tbody>
@@ -1900,45 +1740,41 @@ authentication method.
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
-<td>when <em class="parameter"><code>scheme</code></em> is set to either <code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code> or
-  <code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code>, pass the path of the "phase2" private 
-  key file (PEM, DER, or PKCS<span class="type">12</span> format).  The path must be UTF-8 encoded;
-  use <a href="http://library.gnome.org/devel/glib/unstable/glib-Character-Set-Conversion.html#g-filename-to-utf8"><code class="function">g_filename_to_utf8()</code></a> to convert if needed.  Passing NULL with any
-  <em class="parameter"><code>scheme</code></em> clears the "phase2" private key.
-</td>
+<td>when <em class="parameter"><code>scheme</code></em> is set to either <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code></a> or
+<a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code></a>, pass the path of the private key file
+(PEM, DER, or PKCS<span class="type">12</span> format).  The path must be UTF-8 encoded; use
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Character-Set-Conversion.html#g-filename-to-utf8"><code class="function">g_filename_to_utf8()</code></a> to convert if needed.  Passing NULL with any <em class="parameter"><code>scheme</code></em>
+clears the private key.</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>password</code></em> :</span></p></td>
-<td>password used to decrypt the private key
-</td>
+<td>password used to decrypt the private key, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if the password
+is unknown.  If the password is given but fails to decrypt the private key,
+an error is returned.</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>scheme</code></em> :</span></p></td>
-<td>desired storage scheme for the private key
-</td>
+<td>desired storage scheme for the private key</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>out_format</code></em> :</span></p></td>
-<td>on successful return, the type of the private key added
-</td>
+<td>on successful return, the type of the private key added</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>on unsuccessful return, an error
-</td>
+<td>on unsuccessful return, an error</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> TRUE if the operation succeeded, FALSE if it was unsuccessful
-</td>
+<td>TRUE if the operation succeeded, FALSE if it was unsuccessful</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_get_phase2_private_key_password ()">
-<a name="nm-setting-802-1x-get-phase2-private-key-password"></a><h3>nm_setting_802_1x_get_phase2_private_key_password ()</h3>
-<pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_802_1x_get_phase2_private_key_password
+<div class="refsect2">
+<a name="nm-setting-802-1x-get-private-key-password"></a><h3>nm_setting_802_1x_get_private_key_password ()</h3>
+<pre class="programlisting">const <span class="returnvalue">char</span> *            nm_setting_802_1x_get_private_key_password
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
@@ -1950,19 +1786,18 @@ authentication method.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the private key password used to decrypt the private key if
- previously set with <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-phase2-private-key-from-file" title="nm_setting_802_1x_set_phase2_private_key_from_file ()"><code class="function">nm_setting_802_1x_set_phase2_private_key_from_file()</code></a>,
- <code class="function">nm_setting_802_1x_set_phase2_private_key_path()</code>, or the
- <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-private-key-password" title='The "phase2-private-key-password" property'><span class="type">"phase2-private-key-password"</span></a> property.
-</td>
+<td>the private key password used to decrypt the private key if
+previously set with <code class="function">nm_setting_802_1x_set_private_key_from_file()</code>,
+<code class="function">nm_setting_802_1x_set_private_key_path()</code>, or the
+<a class="link" href="NMSetting8021x.html#NMSetting8021x--private-key-password" title='The "private-key-password" property'><span class="type">"private-key-password"</span></a> property.</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_get_phase2_private_key_format ()">
-<a name="nm-setting-802-1x-get-phase2-private-key-format"></a><h3>nm_setting_802_1x_get_phase2_private_key_format ()</h3>
-<pre class="programlisting"><a class="link" href="NMSetting8021x.html#NMSetting8021xCKFormat" title="enum NMSetting8021xCKFormat"><span class="returnvalue">NMSetting8021xCKFormat</span></a>  nm_setting_802_1x_get_phase2_private_key_format
+<div class="refsect2">
+<a name="nm-setting-802-1x-get-private-key-password-flags"></a><h3>nm_setting_802_1x_get_private_key_password_flags ()</h3>
+<pre class="programlisting"><a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="returnvalue">NMSettingSecretFlags</span></a>  nm_setting_802_1x_get_private_key_password_flags
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
@@ -1974,80 +1809,18 @@ authentication method.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the data format of the "phase 2" private key data stored in the
-  <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-private-key" title='The "phase2-private-key" property'><span class="type">"phase2-private-key"</span></a> property
+<td>the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> pertaining to the
+<a class="link" href="NMSetting8021x.html#NMSetting8021x--private-key-password" title='The "private-key-password" property'><span class="type">"private-key-password"</span></a>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="enum NMSetting8021xCKType">
-<a name="NMSetting8021xCKType"></a><h3>enum NMSetting8021xCKType</h3>
-<pre class="programlisting">typedef enum {
-	NM_SETTING_802_1X_CK_TYPE_UNKNOWN = 0,
-	NM_SETTING_802_1X_CK_TYPE_X509,
-	NM_SETTING_802_1X_CK_TYPE_RAW_KEY,
-	NM_SETTING_802_1X_CK_TYPE_PKCS12
-} NMSetting8021xCKType;
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="nm_setting_802_1x_get_ca_cert ()">
-<a name="nm-setting-802-1x-get-ca-cert"></a><h3>nm_setting_802_1x_get_ca_cert ()</h3>
-<pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *  nm_setting_802_1x_get_ca_cert       (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
-<div class="warning" title="Warning" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title">Warning</h3>
-<p><code class="literal">nm_setting_802_1x_get_ca_cert</code> has been deprecated since version 0.8 and should not be used in newly-written code. This function has been deprecated and should
-  not be used in newly written code. Calling this function is
-  equivalent to calling <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-ca-cert-blob" title="nm_setting_802_1x_get_ca_cert_blob ()"><code class="function">nm_setting_802_1x_get_ca_cert_blob()</code></a>.</p>
-</div>
-<p>
-Returns the CA certificate blob if the CA certificate is stored using the
-<code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code> scheme.  Not all EAP methods use a
-CA certificate (LEAP for example), and those that can take advantage of the
-CA certificate allow it to be unset.  Note that lack of a CA certificate
-reduces security by allowing man-in-the-middle attacks, because the identity
-of the network cannot be confirmed by the client.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>the <a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the CA certificate data
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_setting_802_1x_set_ca_cert_from_file ()">
-<a name="nm-setting-802-1x-set-ca-cert-from-file"></a><h3>nm_setting_802_1x_set_ca_cert_from_file ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_802_1x_set_ca_cert_from_file
-                                                        (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> *filename</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKType" title="enum NMSetting8021xCKType"><span class="type">NMSetting8021xCKType</span></a> *out_ck_type</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
-<div class="warning" title="Warning" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title">Warning</h3>
-<p><code class="literal">nm_setting_802_1x_set_ca_cert_from_file</code> has been deprecated since version 0.8 and should not be used in newly-written code. This function has been deprecated and should
-  not be used in newly written code. Calling this function is
-  equivalent to calling <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-ca-cert" title="nm_setting_802_1x_set_ca_cert ()"><code class="function">nm_setting_802_1x_set_ca_cert()</code></a> with the
-  <code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code> scheme.</p>
-</div>
-<p>
-Reads a certificate from disk and sets the <a class="link" href="NMSetting8021x.html#NMSetting8021x--ca-cert" title='The "ca-cert" property'><span class="type">"ca-cert"</span></a> property
-with the raw certificate data using the <code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code>
-scheme.
-</p>
+<div class="refsect2">
+<a name="nm-setting-802-1x-get-private-key-format"></a><h3>nm_setting_802_1x_get_private_key_format ()</h3>
+<pre class="programlisting"><a class="link" href="NMSetting8021x.html#NMSetting8021xCKFormat" title="enum NMSetting8021xCKFormat"><span class="returnvalue">NMSetting8021xCKFormat</span></a>  nm_setting_802_1x_get_private_key_format
+                                                        (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
 <tbody>
@@ -2057,43 +1830,24 @@ scheme.
 </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>filename</code></em> :</span></p></td>
-<td>the path of the CA certificate file (PEM or DER format). Passing
-  NULL clears the CA certificate.
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>out_ck_type</code></em> :</span></p></td>
-<td>on successful return, the type of the certificate added
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>on unsuccessful return, an error
-</td>
-</tr>
-<tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> TRUE if the operation succeeded, FALSE if it was unsuccessful
-</td>
+<td>the data format of the private key data stored in the
+<a class="link" href="NMSetting8021x.html#NMSetting8021x--private-key" title='The "private-key" property'><span class="type">"private-key"</span></a> property</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_get_client_cert ()">
-<a name="nm-setting-802-1x-get-client-cert"></a><h3>nm_setting_802_1x_get_client_cert ()</h3>
-<pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *  nm_setting_802_1x_get_client_cert   (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
-<div class="warning" title="Warning" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title">Warning</h3>
-<p><code class="literal">nm_setting_802_1x_get_client_cert</code> has been deprecated since version 0.8 and should not be used in newly-written code. This function has been deprecated and should
-  not be used in newly written code. Calling this function is
-  equivalent to calling <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-client-cert-blob" title="nm_setting_802_1x_get_client_cert_blob ()"><code class="function">nm_setting_802_1x_get_client_cert_blob()</code></a>.</p>
-</div>
+<div class="refsect2">
+<a name="nm-setting-802-1x-get-phase2-private-key-scheme"></a><h3>nm_setting_802_1x_get_phase2_private_key_scheme ()</h3>
+<pre class="programlisting"><a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme" title="enum NMSetting8021xCKScheme"><span class="returnvalue">NMSetting8021xCKScheme</span></a>  nm_setting_802_1x_get_phase2_private_key_scheme
+                                                        (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
 <p>
-Client certificates are used to identify the connecting client to the network
-when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
-authentication method.
+Returns the scheme used to store the "phase 2" private key.  If the returned
+scheme is <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code></a>, use
+<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-client-cert-blob" title="nm_setting_802_1x_get_client_cert_blob ()"><code class="function">nm_setting_802_1x_get_client_cert_blob()</code></a>; if
+<a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code></a>, use
+<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-client-cert-path" title="nm_setting_802_1x_get_client_cert_path ()"><code class="function">nm_setting_802_1x_get_client_cert_path()</code></a>.
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
@@ -2105,85 +1859,25 @@ authentication method.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the client certificate data
-</td>
+<td>scheme used to store the "phase 2" private key (blob or path)</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_set_client_cert_from_file ()">
-<a name="nm-setting-802-1x-set-client-cert-from-file"></a><h3>nm_setting_802_1x_set_client_cert_from_file ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_802_1x_set_client_cert_from_file
-                                                        (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> *filename</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKType" title="enum NMSetting8021xCKType"><span class="type">NMSetting8021xCKType</span></a> *out_ck_type</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
-<div class="warning" title="Warning" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title">Warning</h3>
-<p><code class="literal">nm_setting_802_1x_set_client_cert_from_file</code> has been deprecated since version 0.8 and should not be used in newly-written code. This function has been deprecated and should
-  not be used in newly written code. Calling this function is
-  equivalent to calling <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-client-cert" title="nm_setting_802_1x_set_client_cert ()"><code class="function">nm_setting_802_1x_set_client_cert()</code></a> with the
-  <code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code> scheme.</p>
-</div>
-<p>
-Reads a certificate from disk and sets the <a class="link" href="NMSetting8021x.html#NMSetting8021x--client-cert" title='The "client-cert" property'><span class="type">"client-cert"</span></a>
-property with the raw certificate data.
-</p>
+<div class="refsect2">
+<a name="nm-setting-802-1x-get-phase2-private-key-blob"></a><h3>nm_setting_802_1x_get_phase2_private_key_blob ()</h3>
+<pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *      nm_setting_802_1x_get_phase2_private_key_blob
+                                                        (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
 <p>
-Client certificates are used to identify the connecting client to the network
+Private keys are used to authenticate the connecting client to the network
 when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
 authentication method.
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>the <a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>filename</code></em> :</span></p></td>
-<td>the path of the client certificate file (PEM, DER, or
-  PKCS<span class="type">12</span> format).  Passing NULL clears the client certificate.
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>out_ck_type</code></em> :</span></p></td>
-<td>on successful return, the type of the certificate added
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>on unsuccessful return, an error
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> TRUE if the operation succeeded, FALSE if it was unsuccessful
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_setting_802_1x_get_phase2_ca_cert ()">
-<a name="nm-setting-802-1x-get-phase2-ca-cert"></a><h3>nm_setting_802_1x_get_phase2_ca_cert ()</h3>
-<pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *  nm_setting_802_1x_get_phase2_ca_cert
-                                                        (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
-<div class="warning" title="Warning" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title">Warning</h3>
-<p><code class="literal">nm_setting_802_1x_get_phase2_ca_cert</code> has been deprecated since version 0.8 and should not be used in newly-written code. This function has been deprecated and should
-  not be used in newly written code. Calling this function is
-  equivalent to calling <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-ca-cert-blob" title="nm_setting_802_1x_get_phase2_ca_cert_blob ()"><code class="function">nm_setting_802_1x_get_phase2_ca_cert_blob()</code></a>.</p>
-</div>
 <p>
-Returns the "phase 2" CA certificate blob.  Not all EAP methods use
-a CA certificate (LEAP for example), and those that can take advantage of the
-CA certificate allow it to be unset.  Note that lack of a CA certificate
-reduces security by allowing man-in-the-middle attacks, because the identity
-of the network cannot be confirmed by the client.
+WARNING: the phase2 private key property is not a "secret" property, and thus
+unencrypted private key data may be readable by unprivileged users.  Private
+keys should always be encrypted with a private key password.
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
@@ -2195,76 +1889,18 @@ of the network cannot be confirmed by the client.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the "phase 2" CA certificate data
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_setting_802_1x_set_phase2_ca_cert_from_file ()">
-<a name="nm-setting-802-1x-set-phase2-ca-cert-from-file"></a><h3>nm_setting_802_1x_set_phase2_ca_cert_from_file ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_802_1x_set_phase2_ca_cert_from_file
-                                                        (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> *filename</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKType" title="enum NMSetting8021xCKType"><span class="type">NMSetting8021xCKType</span></a> *out_ck_type</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
-<div class="warning" title="Warning" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title">Warning</h3>
-<p><code class="literal">nm_setting_802_1x_set_phase2_ca_cert_from_file</code> has been deprecated since version 0.8 and should not be used in newly-written code. This function has been deprecated and should
-  not be used in newly written code. Calling this function is
-  equivalent to calling <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-phase2-ca-cert" title="nm_setting_802_1x_set_phase2_ca_cert ()"><code class="function">nm_setting_802_1x_set_phase2_ca_cert()</code></a>.
-  with the <code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code> scheme.</p>
-</div>
-<p>
-Reads a certificate from disk and sets the <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-ca-cert" title='The "phase2-ca-cert" property'><span class="type">"phase2-ca-cert"</span></a>
-property with the raw certificate data.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>the <a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>filename</code></em> :</span></p></td>
-<td>the path of the "phase2" CA certificate file (PEM or DER format).
-  Passing NULL with any <em class="parameter"><code>scheme</code></em> clears the "phase2" CA certificate.
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>out_ck_type</code></em> :</span></p></td>
-<td>on successful return, the type of the certificate added
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>on unsuccessful return, an error
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> TRUE if the operation succeeded, FALSE if it was unsuccessful
-</td>
+<td>the "phase 2" private key data</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_get_phase2_client_cert ()">
-<a name="nm-setting-802-1x-get-phase2-client-cert"></a><h3>nm_setting_802_1x_get_phase2_client_cert ()</h3>
-<pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *  nm_setting_802_1x_get_phase2_client_cert
+<div class="refsect2">
+<a name="nm-setting-802-1x-get-phase2-private-key-path"></a><h3>nm_setting_802_1x_get_phase2_private_key_path ()</h3>
+<pre class="programlisting">const <span class="returnvalue">char</span> *            nm_setting_802_1x_get_phase2_private_key_path
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
-<div class="warning" title="Warning" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title">Warning</h3>
-<p><code class="literal">nm_setting_802_1x_get_phase2_client_cert</code> has been deprecated since version 0.8 and should not be used in newly-written code. This function has been deprecated and should
-  not be used in newly written code. Calling this function is
-  equivalent to calling <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-client-cert-blob" title="nm_setting_802_1x_get_phase2_client_cert_blob ()"><code class="function">nm_setting_802_1x_get_phase2_client_cert_blob()</code></a>.</p>
-</div>
 <p>
-Client certificates are used to identify the connecting client to the network
+Private keys are used to authenticate the connecting client to the network
 when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
 authentication method.
 </p>
@@ -2278,123 +1914,46 @@ authentication method.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the "phase 2" client certificate data
-</td>
+<td>path to the "phase 2" private key file</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_set_phase2_client_cert_from_file ()">
-<a name="nm-setting-802-1x-set-phase2-client-cert-from-file"></a><h3>nm_setting_802_1x_set_phase2_client_cert_from_file ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_802_1x_set_phase2_client_cert_from_file
+<div class="refsect2">
+<a name="nm-setting-802-1x-set-phase2-private-key"></a><h3>nm_setting_802_1x_set_phase2_private_key ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_802_1x_set_phase2_private_key
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> *filename</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKType" title="enum NMSetting8021xCKType"><span class="type">NMSetting8021xCKType</span></a> *out_ck_type</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *value</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *password</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme" title="enum NMSetting8021xCKScheme"><span class="type">NMSetting8021xCKScheme</span></a> scheme</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKFormat" title="enum NMSetting8021xCKFormat"><span class="type">NMSetting8021xCKFormat</span></a> *out_format</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
-<div class="warning" title="Warning" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title">Warning</h3>
-<p><code class="literal">nm_setting_802_1x_set_phase2_client_cert_from_file</code> has been deprecated since version 0.8 and should not be used in newly-written code. This function has been deprecated and should
-  not be used in newly written code. Calling this function is
-  equivalent to calling <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-phase2-client-cert" title="nm_setting_802_1x_set_phase2_client_cert ()"><code class="function">nm_setting_802_1x_set_phase2_client_cert()</code></a> with the.
-  <code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code> scheme.</p>
-</div>
 <p>
-Reads a certificate from disk and sets the <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-client-cert" title='The "phase2-client-cert" property'><span class="type">"phase2-client-cert"</span></a>
-property with the raw certificate data.
-</p>
-<p>
-Client certificates are used to identify the connecting client to the network
+Private keys are used to authenticate the connecting client to the network
 when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
 authentication method.
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>the <a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>filename</code></em> :</span></p></td>
-<td>pass the path of the "phase2" client certificate file (PEM, DER,
-  or PKCS<span class="type">12</span> format).  Passing NULL clears the "phase2" client certificate.
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>out_ck_type</code></em> :</span></p></td>
-<td>on successful return, the type of the certificate added
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>on unsuccessful return, an error
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> TRUE if the operation succeeded, FALSE if it was unsuccessful
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_setting_802_1x_get_private_key ()">
-<a name="nm-setting-802-1x-get-private-key"></a><h3>nm_setting_802_1x_get_private_key ()</h3>
-<pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *  nm_setting_802_1x_get_private_key   (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
-<div class="warning" title="Warning" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title">Warning</h3>
-<p><code class="literal">nm_setting_802_1x_get_private_key</code> has been deprecated since version 0.8 and should not be used in newly-written code. This function has been deprecated and should
-  not be used in newly written code. Calling this function is
-  equivalent to calling <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-private-key-blob" title="nm_setting_802_1x_get_private_key_blob ()"><code class="function">nm_setting_802_1x_get_private_key_blob()</code></a>.</p>
-</div>
 <p>
-Private keys are used to authenticate the connecting client to the network
-when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
-authentication method.
+This function reads a private key from disk and sets the
+<a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-private-key" title='The "phase2-private-key" property'><span class="type">"phase2-private-key"</span></a> property with the private key file data if
+using the <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code></a> scheme, or with the path to the
+private key file if using the <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code></a> scheme.
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>the <a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the private key data
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_setting_802_1x_set_private_key_from_file ()">
-<a name="nm-setting-802-1x-set-private-key-from-file"></a><h3>nm_setting_802_1x_set_private_key_from_file ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_802_1x_set_private_key_from_file
-                                                        (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> *filename</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> *password</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKType" title="enum NMSetting8021xCKType"><span class="type">NMSetting8021xCKType</span></a> *out_ck_type</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
-<div class="warning" title="Warning" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title">Warning</h3>
-<p><code class="literal">nm_setting_802_1x_set_private_key_from_file</code> has been deprecated since version 0.8 and should not be used in newly-written code. This function has been deprecated and should
-  not be used in newly written code. Calling this function is
-  equivalent to calling <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-private-key" title="nm_setting_802_1x_set_private_key ()"><code class="function">nm_setting_802_1x_set_private_key()</code></a> with.
-  the <code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code> scheme.</p>
-</div>
 <p>
-Reads a private key from disk and sets the <a class="link" href="NMSetting8021x.html#NMSetting8021x--private-key" title='The "private-key" property'><span class="type">"private-key"</span></a>
-property with the raw private key data.
+If <em class="parameter"><code>password</code></em> is given, this function attempts to decrypt the private key to
+verify that <em class="parameter"><code>password</code></em> is correct, and if it is, updates the
+<a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-private-key-password" title='The "phase2-private-key-password" property'><span class="type">"phase2-private-key-password"</span></a> property with the given
+<em class="parameter"><code>password</code></em>.  If the decryption is unsuccessful, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> is returned, <em class="parameter"><code>error</code></em> is
+set, and no internal data is changed.  If no <em class="parameter"><code>password</code></em> is given, the private
+key is assumed to be valid, no decryption is performed, and the password may
+be set at a later time.
 </p>
 <p>
-Private keys are used to authenticate the connecting client to the network
-when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
-authentication method.
+WARNING: the "phase2" private key property is not a "secret" property, and
+thus unencrypted private key data using the BLOB scheme may be readable by
+unprivileged users.  Private keys should always be encrypted with a private
+key password to prevent unauthorized access to unencrypted private key data.
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
@@ -2405,78 +1964,43 @@ authentication method.
 </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>filename</code></em> :</span></p></td>
-<td>the path of the private key file (PEM, DER, or PKCS<span class="type">12</span> format).
-  Passing NULL clears the private key.
-</td>
+<td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
+<td>when <em class="parameter"><code>scheme</code></em> is set to either <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code></a> or
+<a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code></a>, pass the path of the "phase2" private
+key file (PEM, DER, or PKCS<span class="type">12</span> format).  The path must be UTF-8 encoded;
+use <a href="http://library.gnome.org/devel/glib/unstable/glib-Character-Set-Conversion.html#g-filename-to-utf8"><code class="function">g_filename_to_utf8()</code></a> to convert if needed.  Passing NULL with any
+<em class="parameter"><code>scheme</code></em> clears the private key.</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>password</code></em> :</span></p></td>
-<td>password used to decrypt the private key
-</td>
+<td>password used to decrypt the private key, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if the password
+is unknown.  If the password is given but fails to decrypt the private key,
+an error is returned.</td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>out_ck_type</code></em> :</span></p></td>
-<td>on successful return, the type of the private key added
-</td>
+<td><p><span class="term"><em class="parameter"><code>scheme</code></em> :</span></p></td>
+<td>desired storage scheme for the private key</td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>on unsuccessful return, an error
-</td>
+<td><p><span class="term"><em class="parameter"><code>out_format</code></em> :</span></p></td>
+<td>on successful return, the type of the private key added</td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> TRUE if the operation succeeded, FALSE if it was unsuccessful
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_setting_802_1x_get_private_key_type ()">
-<a name="nm-setting-802-1x-get-private-key-type"></a><h3>nm_setting_802_1x_get_private_key_type ()</h3>
-<pre class="programlisting"><a class="link" href="NMSetting8021x.html#NMSetting8021xCKType" title="enum NMSetting8021xCKType"><span class="returnvalue">NMSetting8021xCKType</span></a>  nm_setting_802_1x_get_private_key_type
-                                                        (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
-<div class="warning" title="Warning" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title">Warning</h3>
-<p><code class="literal">nm_setting_802_1x_get_private_key_type</code> has been deprecated since version 0.8 and should not be used in newly-written code. This function has been deprecated and should
-  not be used in newly written code. Calling this function is
-  equivalent to calling <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-private-key-format" title="nm_setting_802_1x_get_private_key_format ()"><code class="function">nm_setting_802_1x_get_private_key_format()</code></a>.</p>
-</div>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>the <a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a>
-</td>
+<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
+<td>on unsuccessful return, an error</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the data format of the private key data stored in the
-  <a class="link" href="NMSetting8021x.html#NMSetting8021x--private-key" title='The "private-key" property'><span class="type">"private-key"</span></a> property
-</td>
+<td>TRUE if the operation succeeded, FALSE if it was unsuccessful</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_get_phase2_private_key ()">
-<a name="nm-setting-802-1x-get-phase2-private-key"></a><h3>nm_setting_802_1x_get_phase2_private_key ()</h3>
-<pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *  nm_setting_802_1x_get_phase2_private_key
+<div class="refsect2">
+<a name="nm-setting-802-1x-get-phase2-private-key-password"></a><h3>nm_setting_802_1x_get_phase2_private_key_password ()</h3>
+<pre class="programlisting">const <span class="returnvalue">char</span> *            nm_setting_802_1x_get_phase2_private_key_password
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
-<div class="warning" title="Warning" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title">Warning</h3>
-<p><code class="literal">nm_setting_802_1x_get_phase2_private_key</code> has been deprecated since version 0.8 and should not be used in newly-written code. This function has been deprecated and should
-  not be used in newly written code. Calling this function is
-  equivalent to calling <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-private-key-blob" title="nm_setting_802_1x_get_private_key_blob ()"><code class="function">nm_setting_802_1x_get_private_key_blob()</code></a>.</p>
-</div>
-<p>
-Private keys are used to authenticate the connecting client to the network
-when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
-authentication method.
-</p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
 <tbody>
@@ -2487,37 +2011,19 @@ authentication method.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the "phase 2" private key data
-</td>
+<td>the private key password used to decrypt the private key if
+previously set with <code class="function">nm_setting_802_1x_set_phase2_private_key_from_file()</code>,
+<code class="function">nm_setting_802_1x_set_phase2_private_key_path()</code>, or the
+<a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-private-key-password" title='The "phase2-private-key-password" property'><span class="type">"phase2-private-key-password"</span></a> property.</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_set_phase2_private_key_from_file ()">
-<a name="nm-setting-802-1x-set-phase2-private-key-from-file"></a><h3>nm_setting_802_1x_set_phase2_private_key_from_file ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_802_1x_set_phase2_private_key_from_file
-                                                        (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> *filename</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> *password</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKType" title="enum NMSetting8021xCKType"><span class="type">NMSetting8021xCKType</span></a> *out_ck_type</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
-<div class="warning" title="Warning" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title">Warning</h3>
-<p><code class="literal">nm_setting_802_1x_set_phase2_private_key_from_file</code> has been deprecated since version 0.8 and should not be used in newly-written code. This function has been deprecated and should
-  not be used in newly written code. Calling this function is
-  equivalent to calling <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-phase2-private-key" title="nm_setting_802_1x_set_phase2_private_key ()"><code class="function">nm_setting_802_1x_set_phase2_private_key()</code></a> with
-  the <code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code> scheme.</p>
-</div>
-<p>
-Reads a "phase 2" private key from disk and sets the
-<a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-private-key" title='The "phase2-private-key" property'><span class="type">"phase2-private-key"</span></a> property with the raw private key data.
-</p>
-<p>
-Private keys are used to authenticate the connecting client to the network
-when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
-authentication method.
-</p>
+<div class="refsect2">
+<a name="nm-setting-802-1x-get-phase2-private-key-password-flags"></a><h3>nm_setting_802_1x_get_phase2_private_key_password_flags ()</h3>
+<pre class="programlisting"><a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="returnvalue">NMSettingSecretFlags</span></a>  nm_setting_802_1x_get_phase2_private_key_password_flags
+                                                        (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
 <tbody>
@@ -2527,45 +2033,19 @@ authentication method.
 </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>filename</code></em> :</span></p></td>
-<td>the path of the "phase2" private key file (PEM, DER, or PKCS<span class="type">12</span>
-  format).  Passing NULL clears the "phase2" private key.
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>password</code></em> :</span></p></td>
-<td>password used to decrypt the private key
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>out_ck_type</code></em> :</span></p></td>
-<td>on successful return, the type of the private key added
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>on unsuccessful return, an error
-</td>
-</tr>
-<tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> TRUE if the operation succeeded, FALSE if it was unsuccessful
+<td>the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> pertaining to the
+<a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-private-key-password" title='The "phase2-private-key-password" property'><span class="type">"phase2-private-key-password"</span></a>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_get_phase2_private_key_type ()">
-<a name="nm-setting-802-1x-get-phase2-private-key-type"></a><h3>nm_setting_802_1x_get_phase2_private_key_type ()</h3>
-<pre class="programlisting"><a class="link" href="NMSetting8021x.html#NMSetting8021xCKType" title="enum NMSetting8021xCKType"><span class="returnvalue">NMSetting8021xCKType</span></a>  nm_setting_802_1x_get_phase2_private_key_type
+<div class="refsect2">
+<a name="nm-setting-802-1x-get-phase2-private-key-format"></a><h3>nm_setting_802_1x_get_phase2_private_key_format ()</h3>
+<pre class="programlisting"><a class="link" href="NMSetting8021x.html#NMSetting8021xCKFormat" title="enum NMSetting8021xCKFormat"><span class="returnvalue">NMSetting8021xCKFormat</span></a>  nm_setting_802_1x_get_phase2_private_key_format
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
-<div class="warning" title="Warning" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title">Warning</h3>
-<p><code class="literal">nm_setting_802_1x_get_phase2_private_key_type</code> has been deprecated since version 0.8 and should not be used in newly-written code. This function has been deprecated and should
-  not be used in newly written code. Calling this function is
-  equivalent to calling <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-format" title="nm_setting_802_1x_get_phase2_private_key_format ()"><code class="function">nm_setting_802_1x_get_phase2_private_key_format()</code></a>.</p>
-</div>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
 <tbody>
@@ -2576,17 +2056,16 @@ authentication method.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the data format of the private key data stored in the
-  <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-private-key" title='The "phase2-private-key" property'><span class="type">"phase2-private-key"</span></a> property
-</td>
+<td>the data format of the "phase 2" private key data stored in the
+<a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-private-key" title='The "phase2-private-key" property'><span class="type">"phase2-private-key"</span></a> property</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 </div>
-<div class="refsect1" title="Property Details">
+<div class="refsect1">
 <a name="NMSetting8021x.property-details"></a><h2>Property Details</h2>
-<div class="refsect2" title='The "anonymous-identity" property'>
+<div class="refsect2">
 <a name="NMSetting8021x--anonymous-identity"></a><h3>The <code class="literal">"anonymous-identity"</code> property</h3>
 <pre class="programlisting">  "anonymous-identity"       <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -2597,7 +2076,7 @@ identity like EAP-TTLS.
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "ca-cert" property'>
+<div class="refsect2">
 <a name="NMSetting8021x--ca-cert"></a><h3>The <code class="literal">"ca-cert"</code> property</h3>
 <pre class="programlisting">  "ca-cert"                  <span class="type">GArray_guchar_</span>*       : Read / Write</pre>
 <p>
@@ -2607,7 +2086,7 @@ discouraged; use the <a class="link" href="NMSetting8021x.html#nm-setting-802-1x
 </p>
 </div>
 <hr>
-<div class="refsect2" title='The "ca-path" property'>
+<div class="refsect2">
 <a name="NMSetting8021x--ca-path"></a><h3>The <code class="literal">"ca-path"</code> property</h3>
 <pre class="programlisting">  "ca-path"                  <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -2618,7 +2097,7 @@ certificate specified in the <a class="link" href="NMSetting8021x.html#NMSetting
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "client-cert" property'>
+<div class="refsect2">
 <a name="NMSetting8021x--client-cert"></a><h3>The <code class="literal">"client-cert"</code> property</h3>
 <pre class="programlisting">  "client-cert"              <span class="type">GArray_guchar_</span>*       : Read / Write</pre>
 <p>
@@ -2628,7 +2107,7 @@ discouraged; use the <a class="link" href="NMSetting8021x.html#nm-setting-802-1x
 </p>
 </div>
 <hr>
-<div class="refsect2" title='The "eap" property'>
+<div class="refsect2">
 <a name="NMSetting8021x--eap"></a><h3>The <code class="literal">"eap"</code> property</h3>
 <pre class="programlisting">  "eap"                      <span class="type">GSList_gchararray_</span>*   : Read / Write</pre>
 <p>
@@ -2640,7 +2119,7 @@ allowed combinations.
 </p>
 </div>
 <hr>
-<div class="refsect2" title='The "identity" property'>
+<div class="refsect2">
 <a name="NMSetting8021x--identity"></a><h3>The <code class="literal">"identity"</code> property</h3>
 <pre class="programlisting">  "identity"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -2650,7 +2129,7 @@ user or login name.
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "password" property'>
+<div class="refsect2">
 <a name="NMSetting8021x--password"></a><h3>The <code class="literal">"password"</code> property</h3>
 <pre class="programlisting">  "password"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -2659,7 +2138,17 @@ Password used for EAP authentication methods.
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "phase1-fast-provisioning" property'>
+<div class="refsect2">
+<a name="NMSetting8021x--password-flags"></a><h3>The <code class="literal">"password-flags"</code> property</h3>
+<pre class="programlisting">  "password-flags"           <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write</pre>
+<p>
+Flags indicating how to handle <a class="link" href="NMSetting8021x.html#NMSetting8021x--password" title='The "password" property'><span class="type">"password"</span></a>:.
+</p>
+<p>Allowed values: &lt;= 7</p>
+<p>Default value: 0</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="NMSetting8021x--phase1-fast-provisioning"></a><h3>The <code class="literal">"phase1-fast-provisioning"</code> property</h3>
 <pre class="programlisting">  "phase1-fast-provisioning" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -2673,7 +2162,7 @@ wpa_supplicant documentation for more details.
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "phase1-peaplabel" property'>
+<div class="refsect2">
 <a name="NMSetting8021x--phase1-peaplabel"></a><h3>The <code class="literal">"phase1-peaplabel"</code> property</h3>
 <pre class="programlisting">  "phase1-peaplabel"         <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -2685,7 +2174,7 @@ wpa_supplicant documentation for more details.
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "phase1-peapver" property'>
+<div class="refsect2">
 <a name="NMSetting8021x--phase1-peapver"></a><h3>The <code class="literal">"phase1-peapver"</code> property</h3>
 <pre class="programlisting">  "phase1-peapver"           <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -2699,7 +2188,7 @@ version.
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "phase2-auth" property'>
+<div class="refsect2">
 <a name="NMSetting8021x--phase2-auth"></a><h3>The <code class="literal">"phase2-auth"</code> property</h3>
 <pre class="programlisting">  "phase2-auth"              <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -2713,7 +2202,7 @@ authentication; see the wpa_supplicant documentation for more details.
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "phase2-autheap" property'>
+<div class="refsect2">
 <a name="NMSetting8021x--phase2-autheap"></a><h3>The <code class="literal">"phase2-autheap"</code> property</h3>
 <pre class="programlisting">  "phase2-autheap"           <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -2727,7 +2216,7 @@ wpa_supplicant documentation for more details.
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "phase2-ca-cert" property'>
+<div class="refsect2">
 <a name="NMSetting8021x--phase2-ca-cert"></a><h3>The <code class="literal">"phase2-ca-cert"</code> property</h3>
 <pre class="programlisting">  "phase2-ca-cert"           <span class="type">GArray_guchar_</span>*       : Read / Write</pre>
 <p>
@@ -2738,7 +2227,7 @@ Setting this property directly is discouraged; use the
 </p>
 </div>
 <hr>
-<div class="refsect2" title='The "phase2-ca-path" property'>
+<div class="refsect2">
 <a name="NMSetting8021x--phase2-ca-path"></a><h3>The <code class="literal">"phase2-ca-path"</code> property</h3>
 <pre class="programlisting">  "phase2-ca-path"           <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -2749,7 +2238,7 @@ certificate specified in the <a class="link" href="NMSetting8021x.html#NMSetting
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "phase2-client-cert" property'>
+<div class="refsect2">
 <a name="NMSetting8021x--phase2-client-cert"></a><h3>The <code class="literal">"phase2-client-cert"</code> property</h3>
 <pre class="programlisting">  "phase2-client-cert"       <span class="type">GArray_guchar_</span>*       : Read / Write</pre>
 <p>
@@ -2760,7 +2249,7 @@ properties.  Setting this property directly is discouraged; use the
 </p>
 </div>
 <hr>
-<div class="refsect2" title='The "phase2-private-key" property'>
+<div class="refsect2">
 <a name="NMSetting8021x--phase2-private-key"></a><h3>The <code class="literal">"phase2-private-key"</code> property</h3>
 <pre class="programlisting">  "phase2-private-key"       <span class="type">GArray_guchar_</span>*       : Read / Write</pre>
 <p>
@@ -2774,7 +2263,7 @@ property directly is discouraged; use the
 </p>
 </div>
 <hr>
-<div class="refsect2" title='The "phase2-private-key-password" property'>
+<div class="refsect2">
 <a name="NMSetting8021x--phase2-private-key-password"></a><h3>The <code class="literal">"phase2-private-key-password"</code> property</h3>
 <pre class="programlisting">  "phase2-private-key-password" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -2788,7 +2277,17 @@ the private key by the <a class="link" href="NMSetting8021x.html#nm-setting-802-
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "private-key" property'>
+<div class="refsect2">
+<a name="NMSetting8021x--phase2-private-key-password-flags"></a><h3>The <code class="literal">"phase2-private-key-password-flags"</code> property</h3>
+<pre class="programlisting">  "phase2-private-key-password-flags" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write</pre>
+<p>
+Flags indicating how to handle <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-private-key-password" title='The "phase2-private-key-password" property'><span class="type">"phase2-private-key-password"</span></a>:.
+</p>
+<p>Allowed values: &lt;= 7</p>
+<p>Default value: 0</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="NMSetting8021x--private-key"></a><h3>The <code class="literal">"private-key"</code> property</h3>
 <pre class="programlisting">  "private-key"              <span class="type">GArray_guchar_</span>*       : Read / Write</pre>
 <p>
@@ -2796,9 +2295,16 @@ Contains the private key if the <a class="link" href="NMSetting8021x.html#NMSett
 'tls'.  Setting this property directly is discouraged; use the
 <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-private-key" title="nm_setting_802_1x_set_private_key ()"><code class="function">nm_setting_802_1x_set_private_key()</code></a> function instead.
 </p>
+<p>
+WARNING: <a class="link" href="NMSetting8021x.html#NMSetting8021x--private-key" title='The "private-key" property'><span class="type">"private-key"</span></a> is not a "secret" property, and thus
+unencrypted private key data using the BLOB scheme may be readable by
+unprivileged users.  Private keys should always be encrypted with a
+private key password to prevent unauthorized access to unencrypted
+private key data.
+</p>
 </div>
 <hr>
-<div class="refsect2" title='The "private-key-password" property'>
+<div class="refsect2">
 <a name="NMSetting8021x--private-key-password"></a><h3>The <code class="literal">"private-key-password"</code> property</h3>
 <pre class="programlisting">  "private-key-password"     <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -2812,7 +2318,17 @@ the private key by the <a class="link" href="NMSetting8021x.html#nm-setting-802-
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "system-ca-certs" property'>
+<div class="refsect2">
+<a name="NMSetting8021x--private-key-password-flags"></a><h3>The <code class="literal">"private-key-password-flags"</code> property</h3>
+<pre class="programlisting">  "private-key-password-flags" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write</pre>
+<p>
+Flags indicating how to handle <a class="link" href="NMSetting8021x.html#NMSetting8021x--private-key-password" title='The "private-key-password" property'><span class="type">"private-key-password"</span></a>:.
+</p>
+<p>Allowed values: &lt;= 7</p>
+<p>Default value: 0</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="NMSetting8021x--system-ca-certs"></a><h3>The <code class="literal">"system-ca-certs"</code> property</h3>
 <pre class="programlisting">  "system-ca-certs"          <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write / Construct</pre>
 <p>
@@ -2830,6 +2346,6 @@ addition to any certificates specified by the <a class="link" href="NMSetting802
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.15</div>
+          Generated by GTK-Doc V1.17</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingBluetooth.html b/docs/libnm-util/html/NMSettingBluetooth.html
index 068c5e833..a6eae7b9c 100644
--- a/docs/libnm-util/html/NMSettingBluetooth.html
+++ b/docs/libnm-util/html/NMSettingBluetooth.html
@@ -3,12 +3,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>NMSettingBluetooth</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="libnm-util Reference Manual">
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity">
 <link rel="next" href="NMSettingSerial.html" title="NMSettingSerial">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,7 +30,7 @@
                   <a href="#NMSettingBluetooth.properties" class="shortcut">Properties</a>
 </td></tr>
 </table>
-<div class="refentry" title="NMSettingBluetooth">
+<div class="refentry">
 <a name="NMSettingBluetooth"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
@@ -39,10 +39,10 @@
 </td>
 <td valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv" title="Synopsis">
+<div class="refsynopsisdiv">
 <a name="NMSettingBluetooth.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">#define             <a class="link" href="NMSettingBluetooth.html#NM-SETTING-BLUETOOTH-SETTING-NAME:CAPS" title="NM_SETTING_BLUETOOTH_SETTING_NAME">NM_SETTING_BLUETOOTH_SETTING_NAME</a>
-enum                <a class="link" href="NMSettingBluetooth.html#NMSettingBluetoothError" title="enum NMSettingBluetoothError">NMSettingBluetoothError</a>;
+<a name="NMSettingBluetoothError"></a><pre class="synopsis">#define             <a class="link" href="NMSettingBluetooth.html#NM-SETTING-BLUETOOTH-SETTING-NAME:CAPS" title="NM_SETTING_BLUETOOTH_SETTING_NAME">NM_SETTING_BLUETOOTH_SETTING_NAME</a>
+enum                <a class="link" href="NMSettingBluetooth.html#NMSettingBluetoothError">NMSettingBluetoothError</a>;
 #define             <a class="link" href="NMSettingBluetooth.html#NM-TYPE-SETTING-BLUETOOTH-ERROR:CAPS" title="NM_TYPE_SETTING_BLUETOOTH_ERROR">NM_TYPE_SETTING_BLUETOOTH_ERROR</a>
 #define             <a class="link" href="NMSettingBluetooth.html#NM-SETTING-BLUETOOTH-ERROR:CAPS" title="NM_SETTING_BLUETOOTH_ERROR">NM_SETTING_BLUETOOTH_ERROR</a>
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              <a class="link" href="NMSettingBluetooth.html#nm-setting-bluetooth-error-quark" title="nm_setting_bluetooth_error_quark ()">nm_setting_bluetooth_error_quark</a>    (<em class="parameter"><code><span class="type">void</span></code></em>);
@@ -59,29 +59,33 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
                                                         (<em class="parameter"><code><a class="link" href="NMSettingBluetooth.html" title="NMSettingBluetooth"><span class="type">NMSettingBluetooth</span></a> *setting</code></em>);
 </pre>
 </div>
-<div class="refsect1" title="Object Hierarchy">
+<div class="refsect1">
 <a name="NMSettingBluetooth.object-hierarchy"></a><h2>Object Hierarchy</h2>
 <pre class="synopsis">
+  GEnum
+   +----NMSettingBluetoothError
+</pre>
+<pre class="synopsis">
   <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>
    +----<a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
          +----NMSettingBluetooth
 </pre>
 </div>
-<div class="refsect1" title="Properties">
+<div class="refsect1">
 <a name="NMSettingBluetooth.properties"></a><h2>Properties</h2>
 <pre class="synopsis">
   "<a class="link" href="NMSettingBluetooth.html#NMSettingBluetooth--bdaddr" title='The "bdaddr" property'>bdaddr</a>"                   <span class="type">GArray_guchar_</span>*       : Read / Write
   "<a class="link" href="NMSettingBluetooth.html#NMSettingBluetooth--type" title='The "type" property'>type</a>"                     <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write
 </pre>
 </div>
-<div class="refsect1" title="Description">
+<div class="refsect1">
 <a name="NMSettingBluetooth.description"></a><h2>Description</h2>
 <p>
 </p>
 </div>
-<div class="refsect1" title="Details">
+<div class="refsect1">
 <a name="NMSettingBluetooth.details"></a><h2>Details</h2>
-<div class="refsect2" title="NM_SETTING_BLUETOOTH_SETTING_NAME">
+<div class="refsect2">
 <a name="NM-SETTING-BLUETOOTH-SETTING-NAME:CAPS"></a><h3>NM_SETTING_BLUETOOTH_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_BLUETOOTH_SETTING_NAME "bluetooth"
 </pre>
@@ -89,7 +93,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="enum NMSettingBluetoothError">
+<div class="refsect2">
 <a name="NMSettingBluetoothError"></a><h3>enum NMSettingBluetoothError</h3>
 <pre class="programlisting">typedef enum
 {
@@ -103,7 +107,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_TYPE_SETTING_BLUETOOTH_ERROR">
+<div class="refsect2">
 <a name="NM-TYPE-SETTING-BLUETOOTH-ERROR:CAPS"></a><h3>NM_TYPE_SETTING_BLUETOOTH_ERROR</h3>
 <pre class="programlisting">#define NM_TYPE_SETTING_BLUETOOTH_ERROR (nm_setting_bluetooth_error_get_type ()) 
 </pre>
@@ -111,7 +115,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_BLUETOOTH_ERROR">
+<div class="refsect2">
 <a name="NM-SETTING-BLUETOOTH-ERROR:CAPS"></a><h3>NM_SETTING_BLUETOOTH_ERROR</h3>
 <pre class="programlisting">#define NM_SETTING_BLUETOOTH_ERROR nm_setting_bluetooth_error_quark ()
 </pre>
@@ -119,22 +123,14 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_bluetooth_error_quark ()">
+<div class="refsect2">
 <a name="nm-setting-bluetooth-error-quark"></a><h3>nm_setting_bluetooth_error_quark ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              nm_setting_bluetooth_error_quark    (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_BLUETOOTH_BDADDR">
+<div class="refsect2">
 <a name="NM-SETTING-BLUETOOTH-BDADDR:CAPS"></a><h3>NM_SETTING_BLUETOOTH_BDADDR</h3>
 <pre class="programlisting">#define NM_SETTING_BLUETOOTH_BDADDR    "bdaddr"
 </pre>
@@ -142,7 +138,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_BLUETOOTH_TYPE">
+<div class="refsect2">
 <a name="NM-SETTING-BLUETOOTH-TYPE:CAPS"></a><h3>NM_SETTING_BLUETOOTH_TYPE</h3>
 <pre class="programlisting">#define NM_SETTING_BLUETOOTH_TYPE      "type"
 </pre>
@@ -150,7 +146,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_BLUETOOTH_TYPE_DUN">
+<div class="refsect2">
 <a name="NM-SETTING-BLUETOOTH-TYPE-DUN:CAPS"></a><h3>NM_SETTING_BLUETOOTH_TYPE_DUN</h3>
 <pre class="programlisting">#define NM_SETTING_BLUETOOTH_TYPE_DUN  "dun"
 </pre>
@@ -158,7 +154,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_BLUETOOTH_TYPE_PANU">
+<div class="refsect2">
 <a name="NM-SETTING-BLUETOOTH-TYPE-PANU:CAPS"></a><h3>NM_SETTING_BLUETOOTH_TYPE_PANU</h3>
 <pre class="programlisting">#define NM_SETTING_BLUETOOTH_TYPE_PANU "panu"
 </pre>
@@ -166,14 +162,14 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMSettingBluetooth">
+<div class="refsect2">
 <a name="NMSettingBluetooth-struct"></a><h3>NMSettingBluetooth</h3>
 <pre class="programlisting">typedef struct _NMSettingBluetooth NMSettingBluetooth;</pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMSettingBluetoothClass">
+<div class="refsect2">
 <a name="NMSettingBluetoothClass"></a><h3>NMSettingBluetoothClass</h3>
 <pre class="programlisting">typedef struct {
 	NMSettingClass parent;
@@ -189,84 +185,38 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_bluetooth_get_type ()">
+<div class="refsect2">
 <a name="nm-setting-bluetooth-get-type"></a><h3>nm_setting_bluetooth_get_type ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               nm_setting_bluetooth_get_type       (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_bluetooth_new ()">
+<div class="refsect2">
 <a name="nm-setting-bluetooth-new"></a><h3>nm_setting_bluetooth_new ()</h3>
 <pre class="programlisting"><a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *         nm_setting_bluetooth_new            (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_bluetooth_get_bdaddr ()">
+<div class="refsect2">
 <a name="nm-setting-bluetooth-get-bdaddr"></a><h3>nm_setting_bluetooth_get_bdaddr ()</h3>
 <pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *  nm_setting_bluetooth_get_bdaddr     (<em class="parameter"><code><a class="link" href="NMSettingBluetooth.html" title="NMSettingBluetooth"><span class="type">NMSettingBluetooth</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_bluetooth_get_connection_type ()">
+<div class="refsect2">
 <a name="nm-setting-bluetooth-get-connection-type"></a><h3>nm_setting_bluetooth_get_connection_type ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_bluetooth_get_connection_type
                                                         (<em class="parameter"><code><a class="link" href="NMSettingBluetooth.html" title="NMSettingBluetooth"><span class="type">NMSettingBluetooth</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 </div>
-<div class="refsect1" title="Property Details">
+<div class="refsect1">
 <a name="NMSettingBluetooth.property-details"></a><h2>Property Details</h2>
-<div class="refsect2" title='The "bdaddr" property'>
+<div class="refsect2">
 <a name="NMSettingBluetooth--bdaddr"></a><h3>The <code class="literal">"bdaddr"</code> property</h3>
 <pre class="programlisting">  "bdaddr"                   <span class="type">GArray_guchar_</span>*       : Read / Write</pre>
 <p>
@@ -274,7 +224,7 @@ The Bluetooth address of the device.
 </p>
 </div>
 <hr>
-<div class="refsect2" title='The "type" property'>
+<div class="refsect2">
 <a name="NMSettingBluetooth--type"></a><h3>The <code class="literal">"type"</code> property</h3>
 <pre class="programlisting">  "type"                     <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -287,6 +237,6 @@ Either 'dun' for Dial-Up Networking connections (not yet supported) or
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.15</div>
+          Generated by GTK-Doc V1.17</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingCdma.html b/docs/libnm-util/html/NMSettingCdma.html
index 6ee02f0da..3dc4a7123 100644
--- a/docs/libnm-util/html/NMSettingCdma.html
+++ b/docs/libnm-util/html/NMSettingCdma.html
@@ -3,12 +3,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>NMSettingCdma</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="libnm-util Reference Manual">
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingSerial.html" title="NMSettingSerial">
 <link rel="next" href="NMSettingGsm.html" title="NMSettingGsm">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,7 +30,7 @@
                   <a href="#NMSettingCdma.properties" class="shortcut">Properties</a>
 </td></tr>
 </table>
-<div class="refentry" title="NMSettingCdma">
+<div class="refentry">
 <a name="NMSettingCdma"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
@@ -39,19 +39,20 @@
 </td>
 <td valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv" title="Synopsis">
+<div class="refsynopsisdiv">
 <a name="NMSettingCdma.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">
+<a name="NMSettingCdmaError"></a><pre class="synopsis">
 #include &lt;nm-setting-cdma.h&gt;
 
 #define             <a class="link" href="NMSettingCdma.html#NM-SETTING-CDMA-SETTING-NAME:CAPS" title="NM_SETTING_CDMA_SETTING_NAME">NM_SETTING_CDMA_SETTING_NAME</a>
-enum                <a class="link" href="NMSettingCdma.html#NMSettingCdmaError" title="enum NMSettingCdmaError">NMSettingCdmaError</a>;
+enum                <a class="link" href="NMSettingCdma.html#NMSettingCdmaError">NMSettingCdmaError</a>;
 #define             <a class="link" href="NMSettingCdma.html#NM-TYPE-SETTING-CDMA-ERROR:CAPS" title="NM_TYPE_SETTING_CDMA_ERROR">NM_TYPE_SETTING_CDMA_ERROR</a>
 #define             <a class="link" href="NMSettingCdma.html#NM-SETTING-CDMA-ERROR:CAPS" title="NM_SETTING_CDMA_ERROR">NM_SETTING_CDMA_ERROR</a>
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              <a class="link" href="NMSettingCdma.html#nm-setting-cdma-error-quark" title="nm_setting_cdma_error_quark ()">nm_setting_cdma_error_quark</a>         (<em class="parameter"><code><span class="type">void</span></code></em>);
 #define             <a class="link" href="NMSettingCdma.html#NM-SETTING-CDMA-NUMBER:CAPS" title="NM_SETTING_CDMA_NUMBER">NM_SETTING_CDMA_NUMBER</a>
 #define             <a class="link" href="NMSettingCdma.html#NM-SETTING-CDMA-USERNAME:CAPS" title="NM_SETTING_CDMA_USERNAME">NM_SETTING_CDMA_USERNAME</a>
 #define             <a class="link" href="NMSettingCdma.html#NM-SETTING-CDMA-PASSWORD:CAPS" title="NM_SETTING_CDMA_PASSWORD">NM_SETTING_CDMA_PASSWORD</a>
+#define             <a class="link" href="NMSettingCdma.html#NM-SETTING-CDMA-PASSWORD-FLAGS:CAPS" title="NM_SETTING_CDMA_PASSWORD_FLAGS">NM_SETTING_CDMA_PASSWORD_FLAGS</a>
                     <a class="link" href="NMSettingCdma.html#NMSettingCdma-struct" title="NMSettingCdma">NMSettingCdma</a>;
                     <a class="link" href="NMSettingCdma.html#NMSettingCdmaClass" title="NMSettingCdmaClass">NMSettingCdmaClass</a>;
 <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               <a class="link" href="NMSettingCdma.html#nm-setting-cdma-get-type" title="nm_setting_cdma_get_type ()">nm_setting_cdma_get_type</a>            (<em class="parameter"><code><span class="type">void</span></code></em>);
@@ -59,25 +60,32 @@ enum                <a class="link" href="NMSettingCdma.html#NMSettingCdmaError"
 const <span class="returnvalue">char</span> *        <a class="link" href="NMSettingCdma.html#nm-setting-cdma-get-number" title="nm_setting_cdma_get_number ()">nm_setting_cdma_get_number</a>          (<em class="parameter"><code><a class="link" href="NMSettingCdma.html" title="NMSettingCdma"><span class="type">NMSettingCdma</span></a> *setting</code></em>);
 const <span class="returnvalue">char</span> *        <a class="link" href="NMSettingCdma.html#nm-setting-cdma-get-username" title="nm_setting_cdma_get_username ()">nm_setting_cdma_get_username</a>        (<em class="parameter"><code><a class="link" href="NMSettingCdma.html" title="NMSettingCdma"><span class="type">NMSettingCdma</span></a> *setting</code></em>);
 const <span class="returnvalue">char</span> *        <a class="link" href="NMSettingCdma.html#nm-setting-cdma-get-password" title="nm_setting_cdma_get_password ()">nm_setting_cdma_get_password</a>        (<em class="parameter"><code><a class="link" href="NMSettingCdma.html" title="NMSettingCdma"><span class="type">NMSettingCdma</span></a> *setting</code></em>);
+<a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="returnvalue">NMSettingSecretFlags</span></a>  <a class="link" href="NMSettingCdma.html#nm-setting-cdma-get-password-flags" title="nm_setting_cdma_get_password_flags ()">nm_setting_cdma_get_password_flags</a>
+                                                        (<em class="parameter"><code><a class="link" href="NMSettingCdma.html" title="NMSettingCdma"><span class="type">NMSettingCdma</span></a> *setting</code></em>);
 </pre>
 </div>
-<div class="refsect1" title="Object Hierarchy">
+<div class="refsect1">
 <a name="NMSettingCdma.object-hierarchy"></a><h2>Object Hierarchy</h2>
 <pre class="synopsis">
+  GEnum
+   +----NMSettingCdmaError
+</pre>
+<pre class="synopsis">
   <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>
    +----<a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
          +----NMSettingCdma
 </pre>
 </div>
-<div class="refsect1" title="Properties">
+<div class="refsect1">
 <a name="NMSettingCdma.properties"></a><h2>Properties</h2>
 <pre class="synopsis">
   "<a class="link" href="NMSettingCdma.html#NMSettingCdma--number" title='The "number" property'>number</a>"                   <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write
   "<a class="link" href="NMSettingCdma.html#NMSettingCdma--password" title='The "password" property'>password</a>"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write
+  "<a class="link" href="NMSettingCdma.html#NMSettingCdma--password-flags" title='The "password-flags" property'>password-flags</a>"           <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write
   "<a class="link" href="NMSettingCdma.html#NMSettingCdma--username" title='The "username" property'>username</a>"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write
 </pre>
 </div>
-<div class="refsect1" title="Description">
+<div class="refsect1">
 <a name="NMSettingCdma.description"></a><h2>Description</h2>
 <p>
 The <a class="link" href="NMSettingCdma.html" title="NMSettingCdma"><span class="type">NMSettingCdma</span></a> object is a <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> subclass that describes
@@ -85,9 +93,9 @@ properties that allow connections to IS-95-based mobile broadband
 networks, including those using CDMA2000/EVDO technology.
 </p>
 </div>
-<div class="refsect1" title="Details">
+<div class="refsect1">
 <a name="NMSettingCdma.details"></a><h2>Details</h2>
-<div class="refsect2" title="NM_SETTING_CDMA_SETTING_NAME">
+<div class="refsect2">
 <a name="NM-SETTING-CDMA-SETTING-NAME:CAPS"></a><h3>NM_SETTING_CDMA_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_CDMA_SETTING_NAME "cdma"
 </pre>
@@ -95,7 +103,7 @@ networks, including those using CDMA2000/EVDO technology.
 </p>
 </div>
 <hr>
-<div class="refsect2" title="enum NMSettingCdmaError">
+<div class="refsect2">
 <a name="NMSettingCdmaError"></a><h3>enum NMSettingCdmaError</h3>
 <pre class="programlisting">typedef enum
 {
@@ -109,7 +117,7 @@ networks, including those using CDMA2000/EVDO technology.
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_TYPE_SETTING_CDMA_ERROR">
+<div class="refsect2">
 <a name="NM-TYPE-SETTING-CDMA-ERROR:CAPS"></a><h3>NM_TYPE_SETTING_CDMA_ERROR</h3>
 <pre class="programlisting">#define NM_TYPE_SETTING_CDMA_ERROR (nm_setting_cdma_error_get_type ()) 
 </pre>
@@ -117,7 +125,7 @@ networks, including those using CDMA2000/EVDO technology.
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_CDMA_ERROR">
+<div class="refsect2">
 <a name="NM-SETTING-CDMA-ERROR:CAPS"></a><h3>NM_SETTING_CDMA_ERROR</h3>
 <pre class="programlisting">#define NM_SETTING_CDMA_ERROR nm_setting_cdma_error_quark ()
 </pre>
@@ -125,7 +133,7 @@ networks, including those using CDMA2000/EVDO technology.
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_cdma_error_quark ()">
+<div class="refsect2">
 <a name="nm-setting-cdma-error-quark"></a><h3>nm_setting_cdma_error_quark ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              nm_setting_cdma_error_quark         (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
@@ -135,44 +143,51 @@ Registers an error quark for <a class="link" href="NMSettingCdma.html" title="NM
 <col align="left" valign="top">
 <tbody><tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the error quark used for <a class="link" href="NMSettingCdma.html" title="NMSettingCdma"><span class="type">NMSettingCdma</span></a> errors.
-</td>
+<td>the error quark used for <a class="link" href="NMSettingCdma.html" title="NMSettingCdma"><span class="type">NMSettingCdma</span></a> errors.</td>
 </tr></tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_CDMA_NUMBER">
+<div class="refsect2">
 <a name="NM-SETTING-CDMA-NUMBER:CAPS"></a><h3>NM_SETTING_CDMA_NUMBER</h3>
-<pre class="programlisting">#define NM_SETTING_CDMA_NUMBER       "number"
+<pre class="programlisting">#define NM_SETTING_CDMA_NUMBER         "number"
 </pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_CDMA_USERNAME">
+<div class="refsect2">
 <a name="NM-SETTING-CDMA-USERNAME:CAPS"></a><h3>NM_SETTING_CDMA_USERNAME</h3>
-<pre class="programlisting">#define NM_SETTING_CDMA_USERNAME     "username"
+<pre class="programlisting">#define NM_SETTING_CDMA_USERNAME       "username"
 </pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_CDMA_PASSWORD">
+<div class="refsect2">
 <a name="NM-SETTING-CDMA-PASSWORD:CAPS"></a><h3>NM_SETTING_CDMA_PASSWORD</h3>
-<pre class="programlisting">#define NM_SETTING_CDMA_PASSWORD     "password"
+<pre class="programlisting">#define NM_SETTING_CDMA_PASSWORD       "password"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-SETTING-CDMA-PASSWORD-FLAGS:CAPS"></a><h3>NM_SETTING_CDMA_PASSWORD_FLAGS</h3>
+<pre class="programlisting">#define NM_SETTING_CDMA_PASSWORD_FLAGS "password-flags"
 </pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMSettingCdma">
+<div class="refsect2">
 <a name="NMSettingCdma-struct"></a><h3>NMSettingCdma</h3>
 <pre class="programlisting">typedef struct _NMSettingCdma NMSettingCdma;</pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMSettingCdmaClass">
+<div class="refsect2">
 <a name="NMSettingCdmaClass"></a><h3>NMSettingCdmaClass</h3>
 <pre class="programlisting">typedef struct {
 	NMSettingClass parent;
@@ -188,22 +203,14 @@ Registers an error quark for <a class="link" href="NMSettingCdma.html" title="NM
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_cdma_get_type ()">
+<div class="refsect2">
 <a name="nm-setting-cdma-get-type"></a><h3>nm_setting_cdma_get_type ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               nm_setting_cdma_get_type            (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_cdma_new ()">
+<div class="refsect2">
 <a name="nm-setting-cdma-new"></a><h3>nm_setting_cdma_new ()</h3>
 <pre class="programlisting"><a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *         nm_setting_cdma_new                 (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
@@ -213,13 +220,12 @@ Creates a new <a class="link" href="NMSettingCdma.html" title="NMSettingCdma"><s
 <col align="left" valign="top">
 <tbody><tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the new empty <a class="link" href="NMSettingCdma.html" title="NMSettingCdma"><span class="type">NMSettingCdma</span></a> object
-</td>
+<td>the new empty <a class="link" href="NMSettingCdma.html" title="NMSettingCdma"><span class="type">NMSettingCdma</span></a> object</td>
 </tr></tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_cdma_get_number ()">
+<div class="refsect2">
 <a name="nm-setting-cdma-get-number"></a><h3>nm_setting_cdma_get_number ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_cdma_get_number          (<em class="parameter"><code><a class="link" href="NMSettingCdma.html" title="NMSettingCdma"><span class="type">NMSettingCdma</span></a> *setting</code></em>);</pre>
 <div class="variablelist"><table border="0">
@@ -232,14 +238,13 @@ Creates a new <a class="link" href="NMSettingCdma.html" title="NMSettingCdma"><s
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the <a class="link" href="NMSettingCdma.html#NMSettingCdma--number" title='The "number" property'><span class="type">"number"</span></a> property of the setting
-</td>
+<td>the <a class="link" href="NMSettingCdma.html#NMSettingCdma--number" title='The "number" property'><span class="type">"number"</span></a> property of the setting</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_cdma_get_username ()">
+<div class="refsect2">
 <a name="nm-setting-cdma-get-username"></a><h3>nm_setting_cdma_get_username ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_cdma_get_username        (<em class="parameter"><code><a class="link" href="NMSettingCdma.html" title="NMSettingCdma"><span class="type">NMSettingCdma</span></a> *setting</code></em>);</pre>
 <div class="variablelist"><table border="0">
@@ -252,14 +257,13 @@ Creates a new <a class="link" href="NMSettingCdma.html" title="NMSettingCdma"><s
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the <a class="link" href="NMSettingCdma.html#NMSettingCdma--username" title='The "username" property'><span class="type">"username"</span></a> property of the setting
-</td>
+<td>the <a class="link" href="NMSettingCdma.html#NMSettingCdma--username" title='The "username" property'><span class="type">"username"</span></a> property of the setting</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_cdma_get_password ()">
+<div class="refsect2">
 <a name="nm-setting-cdma-get-password"></a><h3>nm_setting_cdma_get_password ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_cdma_get_password        (<em class="parameter"><code><a class="link" href="NMSettingCdma.html" title="NMSettingCdma"><span class="type">NMSettingCdma</span></a> *setting</code></em>);</pre>
 <div class="variablelist"><table border="0">
@@ -272,16 +276,36 @@ Creates a new <a class="link" href="NMSettingCdma.html" title="NMSettingCdma"><s
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the <a class="link" href="NMSettingCdma.html#NMSettingCdma--password" title='The "password" property'><span class="type">"password"</span></a> property of the setting
+<td>the <a class="link" href="NMSettingCdma.html#NMSettingCdma--password" title='The "password" property'><span class="type">"password"</span></a> property of the setting</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-cdma-get-password-flags"></a><h3>nm_setting_cdma_get_password_flags ()</h3>
+<pre class="programlisting"><a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="returnvalue">NMSettingSecretFlags</span></a>  nm_setting_cdma_get_password_flags
+                                                        (<em class="parameter"><code><a class="link" href="NMSettingCdma.html" title="NMSettingCdma"><span class="type">NMSettingCdma</span></a> *setting</code></em>);</pre>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
+<td>the <a class="link" href="NMSettingCdma.html" title="NMSettingCdma"><span class="type">NMSettingCdma</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> pertaining to the <a class="link" href="NMSettingCdma.html#NMSettingCdma--password" title='The "password" property'><span class="type">"password"</span></a>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 </div>
-<div class="refsect1" title="Property Details">
+<div class="refsect1">
 <a name="NMSettingCdma.property-details"></a><h2>Property Details</h2>
-<div class="refsect2" title='The "number" property'>
+<div class="refsect2">
 <a name="NMSettingCdma--number"></a><h3>The <code class="literal">"number"</code> property</h3>
 <pre class="programlisting">  "number"                   <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -292,7 +316,7 @@ is used when required.
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "password" property'>
+<div class="refsect2">
 <a name="NMSettingCdma--password"></a><h3>The <code class="literal">"password"</code> property</h3>
 <pre class="programlisting">  "password"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -303,7 +327,17 @@ password is required, it is specified here.
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "username" property'>
+<div class="refsect2">
+<a name="NMSettingCdma--password-flags"></a><h3>The <code class="literal">"password-flags"</code> property</h3>
+<pre class="programlisting">  "password-flags"           <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write</pre>
+<p>
+Flags indicating how to handle <a class="link" href="NMSettingCdma.html#NMSettingCdma--password" title='The "password" property'><span class="type">"password"</span></a>:.
+</p>
+<p>Allowed values: &lt;= 7</p>
+<p>Default value: 0</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="NMSettingCdma--username"></a><h3>The <code class="literal">"username"</code> property</h3>
 <pre class="programlisting">  "username"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -317,6 +351,6 @@ username is required, it is specified here.
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.15</div>
+          Generated by GTK-Doc V1.17</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingConnection.html b/docs/libnm-util/html/NMSettingConnection.html
index f70fdb95a..27c30ebde 100644
--- a/docs/libnm-util/html/NMSettingConnection.html
+++ b/docs/libnm-util/html/NMSettingConnection.html
@@ -3,12 +3,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>NMSettingConnection</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="libnm-util Reference Manual">
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSetting.html" title="NMSetting">
 <link rel="next" href="NMSettingWired.html" title="NMSettingWired">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,7 +30,7 @@
                   <a href="#NMSettingConnection.properties" class="shortcut">Properties</a>
 </td></tr>
 </table>
-<div class="refentry" title="NMSettingConnection">
+<div class="refentry">
 <a name="NMSettingConnection"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
@@ -39,13 +39,13 @@
 </td>
 <td valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv" title="Synopsis">
+<div class="refsynopsisdiv">
 <a name="NMSettingConnection.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">
+<a name="NMSettingConnectionError"></a><pre class="synopsis">
 #include &lt;nm-setting-connection.h&gt;
 
 #define             <a class="link" href="NMSettingConnection.html#NM-SETTING-CONNECTION-SETTING-NAME:CAPS" title="NM_SETTING_CONNECTION_SETTING_NAME">NM_SETTING_CONNECTION_SETTING_NAME</a>
-enum                <a class="link" href="NMSettingConnection.html#NMSettingConnectionError" title="enum NMSettingConnectionError">NMSettingConnectionError</a>;
+enum                <a class="link" href="NMSettingConnection.html#NMSettingConnectionError">NMSettingConnectionError</a>;
 #define             <a class="link" href="NMSettingConnection.html#NM-TYPE-SETTING-CONNECTION-ERROR:CAPS" title="NM_TYPE_SETTING_CONNECTION_ERROR">NM_TYPE_SETTING_CONNECTION_ERROR</a>
 #define             <a class="link" href="NMSettingConnection.html#NM-SETTING-CONNECTION-ERROR:CAPS" title="NM_SETTING_CONNECTION_ERROR">NM_SETTING_CONNECTION_ERROR</a>
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              <a class="link" href="NMSettingConnection.html#nm-setting-connection-error-quark" title="nm_setting_connection_error_quark ()">nm_setting_connection_error_quark</a>   (<em class="parameter"><code><span class="type">void</span></code></em>);
@@ -55,6 +55,7 @@ enum                <a class="link" href="NMSettingConnection.html#NMSettingConn
 #define             <a class="link" href="NMSettingConnection.html#NM-SETTING-CONNECTION-AUTOCONNECT:CAPS" title="NM_SETTING_CONNECTION_AUTOCONNECT">NM_SETTING_CONNECTION_AUTOCONNECT</a>
 #define             <a class="link" href="NMSettingConnection.html#NM-SETTING-CONNECTION-TIMESTAMP:CAPS" title="NM_SETTING_CONNECTION_TIMESTAMP">NM_SETTING_CONNECTION_TIMESTAMP</a>
 #define             <a class="link" href="NMSettingConnection.html#NM-SETTING-CONNECTION-READ-ONLY:CAPS" title="NM_SETTING_CONNECTION_READ_ONLY">NM_SETTING_CONNECTION_READ_ONLY</a>
+#define             <a class="link" href="NMSettingConnection.html#NM-SETTING-CONNECTION-PERMISSIONS:CAPS" title="NM_SETTING_CONNECTION_PERMISSIONS">NM_SETTING_CONNECTION_PERMISSIONS</a>
                     <a class="link" href="NMSettingConnection.html#NMSettingConnection-struct" title="NMSettingConnection">NMSettingConnection</a>;
                     <a class="link" href="NMSettingConnection.html#NMSettingConnectionClass" title="NMSettingConnectionClass">NMSettingConnectionClass</a>;
 <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               <a class="link" href="NMSettingConnection.html#nm-setting-connection-get-type" title="nm_setting_connection_get_type ()">nm_setting_connection_get_type</a>      (<em class="parameter"><code><span class="type">void</span></code></em>);
@@ -67,39 +68,63 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
                                                         (<em class="parameter"><code><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> *setting</code></em>);
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint64"><span class="returnvalue">guint64</span></a>             <a class="link" href="NMSettingConnection.html#nm-setting-connection-get-timestamp" title="nm_setting_connection_get_timestamp ()">nm_setting_connection_get_timestamp</a> (<em class="parameter"><code><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> *setting</code></em>);
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMSettingConnection.html#nm-setting-connection-get-read-only" title="nm_setting_connection_get_read_only ()">nm_setting_connection_get_read_only</a> (<em class="parameter"><code><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> *setting</code></em>);
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             <a class="link" href="NMSettingConnection.html#nm-setting-connection-get-num-permissions" title="nm_setting_connection_get_num_permissions ()">nm_setting_connection_get_num_permissions</a>
+                                                        (<em class="parameter"><code><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> *setting</code></em>);
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMSettingConnection.html#nm-setting-connection-get-permission" title="nm_setting_connection_get_permission ()">nm_setting_connection_get_permission</a>
+                                                        (<em class="parameter"><code><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> *setting</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> idx</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> **out_ptype</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> **out_pitem</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> **out_detail</code></em>);
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMSettingConnection.html#nm-setting-connection-permissions-user-allowed" title="nm_setting_connection_permissions_user_allowed ()">nm_setting_connection_permissions_user_allowed</a>
+                                                        (<em class="parameter"><code><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> *setting</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *uname</code></em>);
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMSettingConnection.html#nm-setting-connection-add-permission" title="nm_setting_connection_add_permission ()">nm_setting_connection_add_permission</a>
+                                                        (<em class="parameter"><code><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> *setting</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *ptype</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *pitem</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *detail</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="NMSettingConnection.html#nm-setting-connection-remove-permission" title="nm_setting_connection_remove_permission ()">nm_setting_connection_remove_permission</a>
+                                                        (<em class="parameter"><code><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> *setting</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> idx</code></em>);
 </pre>
 </div>
-<div class="refsect1" title="Object Hierarchy">
+<div class="refsect1">
 <a name="NMSettingConnection.object-hierarchy"></a><h2>Object Hierarchy</h2>
 <pre class="synopsis">
+  GEnum
+   +----NMSettingConnectionError
+</pre>
+<pre class="synopsis">
   <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>
    +----<a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
          +----NMSettingConnection
 </pre>
 </div>
-<div class="refsect1" title="Properties">
+<div class="refsect1">
 <a name="NMSettingConnection.properties"></a><h2>Properties</h2>
 <pre class="synopsis">
   "<a class="link" href="NMSettingConnection.html#NMSettingConnection--autoconnect" title='The "autoconnect" property'>autoconnect</a>"              <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write / Construct
   "<a class="link" href="NMSettingConnection.html#NMSettingConnection--id" title='The "id" property'>id</a>"                       <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write
+  "<a class="link" href="NMSettingConnection.html#NMSettingConnection--permissions" title='The "permissions" property'>permissions</a>"              <span class="type">GSList_gchararray_</span>*   : Read / Write
   "<a class="link" href="NMSettingConnection.html#NMSettingConnection--read-only" title='The "read-only" property'>read-only</a>"                <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write / Construct
   "<a class="link" href="NMSettingConnection.html#NMSettingConnection--timestamp" title='The "timestamp" property'>timestamp</a>"                <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint64"><span class="type">guint64</span></a>               : Read / Write / Construct
   "<a class="link" href="NMSettingConnection.html#NMSettingConnection--type" title='The "type" property'>type</a>"                     <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write
   "<a class="link" href="NMSettingConnection.html#NMSettingConnection--uuid" title='The "uuid" property'>uuid</a>"                     <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write
 </pre>
 </div>
-<div class="refsect1" title="Description">
+<div class="refsect1">
 <a name="NMSettingConnection.description"></a><h2>Description</h2>
 <p>
 The <a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> object is a <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> subclass that describes
-properties that apply to all <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> objects, regardless of what type
-of network connection they describe.  Each <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> object must contain
+properties that apply to all <span class="type">NMConnection</span> objects, regardless of what type
+of network connection they describe.  Each <span class="type">NMConnection</span> object must contain
 a <a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> setting.
 </p>
 </div>
-<div class="refsect1" title="Details">
+<div class="refsect1">
 <a name="NMSettingConnection.details"></a><h2>Details</h2>
-<div class="refsect2" title="NM_SETTING_CONNECTION_SETTING_NAME">
+<div class="refsect2">
 <a name="NM-SETTING-CONNECTION-SETTING-NAME:CAPS"></a><h3>NM_SETTING_CONNECTION_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_CONNECTION_SETTING_NAME "connection"
 </pre>
@@ -107,7 +132,7 @@ a <a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><s
 </p>
 </div>
 <hr>
-<div class="refsect2" title="enum NMSettingConnectionError">
+<div class="refsect2">
 <a name="NMSettingConnectionError"></a><h3>enum NMSettingConnectionError</h3>
 <pre class="programlisting">typedef enum
 {
@@ -145,14 +170,14 @@ Describes errors that may result from operations involving a
 <td><p><a name="NM-SETTING-CONNECTION-ERROR-TYPE-SETTING-NOT-FOUND:CAPS"></a><span class="term"><code class="literal">NM_SETTING_CONNECTION_ERROR_TYPE_SETTING_NOT_FOUND</code></span></p></td>
 <td>the <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> object
   referenced by the setting name contained in the
-  <a class="link" href="NMSettingConnection.html#NMSettingConnection--type" title='The "type" property'><span class="type">"type"</span></a> property was not present in the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>
+  <a class="link" href="NMSettingConnection.html#NMSettingConnection--type" title='The "type" property'><span class="type">"type"</span></a> property was not present in the <span class="type">NMConnection</span>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="NM_TYPE_SETTING_CONNECTION_ERROR">
+<div class="refsect2">
 <a name="NM-TYPE-SETTING-CONNECTION-ERROR:CAPS"></a><h3>NM_TYPE_SETTING_CONNECTION_ERROR</h3>
 <pre class="programlisting">#define NM_TYPE_SETTING_CONNECTION_ERROR (nm_setting_connection_error_get_type ()) 
 </pre>
@@ -160,7 +185,7 @@ Describes errors that may result from operations involving a
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_CONNECTION_ERROR">
+<div class="refsect2">
 <a name="NM-SETTING-CONNECTION-ERROR:CAPS"></a><h3>NM_SETTING_CONNECTION_ERROR</h3>
 <pre class="programlisting">#define NM_SETTING_CONNECTION_ERROR nm_setting_connection_error_quark ()
 </pre>
@@ -168,7 +193,7 @@ Describes errors that may result from operations involving a
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_connection_error_quark ()">
+<div class="refsect2">
 <a name="nm-setting-connection-error-quark"></a><h3>nm_setting_connection_error_quark ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              nm_setting_connection_error_quark   (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
@@ -178,13 +203,12 @@ Registers an error quark for <a class="link" href="NMSettingConnection.html" tit
 <col align="left" valign="top">
 <tbody><tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the error quark used for <a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> errors.
-</td>
+<td>the error quark used for <a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> errors.</td>
 </tr></tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_CONNECTION_ID">
+<div class="refsect2">
 <a name="NM-SETTING-CONNECTION-ID:CAPS"></a><h3>NM_SETTING_CONNECTION_ID</h3>
 <pre class="programlisting">#define NM_SETTING_CONNECTION_ID          "id"
 </pre>
@@ -192,7 +216,7 @@ Registers an error quark for <a class="link" href="NMSettingConnection.html" tit
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_CONNECTION_UUID">
+<div class="refsect2">
 <a name="NM-SETTING-CONNECTION-UUID:CAPS"></a><h3>NM_SETTING_CONNECTION_UUID</h3>
 <pre class="programlisting">#define NM_SETTING_CONNECTION_UUID        "uuid"
 </pre>
@@ -200,7 +224,7 @@ Registers an error quark for <a class="link" href="NMSettingConnection.html" tit
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_CONNECTION_TYPE">
+<div class="refsect2">
 <a name="NM-SETTING-CONNECTION-TYPE:CAPS"></a><h3>NM_SETTING_CONNECTION_TYPE</h3>
 <pre class="programlisting">#define NM_SETTING_CONNECTION_TYPE        "type"
 </pre>
@@ -208,7 +232,7 @@ Registers an error quark for <a class="link" href="NMSettingConnection.html" tit
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_CONNECTION_AUTOCONNECT">
+<div class="refsect2">
 <a name="NM-SETTING-CONNECTION-AUTOCONNECT:CAPS"></a><h3>NM_SETTING_CONNECTION_AUTOCONNECT</h3>
 <pre class="programlisting">#define NM_SETTING_CONNECTION_AUTOCONNECT "autoconnect"
 </pre>
@@ -216,7 +240,7 @@ Registers an error quark for <a class="link" href="NMSettingConnection.html" tit
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_CONNECTION_TIMESTAMP">
+<div class="refsect2">
 <a name="NM-SETTING-CONNECTION-TIMESTAMP:CAPS"></a><h3>NM_SETTING_CONNECTION_TIMESTAMP</h3>
 <pre class="programlisting">#define NM_SETTING_CONNECTION_TIMESTAMP   "timestamp"
 </pre>
@@ -224,7 +248,7 @@ Registers an error quark for <a class="link" href="NMSettingConnection.html" tit
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_CONNECTION_READ_ONLY">
+<div class="refsect2">
 <a name="NM-SETTING-CONNECTION-READ-ONLY:CAPS"></a><h3>NM_SETTING_CONNECTION_READ_ONLY</h3>
 <pre class="programlisting">#define NM_SETTING_CONNECTION_READ_ONLY   "read-only"
 </pre>
@@ -232,7 +256,15 @@ Registers an error quark for <a class="link" href="NMSettingConnection.html" tit
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMSettingConnection">
+<div class="refsect2">
+<a name="NM-SETTING-CONNECTION-PERMISSIONS:CAPS"></a><h3>NM_SETTING_CONNECTION_PERMISSIONS</h3>
+<pre class="programlisting">#define NM_SETTING_CONNECTION_PERMISSIONS "permissions"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="NMSettingConnection-struct"></a><h3>NMSettingConnection</h3>
 <pre class="programlisting">typedef struct _NMSettingConnection NMSettingConnection;</pre>
 <p>
@@ -241,7 +273,7 @@ It should only be accessed through the functions described below.
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMSettingConnectionClass">
+<div class="refsect2">
 <a name="NMSettingConnectionClass"></a><h3>NMSettingConnectionClass</h3>
 <pre class="programlisting">typedef struct {
 	NMSettingClass parent;
@@ -257,22 +289,14 @@ It should only be accessed through the functions described below.
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_connection_get_type ()">
+<div class="refsect2">
 <a name="nm-setting-connection-get-type"></a><h3>nm_setting_connection_get_type ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               nm_setting_connection_get_type      (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_connection_new ()">
+<div class="refsect2">
 <a name="nm-setting-connection-new"></a><h3>nm_setting_connection_new ()</h3>
 <pre class="programlisting"><a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *         nm_setting_connection_new           (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
@@ -282,13 +306,12 @@ Creates a new <a class="link" href="NMSettingConnection.html" title="NMSettingCo
 <col align="left" valign="top">
 <tbody><tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the new empty <a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> object
-</td>
+<td>the new empty <a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> object</td>
 </tr></tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_connection_get_id ()">
+<div class="refsect2">
 <a name="nm-setting-connection-get-id"></a><h3>nm_setting_connection_get_id ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_connection_get_id        (<em class="parameter"><code><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> *setting</code></em>);</pre>
 <p>
@@ -304,14 +327,13 @@ Returns the <a class="link" href="NMSettingConnection.html#NMSettingConnection--
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the connection ID
-</td>
+<td>the connection ID</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_connection_get_uuid ()">
+<div class="refsect2">
 <a name="nm-setting-connection-get-uuid"></a><h3>nm_setting_connection_get_uuid ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_connection_get_uuid      (<em class="parameter"><code><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> *setting</code></em>);</pre>
 <p>
@@ -327,14 +349,13 @@ Returns the <a class="link" href="NMSettingConnection.html#NMSettingConnection--
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the connection UUID
-</td>
+<td>the connection UUID</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_connection_get_connection_type ()">
+<div class="refsect2">
 <a name="nm-setting-connection-get-connection-type"></a><h3>nm_setting_connection_get_connection_type ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_connection_get_connection_type
                                                         (<em class="parameter"><code><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> *setting</code></em>);</pre>
@@ -351,14 +372,13 @@ Returns the <a class="link" href="NMSettingConnection.html#NMSettingConnection--
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the connection type
-</td>
+<td>the connection type</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_connection_get_autoconnect ()">
+<div class="refsect2">
 <a name="nm-setting-connection-get-autoconnect"></a><h3>nm_setting_connection_get_autoconnect ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_connection_get_autoconnect
                                                         (<em class="parameter"><code><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> *setting</code></em>);</pre>
@@ -375,14 +395,13 @@ Returns the <a class="link" href="NMSettingConnection.html#NMSettingConnection--
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the connection's autoconnect behavior
-</td>
+<td>the connection's autoconnect behavior</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_connection_get_timestamp ()">
+<div class="refsect2">
 <a name="nm-setting-connection-get-timestamp"></a><h3>nm_setting_connection_get_timestamp ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint64"><span class="returnvalue">guint64</span></a>             nm_setting_connection_get_timestamp (<em class="parameter"><code><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> *setting</code></em>);</pre>
 <p>
@@ -398,14 +417,13 @@ Returns the <a class="link" href="NMSettingConnection.html#NMSettingConnection--
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the connection's timestamp
-</td>
+<td>the connection's timestamp</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_connection_get_read_only ()">
+<div class="refsect2">
 <a name="nm-setting-connection-get-read-only"></a><h3>nm_setting_connection_get_read_only ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_connection_get_read_only (<em class="parameter"><code><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> *setting</code></em>);</pre>
 <p>
@@ -421,16 +439,184 @@ Returns the <a class="link" href="NMSettingConnection.html#NMSettingConnection--
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the connection is read-only, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if it is not
+<td>
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the connection is read-only, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if it is not</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-connection-get-num-permissions"></a><h3>nm_setting_connection_get_num_permissions ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_setting_connection_get_num_permissions
+                                                        (<em class="parameter"><code><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> *setting</code></em>);</pre>
+<p>
+Returns the number of entires in the <a class="link" href="NMSettingConnection.html#NMSettingConnection--permissions" title='The "permissions" property'><span class="type">"permissions"</span></a>
+property of this setting.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
+<td>the <a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a>
 </td>
 </tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>the number of permissions entires</td>
+</tr>
 </tbody>
 </table></div>
 </div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-connection-get-permission"></a><h3>nm_setting_connection_get_permission ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_connection_get_permission
+                                                        (<em class="parameter"><code><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> *setting</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> idx</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> **out_ptype</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> **out_pitem</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> **out_detail</code></em>);</pre>
+<p>
+Retrieve one of the entries of the <a class="link" href="NMSettingConnection.html#NMSettingConnection--permissions" title='The "permissions" property'><span class="type">"permissions"</span></a> property
+of this setting.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
+<td>the <a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>idx</code></em> :</span></p></td>
+<td>the zero-based index of the permissions entry</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>out_ptype</code></em> :</span></p></td>
+<td>on return, the permission type (at this time, always "user")</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>out_pitem</code></em> :</span></p></td>
+<td>on return, the permission item (formatted accoring to <em class="parameter"><code>ptype</code></em>, see
+<a class="link" href="NMSettingConnection.html#NMSettingConnection--permissions" title='The "permissions" property'><span class="type">"permissions"</span></a> for more detail</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>out_detail</code></em> :</span></p></td>
+<td>on return, the permission detail (at this time, always NULL)</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if a permission was returned, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if <em class="parameter"><code>idx</code></em> was invalid</td>
+</tr>
+</tbody>
+</table></div>
 </div>
-<div class="refsect1" title="Property Details">
+<hr>
+<div class="refsect2">
+<a name="nm-setting-connection-permissions-user-allowed"></a><h3>nm_setting_connection_permissions_user_allowed ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_connection_permissions_user_allowed
+                                                        (<em class="parameter"><code><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> *setting</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *uname</code></em>);</pre>
+<p>
+Checks whether the given username is allowed to view/access this connection.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
+<td>the <a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>uname</code></em> :</span></p></td>
+<td>the user name to check permissions for</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the requested user is allowed to view this connection,
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if the given user is not allowed to view this connection</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-connection-add-permission"></a><h3>nm_setting_connection_add_permission ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_connection_add_permission
+                                                        (<em class="parameter"><code><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> *setting</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *ptype</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *pitem</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *detail</code></em>);</pre>
+<p>
+Adds a permission to the connection's permission list.  At this time, only
+the "user" permission type is supported, and <em class="parameter"><code>pitem</code></em> must be a username. See
+<a class="link" href="NMSettingConnection.html#NMSettingConnection--permissions" title='The "permissions" property'><span class="type">"permissions"</span></a>: for more details.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
+<td>the <a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>ptype</code></em> :</span></p></td>
+<td>the permission type; at this time only "user" is supported</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>pitem</code></em> :</span></p></td>
+<td>the permission item formatted as required for <em class="parameter"><code>ptype</code></em>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>detail</code></em> :</span></p></td>
+<td>unused at this time; must be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. <span class="annotation">[<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>TRUE if the permission was unique and was successfully added to the
+list, FALSE if <em class="parameter"><code>ptype</code></em> or <em class="parameter"><code>pitem</code></em> was invalid or it the permission was already
+present in the list</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-connection-remove-permission"></a><h3>nm_setting_connection_remove_permission ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                nm_setting_connection_remove_permission
+                                                        (<em class="parameter"><code><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> *setting</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> idx</code></em>);</pre>
+<p>
+Removes the permission at index <em class="parameter"><code>idx</code></em> from the connection.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
+<td>the <a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>idx</code></em> :</span></p></td>
+<td>the zero-based index of the permission to remove</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<div class="refsect1">
 <a name="NMSettingConnection.property-details"></a><h2>Property Details</h2>
-<div class="refsect2" title='The "autoconnect" property'>
+<div class="refsect2">
 <a name="NMSettingConnection--autoconnect"></a><h3>The <code class="literal">"autoconnect"</code> property</h3>
 <pre class="programlisting">  "autoconnect"              <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write / Construct</pre>
 <p>
@@ -442,7 +628,7 @@ intervention to activate the connection.  Defaults to <a href="http://library.gn
 <p>Default value: TRUE</p>
 </div>
 <hr>
-<div class="refsect2" title='The "id" property'>
+<div class="refsect2">
 <a name="NMSettingConnection--id"></a><h3>The <code class="literal">"id"</code> property</h3>
 <pre class="programlisting">  "id"                       <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -452,7 +638,29 @@ A human readable unique idenfier for the connection, like "Work WiFi" or
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "read-only" property'>
+<div class="refsect2">
+<a name="NMSettingConnection--permissions"></a><h3>The <code class="literal">"permissions"</code> property</h3>
+<pre class="programlisting">  "permissions"              <span class="type">GSList_gchararray_</span>*   : Read / Write</pre>
+<p>
+An array of strings defining what access a given user has to this
+connection.  If this is NULL or empty, all users are allowed to access
+this connection.  Otherwise a user is allowed to access this connection
+if and only if they are in this list. Each entry is of the form
+"[type]:[id]:[reserved]", for example:
+</p>
+<p>
+   user:dcbw:blah
+</p>
+<p>
+At this time only the 'user' [type] is allowed.  Any other values are
+ignored and reserved for future use.  [id] is the username that this
+permission refers to, which may not contain the ':' character. Any
+[reserved] information present must be ignored and is reserved for
+future use.  All of [type], [id], and [reserved] must be valid UTF-8.
+</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="NMSettingConnection--read-only"></a><h3>The <code class="literal">"read-only"</code> property</h3>
 <pre class="programlisting">  "read-only"                <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write / Construct</pre>
 <p>
@@ -463,7 +671,7 @@ if the connection is read-only and cannot be modified.
 <p>Default value: FALSE</p>
 </div>
 <hr>
-<div class="refsect2" title='The "timestamp" property'>
+<div class="refsect2">
 <a name="NMSettingConnection--timestamp"></a><h3>The <code class="literal">"timestamp"</code> property</h3>
 <pre class="programlisting">  "timestamp"                <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint64"><span class="type">guint64</span></a>               : Read / Write / Construct</pre>
 <p>
@@ -473,7 +681,7 @@ _successfully_ fully activated.
 <p>Default value: 0</p>
 </div>
 <hr>
-<div class="refsect2" title='The "type" property'>
+<div class="refsect2">
 <a name="NMSettingConnection--type"></a><h3>The <code class="literal">"type"</code> property</h3>
 <pre class="programlisting">  "type"                     <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -485,7 +693,7 @@ type's parameters.  For example, for WiFi devices, the name of the
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "uuid" property'>
+<div class="refsect2">
 <a name="NMSettingConnection--uuid"></a><h3>The <code class="literal">"uuid"</code> property</h3>
 <pre class="programlisting">  "uuid"                     <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -509,6 +717,6 @@ be generated by <a class="link" href="libnm-util-nm-utils.html#nm-utils-uuid-gen
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.15</div>
+          Generated by GTK-Doc V1.17</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingGsm.html b/docs/libnm-util/html/NMSettingGsm.html
index c3f8c318c..4a2d79257 100644
--- a/docs/libnm-util/html/NMSettingGsm.html
+++ b/docs/libnm-util/html/NMSettingGsm.html
@@ -3,12 +3,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>NMSettingGsm</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="libnm-util Reference Manual">
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingCdma.html" title="NMSettingCdma">
 <link rel="next" href="NMSettingOlpcMesh.html" title="NMSettingOlpcMesh">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,7 +30,7 @@
                   <a href="#NMSettingGsm.properties" class="shortcut">Properties</a>
 </td></tr>
 </table>
-<div class="refentry" title="NMSettingGsm">
+<div class="refentry">
 <a name="NMSettingGsm"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
@@ -39,29 +39,24 @@
 </td>
 <td valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv" title="Synopsis">
+<div class="refsynopsisdiv">
 <a name="NMSettingGsm.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">#define             <a class="link" href="NMSettingGsm.html#NM-SETTING-GSM-SETTING-NAME:CAPS" title="NM_SETTING_GSM_SETTING_NAME">NM_SETTING_GSM_SETTING_NAME</a>
-enum                <a class="link" href="NMSettingGsm.html#NMSettingGsmError" title="enum NMSettingGsmError">NMSettingGsmError</a>;
+<a name="NMSettingGsmError"></a><pre class="synopsis">#define             <a class="link" href="NMSettingGsm.html#NM-SETTING-GSM-SETTING-NAME:CAPS" title="NM_SETTING_GSM_SETTING_NAME">NM_SETTING_GSM_SETTING_NAME</a>
+enum                <a class="link" href="NMSettingGsm.html#NMSettingGsmError">NMSettingGsmError</a>;
 #define             <a class="link" href="NMSettingGsm.html#NM-TYPE-SETTING-GSM-ERROR:CAPS" title="NM_TYPE_SETTING_GSM_ERROR">NM_TYPE_SETTING_GSM_ERROR</a>
 #define             <a class="link" href="NMSettingGsm.html#NM-SETTING-GSM-ERROR:CAPS" title="NM_SETTING_GSM_ERROR">NM_SETTING_GSM_ERROR</a>
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              <a class="link" href="NMSettingGsm.html#nm-setting-gsm-error-quark" title="nm_setting_gsm_error_quark ()">nm_setting_gsm_error_quark</a>          (<em class="parameter"><code><span class="type">void</span></code></em>);
 #define             <a class="link" href="NMSettingGsm.html#NM-SETTING-GSM-NUMBER:CAPS" title="NM_SETTING_GSM_NUMBER">NM_SETTING_GSM_NUMBER</a>
 #define             <a class="link" href="NMSettingGsm.html#NM-SETTING-GSM-USERNAME:CAPS" title="NM_SETTING_GSM_USERNAME">NM_SETTING_GSM_USERNAME</a>
 #define             <a class="link" href="NMSettingGsm.html#NM-SETTING-GSM-PASSWORD:CAPS" title="NM_SETTING_GSM_PASSWORD">NM_SETTING_GSM_PASSWORD</a>
+#define             <a class="link" href="NMSettingGsm.html#NM-SETTING-GSM-PASSWORD-FLAGS:CAPS" title="NM_SETTING_GSM_PASSWORD_FLAGS">NM_SETTING_GSM_PASSWORD_FLAGS</a>
 #define             <a class="link" href="NMSettingGsm.html#NM-SETTING-GSM-APN:CAPS" title="NM_SETTING_GSM_APN">NM_SETTING_GSM_APN</a>
 #define             <a class="link" href="NMSettingGsm.html#NM-SETTING-GSM-NETWORK-ID:CAPS" title="NM_SETTING_GSM_NETWORK_ID">NM_SETTING_GSM_NETWORK_ID</a>
 #define             <a class="link" href="NMSettingGsm.html#NM-SETTING-GSM-NETWORK-TYPE:CAPS" title="NM_SETTING_GSM_NETWORK_TYPE">NM_SETTING_GSM_NETWORK_TYPE</a>
 #define             <a class="link" href="NMSettingGsm.html#NM-SETTING-GSM-ALLOWED-BANDS:CAPS" title="NM_SETTING_GSM_ALLOWED_BANDS">NM_SETTING_GSM_ALLOWED_BANDS</a>
 #define             <a class="link" href="NMSettingGsm.html#NM-SETTING-GSM-PIN:CAPS" title="NM_SETTING_GSM_PIN">NM_SETTING_GSM_PIN</a>
+#define             <a class="link" href="NMSettingGsm.html#NM-SETTING-GSM-PIN-FLAGS:CAPS" title="NM_SETTING_GSM_PIN_FLAGS">NM_SETTING_GSM_PIN_FLAGS</a>
 #define             <a class="link" href="NMSettingGsm.html#NM-SETTING-GSM-HOME-ONLY:CAPS" title="NM_SETTING_GSM_HOME_ONLY">NM_SETTING_GSM_HOME_ONLY</a>
-#define             <a class="link" href="NMSettingGsm.html#NM-SETTING-GSM-PUK:CAPS" title="NM_SETTING_GSM_PUK">NM_SETTING_GSM_PUK</a>
-#define             <a class="link" href="NMSettingGsm.html#NM-SETTING-GSM-BAND:CAPS" title="NM_SETTING_GSM_BAND">NM_SETTING_GSM_BAND</a>
-#define             <a class="link" href="NMSettingGsm.html#NM-GSM-NETWORK-ANY:CAPS" title="NM_GSM_NETWORK_ANY">NM_GSM_NETWORK_ANY</a>
-#define             <a class="link" href="NMSettingGsm.html#NM-GSM-NETWORK-UMTS-HSPA:CAPS" title="NM_GSM_NETWORK_UMTS_HSPA">NM_GSM_NETWORK_UMTS_HSPA</a>
-#define             <a class="link" href="NMSettingGsm.html#NM-GSM-NETWORK-GPRS-EDGE:CAPS" title="NM_GSM_NETWORK_GPRS_EDGE">NM_GSM_NETWORK_GPRS_EDGE</a>
-#define             <a class="link" href="NMSettingGsm.html#NM-GSM-NETWORK-PREFER-UMTS-HSPA:CAPS" title="NM_GSM_NETWORK_PREFER_UMTS_HSPA">NM_GSM_NETWORK_PREFER_UMTS_HSPA</a>
-#define             <a class="link" href="NMSettingGsm.html#NM-GSM-NETWORK-PREFER-GPRS-EDGE:CAPS" title="NM_GSM_NETWORK_PREFER_GPRS_EDGE">NM_GSM_NETWORK_PREFER_GPRS_EDGE</a>
 enum                <a class="link" href="NMSettingGsm.html#NMSettingGsmNetworkType" title="enum NMSettingGsmNetworkType">NMSettingGsmNetworkType</a>;
 enum                <a class="link" href="NMSettingGsm.html#NMSettingGsmNetworkBand" title="enum NMSettingGsmNetworkBand">NMSettingGsmNetworkBand</a>;
                     <a class="link" href="NMSettingGsm.html#NMSettingGsm-struct" title="NMSettingGsm">NMSettingGsm</a>;
@@ -77,42 +72,46 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             <a class="link" href="NMSettingGsm.html#nm-setting-gsm-get-allowed-bands" title="nm_setting_gsm_get_allowed_bands ()">nm_setting_gsm_get_allowed_bands</a>    (<em class="parameter"><code><a class="link" href="NMSettingGsm.html" title="NMSettingGsm"><span class="type">NMSettingGsm</span></a> *setting</code></em>);
 const <span class="returnvalue">char</span> *        <a class="link" href="NMSettingGsm.html#nm-setting-gsm-get-pin" title="nm_setting_gsm_get_pin ()">nm_setting_gsm_get_pin</a>              (<em class="parameter"><code><a class="link" href="NMSettingGsm.html" title="NMSettingGsm"><span class="type">NMSettingGsm</span></a> *setting</code></em>);
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMSettingGsm.html#nm-setting-gsm-get-home-only" title="nm_setting_gsm_get_home_only ()">nm_setting_gsm_get_home_only</a>        (<em class="parameter"><code><a class="link" href="NMSettingGsm.html" title="NMSettingGsm"><span class="type">NMSettingGsm</span></a> *setting</code></em>);
-const <span class="returnvalue">char</span> *        <a class="link" href="NMSettingGsm.html#nm-setting-gsm-get-puk" title="nm_setting_gsm_get_puk ()">nm_setting_gsm_get_puk</a>              (<em class="parameter"><code><a class="link" href="NMSettingGsm.html" title="NMSettingGsm"><span class="type">NMSettingGsm</span></a> *setting</code></em>);
-<span class="returnvalue">int</span>                 <a class="link" href="NMSettingGsm.html#nm-setting-gsm-get-band" title="nm_setting_gsm_get_band ()">nm_setting_gsm_get_band</a>             (<em class="parameter"><code><a class="link" href="NMSettingGsm.html" title="NMSettingGsm"><span class="type">NMSettingGsm</span></a> *setting</code></em>);
+<a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="returnvalue">NMSettingSecretFlags</span></a>  <a class="link" href="NMSettingGsm.html#nm-setting-gsm-get-pin-flags" title="nm_setting_gsm_get_pin_flags ()">nm_setting_gsm_get_pin_flags</a>      (<em class="parameter"><code><a class="link" href="NMSettingGsm.html" title="NMSettingGsm"><span class="type">NMSettingGsm</span></a> *setting</code></em>);
+<a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="returnvalue">NMSettingSecretFlags</span></a>  <a class="link" href="NMSettingGsm.html#nm-setting-gsm-get-password-flags" title="nm_setting_gsm_get_password_flags ()">nm_setting_gsm_get_password_flags</a> (<em class="parameter"><code><a class="link" href="NMSettingGsm.html" title="NMSettingGsm"><span class="type">NMSettingGsm</span></a> *setting</code></em>);
 </pre>
 </div>
-<div class="refsect1" title="Object Hierarchy">
+<div class="refsect1">
 <a name="NMSettingGsm.object-hierarchy"></a><h2>Object Hierarchy</h2>
 <pre class="synopsis">
+  GEnum
+   +----NMSettingGsmError
+</pre>
+<pre class="synopsis">
   <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>
    +----<a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
          +----NMSettingGsm
 </pre>
 </div>
-<div class="refsect1" title="Properties">
+<div class="refsect1">
 <a name="NMSettingGsm.properties"></a><h2>Properties</h2>
 <pre class="synopsis">
   "<a class="link" href="NMSettingGsm.html#NMSettingGsm--allowed-bands" title='The "allowed-bands" property'>allowed-bands</a>"            <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write / Construct
   "<a class="link" href="NMSettingGsm.html#NMSettingGsm--apn" title='The "apn" property'>apn</a>"                      <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write
-  "<a class="link" href="NMSettingGsm.html#NMSettingGsm--band" title='The "band" property'>band</a>"                     <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a>                  : Read / Write / Construct
   "<a class="link" href="NMSettingGsm.html#NMSettingGsm--home-only" title='The "home-only" property'>home-only</a>"                <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write
   "<a class="link" href="NMSettingGsm.html#NMSettingGsm--network-id" title='The "network-id" property'>network-id</a>"               <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write
   "<a class="link" href="NMSettingGsm.html#NMSettingGsm--network-type" title='The "network-type" property'>network-type</a>"             <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a>                  : Read / Write / Construct
   "<a class="link" href="NMSettingGsm.html#NMSettingGsm--number" title='The "number" property'>number</a>"                   <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write
   "<a class="link" href="NMSettingGsm.html#NMSettingGsm--password" title='The "password" property'>password</a>"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write
+  "<a class="link" href="NMSettingGsm.html#NMSettingGsm--password-flags" title='The "password-flags" property'>password-flags</a>"           <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write
   "<a class="link" href="NMSettingGsm.html#NMSettingGsm--pin" title='The "pin" property'>pin</a>"                      <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write
-  "<a class="link" href="NMSettingGsm.html#NMSettingGsm--puk" title='The "puk" property'>puk</a>"                      <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write
+  "<a class="link" href="NMSettingGsm.html#NMSettingGsm--pin-flags" title='The "pin-flags" property'>pin-flags</a>"                <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write
   "<a class="link" href="NMSettingGsm.html#NMSettingGsm--username" title='The "username" property'>username</a>"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write
 </pre>
 </div>
-<div class="refsect1" title="Description">
+<div class="refsect1">
 <a name="NMSettingGsm.description"></a><h2>Description</h2>
 <p>
 </p>
 </div>
-<div class="refsect1" title="Details">
+<div class="refsect1">
 <a name="NMSettingGsm.details"></a><h2>Details</h2>
-<div class="refsect2" title="NM_SETTING_GSM_SETTING_NAME">
+<div class="refsect2">
 <a name="NM-SETTING-GSM-SETTING-NAME:CAPS"></a><h3>NM_SETTING_GSM_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_GSM_SETTING_NAME "gsm"
 </pre>
@@ -120,7 +119,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="enum NMSettingGsmError">
+<div class="refsect2">
 <a name="NMSettingGsmError"></a><h3>enum NMSettingGsmError</h3>
 <pre class="programlisting">typedef enum
 {
@@ -134,7 +133,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_TYPE_SETTING_GSM_ERROR">
+<div class="refsect2">
 <a name="NM-TYPE-SETTING-GSM-ERROR:CAPS"></a><h3>NM_TYPE_SETTING_GSM_ERROR</h3>
 <pre class="programlisting">#define NM_TYPE_SETTING_GSM_ERROR (nm_setting_gsm_error_get_type ()) 
 </pre>
@@ -142,7 +141,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_GSM_ERROR">
+<div class="refsect2">
 <a name="NM-SETTING-GSM-ERROR:CAPS"></a><h3>NM_SETTING_GSM_ERROR</h3>
 <pre class="programlisting">#define NM_SETTING_GSM_ERROR nm_setting_gsm_error_quark ()
 </pre>
@@ -150,150 +149,102 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_gsm_error_quark ()">
+<div class="refsect2">
 <a name="nm-setting-gsm-error-quark"></a><h3>nm_setting_gsm_error_quark ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              nm_setting_gsm_error_quark          (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_GSM_NUMBER">
+<div class="refsect2">
 <a name="NM-SETTING-GSM-NUMBER:CAPS"></a><h3>NM_SETTING_GSM_NUMBER</h3>
-<pre class="programlisting">#define NM_SETTING_GSM_NUMBER        "number"
+<pre class="programlisting">#define NM_SETTING_GSM_NUMBER         "number"
 </pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_GSM_USERNAME">
+<div class="refsect2">
 <a name="NM-SETTING-GSM-USERNAME:CAPS"></a><h3>NM_SETTING_GSM_USERNAME</h3>
-<pre class="programlisting">#define NM_SETTING_GSM_USERNAME      "username"
+<pre class="programlisting">#define NM_SETTING_GSM_USERNAME       "username"
 </pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_GSM_PASSWORD">
+<div class="refsect2">
 <a name="NM-SETTING-GSM-PASSWORD:CAPS"></a><h3>NM_SETTING_GSM_PASSWORD</h3>
-<pre class="programlisting">#define NM_SETTING_GSM_PASSWORD      "password"
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="NM_SETTING_GSM_APN">
-<a name="NM-SETTING-GSM-APN:CAPS"></a><h3>NM_SETTING_GSM_APN</h3>
-<pre class="programlisting">#define NM_SETTING_GSM_APN           "apn"
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="NM_SETTING_GSM_NETWORK_ID">
-<a name="NM-SETTING-GSM-NETWORK-ID:CAPS"></a><h3>NM_SETTING_GSM_NETWORK_ID</h3>
-<pre class="programlisting">#define NM_SETTING_GSM_NETWORK_ID    "network-id"
+<pre class="programlisting">#define NM_SETTING_GSM_PASSWORD       "password"
 </pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_GSM_NETWORK_TYPE">
-<a name="NM-SETTING-GSM-NETWORK-TYPE:CAPS"></a><h3>NM_SETTING_GSM_NETWORK_TYPE</h3>
-<pre class="programlisting">#define NM_SETTING_GSM_NETWORK_TYPE  "network-type"
+<div class="refsect2">
+<a name="NM-SETTING-GSM-PASSWORD-FLAGS:CAPS"></a><h3>NM_SETTING_GSM_PASSWORD_FLAGS</h3>
+<pre class="programlisting">#define NM_SETTING_GSM_PASSWORD_FLAGS "password-flags"
 </pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_GSM_ALLOWED_BANDS">
-<a name="NM-SETTING-GSM-ALLOWED-BANDS:CAPS"></a><h3>NM_SETTING_GSM_ALLOWED_BANDS</h3>
-<pre class="programlisting">#define NM_SETTING_GSM_ALLOWED_BANDS "allowed-bands"
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="NM_SETTING_GSM_PIN">
-<a name="NM-SETTING-GSM-PIN:CAPS"></a><h3>NM_SETTING_GSM_PIN</h3>
-<pre class="programlisting">#define NM_SETTING_GSM_PIN           "pin"
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="NM_SETTING_GSM_HOME_ONLY">
-<a name="NM-SETTING-GSM-HOME-ONLY:CAPS"></a><h3>NM_SETTING_GSM_HOME_ONLY</h3>
-<pre class="programlisting">#define NM_SETTING_GSM_HOME_ONLY     "home-only"
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="NM_SETTING_GSM_PUK">
-<a name="NM-SETTING-GSM-PUK:CAPS"></a><h3>NM_SETTING_GSM_PUK</h3>
-<pre class="programlisting">#define NM_SETTING_GSM_PUK           "puk"
+<div class="refsect2">
+<a name="NM-SETTING-GSM-APN:CAPS"></a><h3>NM_SETTING_GSM_APN</h3>
+<pre class="programlisting">#define NM_SETTING_GSM_APN            "apn"
 </pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_GSM_BAND">
-<a name="NM-SETTING-GSM-BAND:CAPS"></a><h3>NM_SETTING_GSM_BAND</h3>
-<pre class="programlisting">#define NM_SETTING_GSM_BAND          "band"
+<div class="refsect2">
+<a name="NM-SETTING-GSM-NETWORK-ID:CAPS"></a><h3>NM_SETTING_GSM_NETWORK_ID</h3>
+<pre class="programlisting">#define NM_SETTING_GSM_NETWORK_ID     "network-id"
 </pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_GSM_NETWORK_ANY">
-<a name="NM-GSM-NETWORK-ANY:CAPS"></a><h3>NM_GSM_NETWORK_ANY</h3>
-<pre class="programlisting">#define NM_GSM_NETWORK_ANY              NM_SETTING_GSM_NETWORK_TYPE_ANY
+<div class="refsect2">
+<a name="NM-SETTING-GSM-NETWORK-TYPE:CAPS"></a><h3>NM_SETTING_GSM_NETWORK_TYPE</h3>
+<pre class="programlisting">#define NM_SETTING_GSM_NETWORK_TYPE   "network-type"
 </pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_GSM_NETWORK_UMTS_HSPA">
-<a name="NM-GSM-NETWORK-UMTS-HSPA:CAPS"></a><h3>NM_GSM_NETWORK_UMTS_HSPA</h3>
-<pre class="programlisting">#define NM_GSM_NETWORK_UMTS_HSPA        NM_SETTING_GSM_NETWORK_TYPE_UMTS_HSPA
+<div class="refsect2">
+<a name="NM-SETTING-GSM-ALLOWED-BANDS:CAPS"></a><h3>NM_SETTING_GSM_ALLOWED_BANDS</h3>
+<pre class="programlisting">#define NM_SETTING_GSM_ALLOWED_BANDS  "allowed-bands"
 </pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_GSM_NETWORK_GPRS_EDGE">
-<a name="NM-GSM-NETWORK-GPRS-EDGE:CAPS"></a><h3>NM_GSM_NETWORK_GPRS_EDGE</h3>
-<pre class="programlisting">#define NM_GSM_NETWORK_GPRS_EDGE        NM_SETTING_GSM_NETWORK_TYPE_GPRS_EDGE
+<div class="refsect2">
+<a name="NM-SETTING-GSM-PIN:CAPS"></a><h3>NM_SETTING_GSM_PIN</h3>
+<pre class="programlisting">#define NM_SETTING_GSM_PIN            "pin"
 </pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_GSM_NETWORK_PREFER_UMTS_HSPA">
-<a name="NM-GSM-NETWORK-PREFER-UMTS-HSPA:CAPS"></a><h3>NM_GSM_NETWORK_PREFER_UMTS_HSPA</h3>
-<pre class="programlisting">#define NM_GSM_NETWORK_PREFER_UMTS_HSPA NM_SETTING_GSM_NETWORK_TYPE_PREFER_UMTS_HSPA
+<div class="refsect2">
+<a name="NM-SETTING-GSM-PIN-FLAGS:CAPS"></a><h3>NM_SETTING_GSM_PIN_FLAGS</h3>
+<pre class="programlisting">#define NM_SETTING_GSM_PIN_FLAGS      "pin-flags"
 </pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_GSM_NETWORK_PREFER_GPRS_EDGE">
-<a name="NM-GSM-NETWORK-PREFER-GPRS-EDGE:CAPS"></a><h3>NM_GSM_NETWORK_PREFER_GPRS_EDGE</h3>
-<pre class="programlisting">#define NM_GSM_NETWORK_PREFER_GPRS_EDGE NM_SETTING_GSM_NETWORK_TYPE_PREFER_GPRS_EDGE
+<div class="refsect2">
+<a name="NM-SETTING-GSM-HOME-ONLY:CAPS"></a><h3>NM_SETTING_GSM_HOME_ONLY</h3>
+<pre class="programlisting">#define NM_SETTING_GSM_HOME_ONLY      "home-only"
 </pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="enum NMSettingGsmNetworkType">
+<div class="refsect2">
 <a name="NMSettingGsmNetworkType"></a><h3>enum NMSettingGsmNetworkType</h3>
 <pre class="programlisting">typedef enum {
 	NM_SETTING_GSM_NETWORK_TYPE_ANY = -1,
@@ -307,7 +258,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="enum NMSettingGsmNetworkBand">
+<div class="refsect2">
 <a name="NMSettingGsmNetworkBand"></a><h3>enum NMSettingGsmNetworkBand</h3>
 <pre class="programlisting">typedef enum {
 	NM_SETTING_GSM_BAND_UNKNOWN      = 0x00000000,
@@ -330,14 +281,14 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMSettingGsm">
+<div class="refsect2">
 <a name="NMSettingGsm-struct"></a><h3>NMSettingGsm</h3>
 <pre class="programlisting">typedef struct _NMSettingGsm NMSettingGsm;</pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMSettingGsmClass">
+<div class="refsect2">
 <a name="NMSettingGsmClass"></a><h3>NMSettingGsmClass</h3>
 <pre class="programlisting">typedef struct {
 	NMSettingClass parent;
@@ -353,281 +304,126 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_gsm_get_type ()">
+<div class="refsect2">
 <a name="nm-setting-gsm-get-type"></a><h3>nm_setting_gsm_get_type ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               nm_setting_gsm_get_type             (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_gsm_new ()">
+<div class="refsect2">
 <a name="nm-setting-gsm-new"></a><h3>nm_setting_gsm_new ()</h3>
 <pre class="programlisting"><a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *         nm_setting_gsm_new                  (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_gsm_get_number ()">
+<div class="refsect2">
 <a name="nm-setting-gsm-get-number"></a><h3>nm_setting_gsm_get_number ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_gsm_get_number           (<em class="parameter"><code><a class="link" href="NMSettingGsm.html" title="NMSettingGsm"><span class="type">NMSettingGsm</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_gsm_get_username ()">
+<div class="refsect2">
 <a name="nm-setting-gsm-get-username"></a><h3>nm_setting_gsm_get_username ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_gsm_get_username         (<em class="parameter"><code><a class="link" href="NMSettingGsm.html" title="NMSettingGsm"><span class="type">NMSettingGsm</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_gsm_get_password ()">
+<div class="refsect2">
 <a name="nm-setting-gsm-get-password"></a><h3>nm_setting_gsm_get_password ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_gsm_get_password         (<em class="parameter"><code><a class="link" href="NMSettingGsm.html" title="NMSettingGsm"><span class="type">NMSettingGsm</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_gsm_get_apn ()">
+<div class="refsect2">
 <a name="nm-setting-gsm-get-apn"></a><h3>nm_setting_gsm_get_apn ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_gsm_get_apn              (<em class="parameter"><code><a class="link" href="NMSettingGsm.html" title="NMSettingGsm"><span class="type">NMSettingGsm</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_gsm_get_network_id ()">
+<div class="refsect2">
 <a name="nm-setting-gsm-get-network-id"></a><h3>nm_setting_gsm_get_network_id ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_gsm_get_network_id       (<em class="parameter"><code><a class="link" href="NMSettingGsm.html" title="NMSettingGsm"><span class="type">NMSettingGsm</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_gsm_get_network_type ()">
+<div class="refsect2">
 <a name="nm-setting-gsm-get-network-type"></a><h3>nm_setting_gsm_get_network_type ()</h3>
 <pre class="programlisting"><span class="returnvalue">int</span>                 nm_setting_gsm_get_network_type     (<em class="parameter"><code><a class="link" href="NMSettingGsm.html" title="NMSettingGsm"><span class="type">NMSettingGsm</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_gsm_get_allowed_bands ()">
+<div class="refsect2">
 <a name="nm-setting-gsm-get-allowed-bands"></a><h3>nm_setting_gsm_get_allowed_bands ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_setting_gsm_get_allowed_bands    (<em class="parameter"><code><a class="link" href="NMSettingGsm.html" title="NMSettingGsm"><span class="type">NMSettingGsm</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_gsm_get_pin ()">
+<div class="refsect2">
 <a name="nm-setting-gsm-get-pin"></a><h3>nm_setting_gsm_get_pin ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_gsm_get_pin              (<em class="parameter"><code><a class="link" href="NMSettingGsm.html" title="NMSettingGsm"><span class="type">NMSettingGsm</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_gsm_get_home_only ()">
+<div class="refsect2">
 <a name="nm-setting-gsm-get-home-only"></a><h3>nm_setting_gsm_get_home_only ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_gsm_get_home_only        (<em class="parameter"><code><a class="link" href="NMSettingGsm.html" title="NMSettingGsm"><span class="type">NMSettingGsm</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_gsm_get_puk ()">
-<a name="nm-setting-gsm-get-puk"></a><h3>nm_setting_gsm_get_puk ()</h3>
-<pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_gsm_get_puk              (<em class="parameter"><code><a class="link" href="NMSettingGsm.html" title="NMSettingGsm"><span class="type">NMSettingGsm</span></a> *setting</code></em>);</pre>
-<p>
-</p>
+<div class="refsect2">
+<a name="nm-setting-gsm-get-pin-flags"></a><h3>nm_setting_gsm_get_pin_flags ()</h3>
+<pre class="programlisting"><a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="returnvalue">NMSettingSecretFlags</span></a>  nm_setting_gsm_get_pin_flags      (<em class="parameter"><code><a class="link" href="NMSettingGsm.html" title="NMSettingGsm"><span class="type">NMSettingGsm</span></a> *setting</code></em>);</pre>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
+<td>the <a class="link" href="NMSettingGsm.html" title="NMSettingGsm"><span class="type">NMSettingGsm</span></a>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
+<td>the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> pertaining to the <a class="link" href="NMSettingGsm.html#NMSettingGsm--pin" title='The "pin" property'><span class="type">"pin"</span></a>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_gsm_get_band ()">
-<a name="nm-setting-gsm-get-band"></a><h3>nm_setting_gsm_get_band ()</h3>
-<pre class="programlisting"><span class="returnvalue">int</span>                 nm_setting_gsm_get_band             (<em class="parameter"><code><a class="link" href="NMSettingGsm.html" title="NMSettingGsm"><span class="type">NMSettingGsm</span></a> *setting</code></em>);</pre>
-<p>
-</p>
+<div class="refsect2">
+<a name="nm-setting-gsm-get-password-flags"></a><h3>nm_setting_gsm_get_password_flags ()</h3>
+<pre class="programlisting"><a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="returnvalue">NMSettingSecretFlags</span></a>  nm_setting_gsm_get_password_flags (<em class="parameter"><code><a class="link" href="NMSettingGsm.html" title="NMSettingGsm"><span class="type">NMSettingGsm</span></a> *setting</code></em>);</pre>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
+<td>the <a class="link" href="NMSettingGsm.html" title="NMSettingGsm"><span class="type">NMSettingGsm</span></a>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
+<td>the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> pertaining to the <a class="link" href="NMSettingGsm.html#NMSettingGsm--password" title='The "password" property'><span class="type">"password"</span></a>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 </div>
-<div class="refsect1" title="Property Details">
+<div class="refsect1">
 <a name="NMSettingGsm.property-details"></a><h2>Property Details</h2>
-<div class="refsect2" title='The "allowed-bands" property'>
+<div class="refsect2">
 <a name="NMSettingGsm--allowed-bands"></a><h3>The <code class="literal">"allowed-bands"</code> property</h3>
 <pre class="programlisting">  "allowed-bands"            <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write / Construct</pre>
 <p>
@@ -638,7 +434,7 @@ frequency band control.
 <p>Default value: 1</p>
 </div>
 <hr>
-<div class="refsect2" title='The "apn" property'>
+<div class="refsect2">
 <a name="NMSettingGsm--apn"></a><h3>The <code class="literal">"apn"</code> property</h3>
 <pre class="programlisting">  "apn"                      <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -653,17 +449,7 @@ GSM 03.60 Section 14.9.
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "band" property'>
-<a name="NMSettingGsm--band"></a><h3>The <code class="literal">"band"</code> property</h3>
-<pre class="programlisting">  "band"                     <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a>                  : Read / Write / Construct</pre>
-<p>
-DEPRECATED
-</p>
-<p>Allowed values: [-1,5]</p>
-<p>Default value: -1</p>
-</div>
-<hr>
-<div class="refsect2" title='The "home-only" property'>
+<div class="refsect2">
 <a name="NMSettingGsm--home-only"></a><h3>The <code class="literal">"home-only"</code> property</h3>
 <pre class="programlisting">  "home-only"                <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write</pre>
 <p>
@@ -673,7 +459,7 @@ Connections to roaming networks will not be made.
 <p>Default value: FALSE</p>
 </div>
 <hr>
-<div class="refsect2" title='The "network-id" property'>
+<div class="refsect2">
 <a name="NMSettingGsm--network-id"></a><h3>The <code class="literal">"network-id"</code> property</h3>
 <pre class="programlisting">  "network-id"               <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -686,7 +472,7 @@ roaming control of the device is not otherwise possible.
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "network-type" property'>
+<div class="refsect2">
 <a name="NMSettingGsm--network-type"></a><h3>The <code class="literal">"network-type"</code> property</h3>
 <pre class="programlisting">  "network-type"             <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a>                  : Read / Write / Construct</pre>
 <p>
@@ -695,11 +481,11 @@ 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.
 </p>
-<p>Allowed values: [-1,3]</p>
+<p>Allowed values: [G_MAXULONG,3]</p>
 <p>Default value: -1</p>
 </div>
 <hr>
-<div class="refsect2" title='The "number" property'>
+<div class="refsect2">
 <a name="NMSettingGsm--number"></a><h3>The <code class="literal">"number"</code> property</h3>
 <pre class="programlisting">  "number"                   <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -711,7 +497,7 @@ automatically when required.
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "password" property'>
+<div class="refsect2">
 <a name="NMSettingGsm--password"></a><h3>The <code class="literal">"password"</code> property</h3>
 <pre class="programlisting">  "password"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -722,7 +508,17 @@ password is required, it is specified here.
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "pin" property'>
+<div class="refsect2">
+<a name="NMSettingGsm--password-flags"></a><h3>The <code class="literal">"password-flags"</code> property</h3>
+<pre class="programlisting">  "password-flags"           <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write</pre>
+<p>
+Flags indicating how to handle <a class="link" href="NMSettingGsm.html#NMSettingGsm--password" title='The "password" property'><span class="type">"password"</span></a>:.
+</p>
+<p>Allowed values: &lt;= 7</p>
+<p>Default value: 0</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="NMSettingGsm--pin"></a><h3>The <code class="literal">"pin"</code> property</h3>
 <pre class="programlisting">  "pin"                      <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -733,16 +529,17 @@ the device.
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "puk" property'>
-<a name="NMSettingGsm--puk"></a><h3>The <code class="literal">"puk"</code> property</h3>
-<pre class="programlisting">  "puk"                      <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
+<div class="refsect2">
+<a name="NMSettingGsm--pin-flags"></a><h3>The <code class="literal">"pin-flags"</code> property</h3>
+<pre class="programlisting">  "pin-flags"                <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write</pre>
 <p>
-DEPRECATED
+Flags indicating how to handle <a class="link" href="NMSettingGsm.html#NMSettingGsm--pin" title='The "pin" property'><span class="type">"pin"</span></a>:.
 </p>
-<p>Default value: NULL</p>
+<p>Allowed values: &lt;= 7</p>
+<p>Default value: 0</p>
 </div>
 <hr>
-<div class="refsect2" title='The "username" property'>
+<div class="refsect2">
 <a name="NMSettingGsm--username"></a><h3>The <code class="literal">"username"</code> property</h3>
 <pre class="programlisting">  "username"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -756,6 +553,6 @@ username is required, it is specified here.
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.15</div>
+          Generated by GTK-Doc V1.17</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingIP4Config.html b/docs/libnm-util/html/NMSettingIP4Config.html
index 7f0eef805..6a701adf5 100644
--- a/docs/libnm-util/html/NMSettingIP4Config.html
+++ b/docs/libnm-util/html/NMSettingIP4Config.html
@@ -3,12 +3,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>NMSettingIP4Config</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="libnm-util Reference Manual">
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSetting8021x.html" title="NMSetting8021x">
 <link rel="next" href="NMSettingIP6Config.html" title="NMSettingIP6Config">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,7 +30,7 @@
                   <a href="#NMSettingIP4Config.properties" class="shortcut">Properties</a>
 </td></tr>
 </table>
-<div class="refentry" title="NMSettingIP4Config">
+<div class="refentry">
 <a name="NMSettingIP4Config"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
@@ -39,10 +39,10 @@
 </td>
 <td valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv" title="Synopsis">
+<div class="refsynopsisdiv">
 <a name="NMSettingIP4Config.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">#define             <a class="link" href="NMSettingIP4Config.html#NM-SETTING-IP4-CONFIG-SETTING-NAME:CAPS" title="NM_SETTING_IP4_CONFIG_SETTING_NAME">NM_SETTING_IP4_CONFIG_SETTING_NAME</a>
-enum                <a class="link" href="NMSettingIP4Config.html#NMSettingIP4ConfigError" title="enum NMSettingIP4ConfigError">NMSettingIP4ConfigError</a>;
+<a name="NMSettingIP4ConfigError"></a><a name="NMIP4Address"></a><a name="NMIP4Route"></a><pre class="synopsis">#define             <a class="link" href="NMSettingIP4Config.html#NM-SETTING-IP4-CONFIG-SETTING-NAME:CAPS" title="NM_SETTING_IP4_CONFIG_SETTING_NAME">NM_SETTING_IP4_CONFIG_SETTING_NAME</a>
+enum                <a class="link" href="NMSettingIP4Config.html#NMSettingIP4ConfigError">NMSettingIP4ConfigError</a>;
 #define             <a class="link" href="NMSettingIP4Config.html#NM-TYPE-SETTING-IP4-CONFIG-ERROR:CAPS" title="NM_TYPE_SETTING_IP4_CONFIG_ERROR">NM_TYPE_SETTING_IP4_CONFIG_ERROR</a>
 #define             <a class="link" href="NMSettingIP4Config.html#NM-SETTING-IP4-CONFIG-ERROR:CAPS" title="NM_SETTING_IP4_CONFIG_ERROR">NM_SETTING_IP4_CONFIG_ERROR</a>
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              <a class="link" href="NMSettingIP4Config.html#nm-setting-ip4-config-error-quark" title="nm_setting_ip4_config_error_quark ()">nm_setting_ip4_config_error_quark</a>   (<em class="parameter"><code><span class="type">void</span></code></em>);
@@ -63,40 +63,42 @@ enum                <a class="link" href="NMSettingIP4Config.html#NMSettingIP4Co
 #define             <a class="link" href="NMSettingIP4Config.html#NM-SETTING-IP4-CONFIG-METHOD-MANUAL:CAPS" title="NM_SETTING_IP4_CONFIG_METHOD_MANUAL">NM_SETTING_IP4_CONFIG_METHOD_MANUAL</a>
 #define             <a class="link" href="NMSettingIP4Config.html#NM-SETTING-IP4-CONFIG-METHOD-SHARED:CAPS" title="NM_SETTING_IP4_CONFIG_METHOD_SHARED">NM_SETTING_IP4_CONFIG_METHOD_SHARED</a>
 #define             <a class="link" href="NMSettingIP4Config.html#NM-SETTING-IP4-CONFIG-METHOD-DISABLED:CAPS" title="NM_SETTING_IP4_CONFIG_METHOD_DISABLED">NM_SETTING_IP4_CONFIG_METHOD_DISABLED</a>
-typedef             <a class="link" href="NMSettingIP4Config.html#NMIP4Address" title="NMIP4Address">NMIP4Address</a>;
-<a class="link" href="NMSettingIP4Config.html#NMIP4Address" title="NMIP4Address"><span class="returnvalue">NMIP4Address</span></a> *      <a class="link" href="NMSettingIP4Config.html#nm-ip4-address-new" title="nm_ip4_address_new ()">nm_ip4_address_new</a>                  (<em class="parameter"><code><span class="type">void</span></code></em>);
-<a class="link" href="NMSettingIP4Config.html#NMIP4Address" title="NMIP4Address"><span class="returnvalue">NMIP4Address</span></a> *      <a class="link" href="NMSettingIP4Config.html#nm-ip4-address-dup" title="nm_ip4_address_dup ()">nm_ip4_address_dup</a>                  (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address" title="NMIP4Address"><span class="type">NMIP4Address</span></a> *source</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP4Config.html#nm-ip4-address-ref" title="nm_ip4_address_ref ()">nm_ip4_address_ref</a>                  (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address" title="NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP4Config.html#nm-ip4-address-unref" title="nm_ip4_address_unref ()">nm_ip4_address_unref</a>                (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address" title="NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMSettingIP4Config.html#nm-ip4-address-compare" title="nm_ip4_address_compare ()">nm_ip4_address_compare</a>              (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address" title="NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address" title="NMIP4Address"><span class="type">NMIP4Address</span></a> *other</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             <a class="link" href="NMSettingIP4Config.html#nm-ip4-address-get-address" title="nm_ip4_address_get_address ()">nm_ip4_address_get_address</a>          (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address" title="NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP4Config.html#nm-ip4-address-set-address" title="nm_ip4_address_set_address ()">nm_ip4_address_set_address</a>          (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address" title="NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>,
+typedef             <a class="link" href="NMSettingIP4Config.html#NMIP4Address">NMIP4Address</a>;
+<a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               <a class="link" href="NMSettingIP4Config.html#nm-ip4-address-get-type" title="nm_ip4_address_get_type ()">nm_ip4_address_get_type</a>             (<em class="parameter"><code><span class="type">void</span></code></em>);
+<a class="link" href="NMSettingIP4Config.html#NMIP4Address"><span class="returnvalue">NMIP4Address</span></a> *      <a class="link" href="NMSettingIP4Config.html#nm-ip4-address-new" title="nm_ip4_address_new ()">nm_ip4_address_new</a>                  (<em class="parameter"><code><span class="type">void</span></code></em>);
+<a class="link" href="NMSettingIP4Config.html#NMIP4Address"><span class="returnvalue">NMIP4Address</span></a> *      <a class="link" href="NMSettingIP4Config.html#nm-ip4-address-dup" title="nm_ip4_address_dup ()">nm_ip4_address_dup</a>                  (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address"><span class="type">NMIP4Address</span></a> *source</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP4Config.html#nm-ip4-address-ref" title="nm_ip4_address_ref ()">nm_ip4_address_ref</a>                  (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP4Config.html#nm-ip4-address-unref" title="nm_ip4_address_unref ()">nm_ip4_address_unref</a>                (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>);
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMSettingIP4Config.html#nm-ip4-address-compare" title="nm_ip4_address_compare ()">nm_ip4_address_compare</a>              (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address"><span class="type">NMIP4Address</span></a> *other</code></em>);
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             <a class="link" href="NMSettingIP4Config.html#nm-ip4-address-get-address" title="nm_ip4_address_get_address ()">nm_ip4_address_get_address</a>          (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP4Config.html#nm-ip4-address-set-address" title="nm_ip4_address_set_address ()">nm_ip4_address_set_address</a>          (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> addr</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             <a class="link" href="NMSettingIP4Config.html#nm-ip4-address-get-prefix" title="nm_ip4_address_get_prefix ()">nm_ip4_address_get_prefix</a>           (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address" title="NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP4Config.html#nm-ip4-address-set-prefix" title="nm_ip4_address_set_prefix ()">nm_ip4_address_set_prefix</a>           (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address" title="NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>,
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             <a class="link" href="NMSettingIP4Config.html#nm-ip4-address-get-prefix" title="nm_ip4_address_get_prefix ()">nm_ip4_address_get_prefix</a>           (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP4Config.html#nm-ip4-address-set-prefix" title="nm_ip4_address_set_prefix ()">nm_ip4_address_set_prefix</a>           (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> prefix</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             <a class="link" href="NMSettingIP4Config.html#nm-ip4-address-get-gateway" title="nm_ip4_address_get_gateway ()">nm_ip4_address_get_gateway</a>          (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address" title="NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP4Config.html#nm-ip4-address-set-gateway" title="nm_ip4_address_set_gateway ()">nm_ip4_address_set_gateway</a>          (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address" title="NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>,
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             <a class="link" href="NMSettingIP4Config.html#nm-ip4-address-get-gateway" title="nm_ip4_address_get_gateway ()">nm_ip4_address_get_gateway</a>          (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP4Config.html#nm-ip4-address-set-gateway" title="nm_ip4_address_set_gateway ()">nm_ip4_address_set_gateway</a>          (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> gateway</code></em>);
-typedef             <a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route">NMIP4Route</a>;
-<a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route"><span class="returnvalue">NMIP4Route</span></a> *        <a class="link" href="NMSettingIP4Config.html#nm-ip4-route-new" title="nm_ip4_route_new ()">nm_ip4_route_new</a>                    (<em class="parameter"><code><span class="type">void</span></code></em>);
-<a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route"><span class="returnvalue">NMIP4Route</span></a> *        <a class="link" href="NMSettingIP4Config.html#nm-ip4-route-dup" title="nm_ip4_route_dup ()">nm_ip4_route_dup</a>                    (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP4Config.html#nm-ip4-route-ref" title="nm_ip4_route_ref ()">nm_ip4_route_ref</a>                    (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP4Config.html#nm-ip4-route-unref" title="nm_ip4_route_unref ()">nm_ip4_route_unref</a>                  (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMSettingIP4Config.html#nm-ip4-route-compare" title="nm_ip4_route_compare ()">nm_ip4_route_compare</a>                (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route"><span class="type">NMIP4Route</span></a> *other</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             <a class="link" href="NMSettingIP4Config.html#nm-ip4-route-get-dest" title="nm_ip4_route_get_dest ()">nm_ip4_route_get_dest</a>               (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP4Config.html#nm-ip4-route-set-dest" title="nm_ip4_route_set_dest ()">nm_ip4_route_set_dest</a>               (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>,
+typedef             <a class="link" href="NMSettingIP4Config.html#NMIP4Route">NMIP4Route</a>;
+<a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               <a class="link" href="NMSettingIP4Config.html#nm-ip4-route-get-type" title="nm_ip4_route_get_type ()">nm_ip4_route_get_type</a>               (<em class="parameter"><code><span class="type">void</span></code></em>);
+<a class="link" href="NMSettingIP4Config.html#NMIP4Route"><span class="returnvalue">NMIP4Route</span></a> *        <a class="link" href="NMSettingIP4Config.html#nm-ip4-route-new" title="nm_ip4_route_new ()">nm_ip4_route_new</a>                    (<em class="parameter"><code><span class="type">void</span></code></em>);
+<a class="link" href="NMSettingIP4Config.html#NMIP4Route"><span class="returnvalue">NMIP4Route</span></a> *        <a class="link" href="NMSettingIP4Config.html#nm-ip4-route-dup" title="nm_ip4_route_dup ()">nm_ip4_route_dup</a>                    (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP4Config.html#nm-ip4-route-ref" title="nm_ip4_route_ref ()">nm_ip4_route_ref</a>                    (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP4Config.html#nm-ip4-route-unref" title="nm_ip4_route_unref ()">nm_ip4_route_unref</a>                  (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>);
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMSettingIP4Config.html#nm-ip4-route-compare" title="nm_ip4_route_compare ()">nm_ip4_route_compare</a>                (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route"><span class="type">NMIP4Route</span></a> *other</code></em>);
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             <a class="link" href="NMSettingIP4Config.html#nm-ip4-route-get-dest" title="nm_ip4_route_get_dest ()">nm_ip4_route_get_dest</a>               (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP4Config.html#nm-ip4-route-set-dest" title="nm_ip4_route_set_dest ()">nm_ip4_route_set_dest</a>               (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> dest</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             <a class="link" href="NMSettingIP4Config.html#nm-ip4-route-get-prefix" title="nm_ip4_route_get_prefix ()">nm_ip4_route_get_prefix</a>             (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP4Config.html#nm-ip4-route-set-prefix" title="nm_ip4_route_set_prefix ()">nm_ip4_route_set_prefix</a>             (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>,
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             <a class="link" href="NMSettingIP4Config.html#nm-ip4-route-get-prefix" title="nm_ip4_route_get_prefix ()">nm_ip4_route_get_prefix</a>             (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP4Config.html#nm-ip4-route-set-prefix" title="nm_ip4_route_set_prefix ()">nm_ip4_route_set_prefix</a>             (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> prefix</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             <a class="link" href="NMSettingIP4Config.html#nm-ip4-route-get-next-hop" title="nm_ip4_route_get_next_hop ()">nm_ip4_route_get_next_hop</a>           (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP4Config.html#nm-ip4-route-set-next-hop" title="nm_ip4_route_set_next_hop ()">nm_ip4_route_set_next_hop</a>           (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>,
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             <a class="link" href="NMSettingIP4Config.html#nm-ip4-route-get-next-hop" title="nm_ip4_route_get_next_hop ()">nm_ip4_route_get_next_hop</a>           (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP4Config.html#nm-ip4-route-set-next-hop" title="nm_ip4_route_set_next_hop ()">nm_ip4_route_set_next_hop</a>           (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> next_hop</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             <a class="link" href="NMSettingIP4Config.html#nm-ip4-route-get-metric" title="nm_ip4_route_get_metric ()">nm_ip4_route_get_metric</a>             (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP4Config.html#nm-ip4-route-set-metric" title="nm_ip4_route_set_metric ()">nm_ip4_route_set_metric</a>             (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>,
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             <a class="link" href="NMSettingIP4Config.html#nm-ip4-route-get-metric" title="nm_ip4_route_get_metric ()">nm_ip4_route_get_metric</a>             (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP4Config.html#nm-ip4-route-set-metric" title="nm_ip4_route_set_metric ()">nm_ip4_route_set_metric</a>             (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> metric</code></em>);
                     <a class="link" href="NMSettingIP4Config.html#NMSettingIP4Config-struct" title="NMSettingIP4Config">NMSettingIP4Config</a>;
                     <a class="link" href="NMSettingIP4Config.html#NMSettingIP4ConfigClass" title="NMSettingIP4ConfigClass">NMSettingIP4ConfigClass</a>;
@@ -126,10 +128,10 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>);
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             <a class="link" href="NMSettingIP4Config.html#nm-setting-ip4-config-get-num-addresses" title="nm_setting_ip4_config_get_num_addresses ()">nm_setting_ip4_config_get_num_addresses</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>);
-<a class="link" href="NMSettingIP4Config.html#NMIP4Address" title="NMIP4Address"><span class="returnvalue">NMIP4Address</span></a> *      <a class="link" href="NMSettingIP4Config.html#nm-setting-ip4-config-get-address" title="nm_setting_ip4_config_get_address ()">nm_setting_ip4_config_get_address</a>   (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>,
+<a class="link" href="NMSettingIP4Config.html#NMIP4Address"><span class="returnvalue">NMIP4Address</span></a> *      <a class="link" href="NMSettingIP4Config.html#nm-setting-ip4-config-get-address" title="nm_setting_ip4_config_get_address ()">nm_setting_ip4_config_get_address</a>   (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> i</code></em>);
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMSettingIP4Config.html#nm-setting-ip4-config-add-address" title="nm_setting_ip4_config_add_address ()">nm_setting_ip4_config_add_address</a>   (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address" title="NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>);
+                                                         <em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="NMSettingIP4Config.html#nm-setting-ip4-config-remove-address" title="nm_setting_ip4_config_remove_address ()">nm_setting_ip4_config_remove_address</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> i</code></em>);
@@ -137,10 +139,10 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>);
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             <a class="link" href="NMSettingIP4Config.html#nm-setting-ip4-config-get-num-routes" title="nm_setting_ip4_config_get_num_routes ()">nm_setting_ip4_config_get_num_routes</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>);
-<a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route"><span class="returnvalue">NMIP4Route</span></a> *        <a class="link" href="NMSettingIP4Config.html#nm-setting-ip4-config-get-route" title="nm_setting_ip4_config_get_route ()">nm_setting_ip4_config_get_route</a>     (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>,
+<a class="link" href="NMSettingIP4Config.html#NMIP4Route"><span class="returnvalue">NMIP4Route</span></a> *        <a class="link" href="NMSettingIP4Config.html#nm-setting-ip4-config-get-route" title="nm_setting_ip4_config_get_route ()">nm_setting_ip4_config_get_route</a>     (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> i</code></em>);
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMSettingIP4Config.html#nm-setting-ip4-config-add-route" title="nm_setting_ip4_config_add_route ()">nm_setting_ip4_config_add_route</a>     (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>);
+                                                         <em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="NMSettingIP4Config.html#nm-setting-ip4-config-remove-route" title="nm_setting_ip4_config_remove_route ()">nm_setting_ip4_config_remove_route</a>  (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> i</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="NMSettingIP4Config.html#nm-setting-ip4-config-clear-routes" title="nm_setting_ip4_config_clear_routes ()">nm_setting_ip4_config_clear_routes</a>  (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>);
@@ -159,15 +161,27 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMSettingIP4Config.html#nm-setting-ip4-config-get-may-fail" title="nm_setting_ip4_config_get_may_fail ()">nm_setting_ip4_config_get_may_fail</a>  (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>);
 </pre>
 </div>
-<div class="refsect1" title="Object Hierarchy">
+<div class="refsect1">
 <a name="NMSettingIP4Config.object-hierarchy"></a><h2>Object Hierarchy</h2>
 <pre class="synopsis">
+  GEnum
+   +----NMSettingIP4ConfigError
+</pre>
+<pre class="synopsis">
+  GBoxed
+   +----NMIP4Address
+</pre>
+<pre class="synopsis">
+  GBoxed
+   +----NMIP4Route
+</pre>
+<pre class="synopsis">
   <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>
    +----<a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
          +----NMSettingIP4Config
 </pre>
 </div>
-<div class="refsect1" title="Properties">
+<div class="refsect1">
 <a name="NMSettingIP4Config.properties"></a><h2>Properties</h2>
 <pre class="synopsis">
   "<a class="link" href="NMSettingIP4Config.html#NMSettingIP4Config--addresses" title='The "addresses" property'>addresses</a>"                <span class="type">GPtrArray_GArray_guint__</span>*  : Read / Write
@@ -184,14 +198,14 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
   "<a class="link" href="NMSettingIP4Config.html#NMSettingIP4Config--routes" title='The "routes" property'>routes</a>"                   <span class="type">GPtrArray_GArray_guint__</span>*  : Read / Write
 </pre>
 </div>
-<div class="refsect1" title="Description">
+<div class="refsect1">
 <a name="NMSettingIP4Config.description"></a><h2>Description</h2>
 <p>
 </p>
 </div>
-<div class="refsect1" title="Details">
+<div class="refsect1">
 <a name="NMSettingIP4Config.details"></a><h2>Details</h2>
-<div class="refsect2" title="NM_SETTING_IP4_CONFIG_SETTING_NAME">
+<div class="refsect2">
 <a name="NM-SETTING-IP4-CONFIG-SETTING-NAME:CAPS"></a><h3>NM_SETTING_IP4_CONFIG_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_IP4_CONFIG_SETTING_NAME "ipv4"
 </pre>
@@ -199,7 +213,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="enum NMSettingIP4ConfigError">
+<div class="refsect2">
 <a name="NMSettingIP4ConfigError"></a><h3>enum NMSettingIP4ConfigError</h3>
 <pre class="programlisting">typedef enum
 {
@@ -213,7 +227,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_TYPE_SETTING_IP4_CONFIG_ERROR">
+<div class="refsect2">
 <a name="NM-TYPE-SETTING-IP4-CONFIG-ERROR:CAPS"></a><h3>NM_TYPE_SETTING_IP4_CONFIG_ERROR</h3>
 <pre class="programlisting">#define NM_TYPE_SETTING_IP4_CONFIG_ERROR (nm_setting_ip4_config_error_get_type ()) 
 </pre>
@@ -221,7 +235,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_IP4_CONFIG_ERROR">
+<div class="refsect2">
 <a name="NM-SETTING-IP4-CONFIG-ERROR:CAPS"></a><h3>NM_SETTING_IP4_CONFIG_ERROR</h3>
 <pre class="programlisting">#define NM_SETTING_IP4_CONFIG_ERROR nm_setting_ip4_config_error_quark ()
 </pre>
@@ -229,22 +243,14 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip4_config_error_quark ()">
+<div class="refsect2">
 <a name="nm-setting-ip4-config-error-quark"></a><h3>nm_setting_ip4_config_error_quark ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              nm_setting_ip4_config_error_quark   (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_IP4_CONFIG_METHOD">
+<div class="refsect2">
 <a name="NM-SETTING-IP4-CONFIG-METHOD:CAPS"></a><h3>NM_SETTING_IP4_CONFIG_METHOD</h3>
 <pre class="programlisting">#define NM_SETTING_IP4_CONFIG_METHOD             "method"
 </pre>
@@ -252,7 +258,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_IP4_CONFIG_DNS">
+<div class="refsect2">
 <a name="NM-SETTING-IP4-CONFIG-DNS:CAPS"></a><h3>NM_SETTING_IP4_CONFIG_DNS</h3>
 <pre class="programlisting">#define NM_SETTING_IP4_CONFIG_DNS                "dns"
 </pre>
@@ -260,7 +266,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_IP4_CONFIG_DNS_SEARCH">
+<div class="refsect2">
 <a name="NM-SETTING-IP4-CONFIG-DNS-SEARCH:CAPS"></a><h3>NM_SETTING_IP4_CONFIG_DNS_SEARCH</h3>
 <pre class="programlisting">#define NM_SETTING_IP4_CONFIG_DNS_SEARCH         "dns-search"
 </pre>
@@ -268,7 +274,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_IP4_CONFIG_ADDRESSES">
+<div class="refsect2">
 <a name="NM-SETTING-IP4-CONFIG-ADDRESSES:CAPS"></a><h3>NM_SETTING_IP4_CONFIG_ADDRESSES</h3>
 <pre class="programlisting">#define NM_SETTING_IP4_CONFIG_ADDRESSES          "addresses"
 </pre>
@@ -276,7 +282,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_IP4_CONFIG_ROUTES">
+<div class="refsect2">
 <a name="NM-SETTING-IP4-CONFIG-ROUTES:CAPS"></a><h3>NM_SETTING_IP4_CONFIG_ROUTES</h3>
 <pre class="programlisting">#define NM_SETTING_IP4_CONFIG_ROUTES             "routes"
 </pre>
@@ -284,7 +290,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES">
+<div class="refsect2">
 <a name="NM-SETTING-IP4-CONFIG-IGNORE-AUTO-ROUTES:CAPS"></a><h3>NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES</h3>
 <pre class="programlisting">#define NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES "ignore-auto-routes"
 </pre>
@@ -292,7 +298,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS">
+<div class="refsect2">
 <a name="NM-SETTING-IP4-CONFIG-IGNORE-AUTO-DNS:CAPS"></a><h3>NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS</h3>
 <pre class="programlisting">#define NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS    "ignore-auto-dns"
 </pre>
@@ -300,7 +306,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID">
+<div class="refsect2">
 <a name="NM-SETTING-IP4-CONFIG-DHCP-CLIENT-ID:CAPS"></a><h3>NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID</h3>
 <pre class="programlisting">#define NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID     "dhcp-client-id"
 </pre>
@@ -308,7 +314,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME">
+<div class="refsect2">
 <a name="NM-SETTING-IP4-CONFIG-DHCP-SEND-HOSTNAME:CAPS"></a><h3>NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME</h3>
 <pre class="programlisting">#define NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME "dhcp-send-hostname"
 </pre>
@@ -316,7 +322,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME">
+<div class="refsect2">
 <a name="NM-SETTING-IP4-CONFIG-DHCP-HOSTNAME:CAPS"></a><h3>NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME</h3>
 <pre class="programlisting">#define NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME      "dhcp-hostname"
 </pre>
@@ -324,7 +330,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_IP4_CONFIG_NEVER_DEFAULT">
+<div class="refsect2">
 <a name="NM-SETTING-IP4-CONFIG-NEVER-DEFAULT:CAPS"></a><h3>NM_SETTING_IP4_CONFIG_NEVER_DEFAULT</h3>
 <pre class="programlisting">#define NM_SETTING_IP4_CONFIG_NEVER_DEFAULT      "never-default"
 </pre>
@@ -332,7 +338,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_IP4_CONFIG_MAY_FAIL">
+<div class="refsect2">
 <a name="NM-SETTING-IP4-CONFIG-MAY-FAIL:CAPS"></a><h3>NM_SETTING_IP4_CONFIG_MAY_FAIL</h3>
 <pre class="programlisting">#define NM_SETTING_IP4_CONFIG_MAY_FAIL           "may-fail"
 </pre>
@@ -340,7 +346,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_IP4_CONFIG_METHOD_AUTO">
+<div class="refsect2">
 <a name="NM-SETTING-IP4-CONFIG-METHOD-AUTO:CAPS"></a><h3>NM_SETTING_IP4_CONFIG_METHOD_AUTO</h3>
 <pre class="programlisting">#define NM_SETTING_IP4_CONFIG_METHOD_AUTO       "auto"
 </pre>
@@ -348,7 +354,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL">
+<div class="refsect2">
 <a name="NM-SETTING-IP4-CONFIG-METHOD-LINK-LOCAL:CAPS"></a><h3>NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL</h3>
 <pre class="programlisting">#define NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL "link-local"
 </pre>
@@ -356,7 +362,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_IP4_CONFIG_METHOD_MANUAL">
+<div class="refsect2">
 <a name="NM-SETTING-IP4-CONFIG-METHOD-MANUAL:CAPS"></a><h3>NM_SETTING_IP4_CONFIG_METHOD_MANUAL</h3>
 <pre class="programlisting">#define NM_SETTING_IP4_CONFIG_METHOD_MANUAL     "manual"
 </pre>
@@ -364,7 +370,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_IP4_CONFIG_METHOD_SHARED">
+<div class="refsect2">
 <a name="NM-SETTING-IP4-CONFIG-METHOD-SHARED:CAPS"></a><h3>NM_SETTING_IP4_CONFIG_METHOD_SHARED</h3>
 <pre class="programlisting">#define NM_SETTING_IP4_CONFIG_METHOD_SHARED     "shared"
 </pre>
@@ -372,7 +378,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_IP4_CONFIG_METHOD_DISABLED">
+<div class="refsect2">
 <a name="NM-SETTING-IP4-CONFIG-METHOD-DISABLED:CAPS"></a><h3>NM_SETTING_IP4_CONFIG_METHOD_DISABLED</h3>
 <pre class="programlisting">#define NM_SETTING_IP4_CONFIG_METHOD_DISABLED   "disabled"
 </pre>
@@ -380,7 +386,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMIP4Address">
+<div class="refsect2">
 <a name="NMIP4Address"></a><h3>NMIP4Address</h3>
 <pre class="programlisting">typedef struct NMIP4Address NMIP4Address;
 </pre>
@@ -388,237 +394,95 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip4_address_new ()">
+<div class="refsect2">
+<a name="nm-ip4-address-get-type"></a><h3>nm_ip4_address_get_type ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               nm_ip4_address_get_type             (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="nm-ip4-address-new"></a><h3>nm_ip4_address_new ()</h3>
-<pre class="programlisting"><a class="link" href="NMSettingIP4Config.html#NMIP4Address" title="NMIP4Address"><span class="returnvalue">NMIP4Address</span></a> *      nm_ip4_address_new                  (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
+<pre class="programlisting"><a class="link" href="NMSettingIP4Config.html#NMIP4Address"><span class="returnvalue">NMIP4Address</span></a> *      nm_ip4_address_new                  (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip4_address_dup ()">
+<div class="refsect2">
 <a name="nm-ip4-address-dup"></a><h3>nm_ip4_address_dup ()</h3>
-<pre class="programlisting"><a class="link" href="NMSettingIP4Config.html#NMIP4Address" title="NMIP4Address"><span class="returnvalue">NMIP4Address</span></a> *      nm_ip4_address_dup                  (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address" title="NMIP4Address"><span class="type">NMIP4Address</span></a> *source</code></em>);</pre>
+<pre class="programlisting"><a class="link" href="NMSettingIP4Config.html#NMIP4Address"><span class="returnvalue">NMIP4Address</span></a> *      nm_ip4_address_dup                  (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address"><span class="type">NMIP4Address</span></a> *source</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>source</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip4_address_ref ()">
+<div class="refsect2">
 <a name="nm-ip4-address-ref"></a><h3>nm_ip4_address_ref ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip4_address_ref                  (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address" title="NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>);</pre>
+<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip4_address_ref                  (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>address</code></em> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip4_address_unref ()">
+<div class="refsect2">
 <a name="nm-ip4-address-unref"></a><h3>nm_ip4_address_unref ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip4_address_unref                (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address" title="NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>);</pre>
+<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip4_address_unref                (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>address</code></em> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip4_address_compare ()">
+<div class="refsect2">
 <a name="nm-ip4-address-compare"></a><h3>nm_ip4_address_compare ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_ip4_address_compare              (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address" title="NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address" title="NMIP4Address"><span class="type">NMIP4Address</span></a> *other</code></em>);</pre>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_ip4_address_compare              (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address"><span class="type">NMIP4Address</span></a> *other</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>address</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>other</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip4_address_get_address ()">
+<div class="refsect2">
 <a name="nm-ip4-address-get-address"></a><h3>nm_ip4_address_get_address ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_ip4_address_get_address          (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address" title="NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>);</pre>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_ip4_address_get_address          (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>address</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip4_address_set_address ()">
+<div class="refsect2">
 <a name="nm-ip4-address-set-address"></a><h3>nm_ip4_address_set_address ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip4_address_set_address          (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address" title="NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>,
+<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip4_address_set_address          (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> addr</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>address</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>addr</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip4_address_get_prefix ()">
+<div class="refsect2">
 <a name="nm-ip4-address-get-prefix"></a><h3>nm_ip4_address_get_prefix ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_ip4_address_get_prefix           (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address" title="NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>);</pre>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_ip4_address_get_prefix           (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>address</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip4_address_set_prefix ()">
+<div class="refsect2">
 <a name="nm-ip4-address-set-prefix"></a><h3>nm_ip4_address_set_prefix ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip4_address_set_prefix           (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address" title="NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>,
+<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip4_address_set_prefix           (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> prefix</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>address</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>prefix</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip4_address_get_gateway ()">
+<div class="refsect2">
 <a name="nm-ip4-address-get-gateway"></a><h3>nm_ip4_address_get_gateway ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_ip4_address_get_gateway          (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address" title="NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>);</pre>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_ip4_address_get_gateway          (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>address</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip4_address_set_gateway ()">
+<div class="refsect2">
 <a name="nm-ip4-address-set-gateway"></a><h3>nm_ip4_address_set_gateway ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip4_address_set_gateway          (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address" title="NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>,
+<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip4_address_set_gateway          (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> gateway</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>address</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>gateway</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="NMIP4Route">
+<div class="refsect2">
 <a name="NMIP4Route"></a><h3>NMIP4Route</h3>
 <pre class="programlisting">typedef struct NMIP4Route NMIP4Route;
 </pre>
@@ -626,289 +490,117 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip4_route_new ()">
+<div class="refsect2">
+<a name="nm-ip4-route-get-type"></a><h3>nm_ip4_route_get_type ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               nm_ip4_route_get_type               (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="nm-ip4-route-new"></a><h3>nm_ip4_route_new ()</h3>
-<pre class="programlisting"><a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route"><span class="returnvalue">NMIP4Route</span></a> *        nm_ip4_route_new                    (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
+<pre class="programlisting"><a class="link" href="NMSettingIP4Config.html#NMIP4Route"><span class="returnvalue">NMIP4Route</span></a> *        nm_ip4_route_new                    (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip4_route_dup ()">
+<div class="refsect2">
 <a name="nm-ip4-route-dup"></a><h3>nm_ip4_route_dup ()</h3>
-<pre class="programlisting"><a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route"><span class="returnvalue">NMIP4Route</span></a> *        nm_ip4_route_dup                    (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>);</pre>
+<pre class="programlisting"><a class="link" href="NMSettingIP4Config.html#NMIP4Route"><span class="returnvalue">NMIP4Route</span></a> *        nm_ip4_route_dup                    (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>route</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip4_route_ref ()">
+<div class="refsect2">
 <a name="nm-ip4-route-ref"></a><h3>nm_ip4_route_ref ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip4_route_ref                    (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>);</pre>
+<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip4_route_ref                    (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>route</code></em> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip4_route_unref ()">
+<div class="refsect2">
 <a name="nm-ip4-route-unref"></a><h3>nm_ip4_route_unref ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip4_route_unref                  (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>);</pre>
+<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip4_route_unref                  (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>route</code></em> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip4_route_compare ()">
+<div class="refsect2">
 <a name="nm-ip4-route-compare"></a><h3>nm_ip4_route_compare ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_ip4_route_compare                (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route"><span class="type">NMIP4Route</span></a> *other</code></em>);</pre>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_ip4_route_compare                (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route"><span class="type">NMIP4Route</span></a> *other</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>route</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>other</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip4_route_get_dest ()">
+<div class="refsect2">
 <a name="nm-ip4-route-get-dest"></a><h3>nm_ip4_route_get_dest ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_ip4_route_get_dest               (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>);</pre>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_ip4_route_get_dest               (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>route</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip4_route_set_dest ()">
+<div class="refsect2">
 <a name="nm-ip4-route-set-dest"></a><h3>nm_ip4_route_set_dest ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip4_route_set_dest               (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>,
+<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip4_route_set_dest               (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> dest</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>route</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>dest</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip4_route_get_prefix ()">
+<div class="refsect2">
 <a name="nm-ip4-route-get-prefix"></a><h3>nm_ip4_route_get_prefix ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_ip4_route_get_prefix             (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>);</pre>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_ip4_route_get_prefix             (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>route</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip4_route_set_prefix ()">
+<div class="refsect2">
 <a name="nm-ip4-route-set-prefix"></a><h3>nm_ip4_route_set_prefix ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip4_route_set_prefix             (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>,
+<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip4_route_set_prefix             (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> prefix</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>route</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>prefix</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip4_route_get_next_hop ()">
+<div class="refsect2">
 <a name="nm-ip4-route-get-next-hop"></a><h3>nm_ip4_route_get_next_hop ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_ip4_route_get_next_hop           (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>);</pre>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_ip4_route_get_next_hop           (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>route</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip4_route_set_next_hop ()">
+<div class="refsect2">
 <a name="nm-ip4-route-set-next-hop"></a><h3>nm_ip4_route_set_next_hop ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip4_route_set_next_hop           (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>,
+<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip4_route_set_next_hop           (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> next_hop</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>route</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>next_hop</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip4_route_get_metric ()">
+<div class="refsect2">
 <a name="nm-ip4-route-get-metric"></a><h3>nm_ip4_route_get_metric ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_ip4_route_get_metric             (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>);</pre>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_ip4_route_get_metric             (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>route</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip4_route_set_metric ()">
+<div class="refsect2">
 <a name="nm-ip4-route-set-metric"></a><h3>nm_ip4_route_set_metric ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip4_route_set_metric             (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>,
+<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip4_route_set_metric             (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> metric</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>route</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>metric</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="NMSettingIP4Config">
+<div class="refsect2">
 <a name="NMSettingIP4Config-struct"></a><h3>NMSettingIP4Config</h3>
 <pre class="programlisting">typedef struct _NMSettingIP4Config NMSettingIP4Config;</pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMSettingIP4ConfigClass">
+<div class="refsect2">
 <a name="NMSettingIP4ConfigClass"></a><h3>NMSettingIP4ConfigClass</h3>
 <pre class="programlisting">typedef struct {
 	NMSettingClass parent;
@@ -924,694 +616,246 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip4_config_get_type ()">
+<div class="refsect2">
 <a name="nm-setting-ip4-config-get-type"></a><h3>nm_setting_ip4_config_get_type ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               nm_setting_ip4_config_get_type      (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip4_config_new ()">
+<div class="refsect2">
 <a name="nm-setting-ip4-config-new"></a><h3>nm_setting_ip4_config_new ()</h3>
 <pre class="programlisting"><a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *         nm_setting_ip4_config_new           (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip4_config_get_method ()">
+<div class="refsect2">
 <a name="nm-setting-ip4-config-get-method"></a><h3>nm_setting_ip4_config_get_method ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_ip4_config_get_method    (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip4_config_get_num_dns ()">
+<div class="refsect2">
 <a name="nm-setting-ip4-config-get-num-dns"></a><h3>nm_setting_ip4_config_get_num_dns ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_setting_ip4_config_get_num_dns   (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip4_config_get_dns ()">
+<div class="refsect2">
 <a name="nm-setting-ip4-config-get-dns"></a><h3>nm_setting_ip4_config_get_dns ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_setting_ip4_config_get_dns       (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> i</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>i</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip4_config_add_dns ()">
+<div class="refsect2">
 <a name="nm-setting-ip4-config-add-dns"></a><h3>nm_setting_ip4_config_add_dns ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_ip4_config_add_dns       (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> dns</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>dns</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip4_config_remove_dns ()">
+<div class="refsect2">
 <a name="nm-setting-ip4-config-remove-dns"></a><h3>nm_setting_ip4_config_remove_dns ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_setting_ip4_config_remove_dns    (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> i</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>i</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip4_config_clear_dns ()">
+<div class="refsect2">
 <a name="nm-setting-ip4-config-clear-dns"></a><h3>nm_setting_ip4_config_clear_dns ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_setting_ip4_config_clear_dns     (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip4_config_get_num_dns_searches ()">
+<div class="refsect2">
 <a name="nm-setting-ip4-config-get-num-dns-searches"></a><h3>nm_setting_ip4_config_get_num_dns_searches ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_setting_ip4_config_get_num_dns_searches
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip4_config_get_dns_search ()">
+<div class="refsect2">
 <a name="nm-setting-ip4-config-get-dns-search"></a><h3>nm_setting_ip4_config_get_dns_search ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_ip4_config_get_dns_search
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> i</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>i</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip4_config_add_dns_search ()">
+<div class="refsect2">
 <a name="nm-setting-ip4-config-add-dns-search"></a><h3>nm_setting_ip4_config_add_dns_search ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_ip4_config_add_dns_search
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *dns_search</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>dns_search</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip4_config_remove_dns_search ()">
+<div class="refsect2">
 <a name="nm-setting-ip4-config-remove-dns-search"></a><h3>nm_setting_ip4_config_remove_dns_search ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_setting_ip4_config_remove_dns_search
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> i</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>i</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip4_config_clear_dns_searches ()">
+<div class="refsect2">
 <a name="nm-setting-ip4-config-clear-dns-searches"></a><h3>nm_setting_ip4_config_clear_dns_searches ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_setting_ip4_config_clear_dns_searches
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip4_config_get_num_addresses ()">
+<div class="refsect2">
 <a name="nm-setting-ip4-config-get-num-addresses"></a><h3>nm_setting_ip4_config_get_num_addresses ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_setting_ip4_config_get_num_addresses
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip4_config_get_address ()">
+<div class="refsect2">
 <a name="nm-setting-ip4-config-get-address"></a><h3>nm_setting_ip4_config_get_address ()</h3>
-<pre class="programlisting"><a class="link" href="NMSettingIP4Config.html#NMIP4Address" title="NMIP4Address"><span class="returnvalue">NMIP4Address</span></a> *      nm_setting_ip4_config_get_address   (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>,
+<pre class="programlisting"><a class="link" href="NMSettingIP4Config.html#NMIP4Address"><span class="returnvalue">NMIP4Address</span></a> *      nm_setting_ip4_config_get_address   (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> i</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>i</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip4_config_add_address ()">
+<div class="refsect2">
 <a name="nm-setting-ip4-config-add-address"></a><h3>nm_setting_ip4_config_add_address ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_ip4_config_add_address   (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address" title="NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>);</pre>
+                                                         <em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>address</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip4_config_remove_address ()">
+<div class="refsect2">
 <a name="nm-setting-ip4-config-remove-address"></a><h3>nm_setting_ip4_config_remove_address ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_setting_ip4_config_remove_address
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> i</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>i</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip4_config_clear_addresses ()">
+<div class="refsect2">
 <a name="nm-setting-ip4-config-clear-addresses"></a><h3>nm_setting_ip4_config_clear_addresses ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_setting_ip4_config_clear_addresses
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip4_config_get_num_routes ()">
+<div class="refsect2">
 <a name="nm-setting-ip4-config-get-num-routes"></a><h3>nm_setting_ip4_config_get_num_routes ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_setting_ip4_config_get_num_routes
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip4_config_get_route ()">
+<div class="refsect2">
 <a name="nm-setting-ip4-config-get-route"></a><h3>nm_setting_ip4_config_get_route ()</h3>
-<pre class="programlisting"><a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route"><span class="returnvalue">NMIP4Route</span></a> *        nm_setting_ip4_config_get_route     (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>,
+<pre class="programlisting"><a class="link" href="NMSettingIP4Config.html#NMIP4Route"><span class="returnvalue">NMIP4Route</span></a> *        nm_setting_ip4_config_get_route     (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> i</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>i</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip4_config_add_route ()">
+<div class="refsect2">
 <a name="nm-setting-ip4-config-add-route"></a><h3>nm_setting_ip4_config_add_route ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_ip4_config_add_route     (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>);</pre>
+                                                         <em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>route</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip4_config_remove_route ()">
+<div class="refsect2">
 <a name="nm-setting-ip4-config-remove-route"></a><h3>nm_setting_ip4_config_remove_route ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_setting_ip4_config_remove_route  (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> i</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>i</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip4_config_clear_routes ()">
+<div class="refsect2">
 <a name="nm-setting-ip4-config-clear-routes"></a><h3>nm_setting_ip4_config_clear_routes ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_setting_ip4_config_clear_routes  (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip4_config_get_ignore_auto_routes ()">
+<div class="refsect2">
 <a name="nm-setting-ip4-config-get-ignore-auto-routes"></a><h3>nm_setting_ip4_config_get_ignore_auto_routes ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_ip4_config_get_ignore_auto_routes
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip4_config_get_ignore_auto_dns ()">
+<div class="refsect2">
 <a name="nm-setting-ip4-config-get-ignore-auto-dns"></a><h3>nm_setting_ip4_config_get_ignore_auto_dns ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_ip4_config_get_ignore_auto_dns
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip4_config_get_dhcp_client_id ()">
+<div class="refsect2">
 <a name="nm-setting-ip4-config-get-dhcp-client-id"></a><h3>nm_setting_ip4_config_get_dhcp_client_id ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_ip4_config_get_dhcp_client_id
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip4_config_get_dhcp_send_hostname ()">
+<div class="refsect2">
 <a name="nm-setting-ip4-config-get-dhcp-send-hostname"></a><h3>nm_setting_ip4_config_get_dhcp_send_hostname ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_ip4_config_get_dhcp_send_hostname
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip4_config_get_dhcp_hostname ()">
+<div class="refsect2">
 <a name="nm-setting-ip4-config-get-dhcp-hostname"></a><h3>nm_setting_ip4_config_get_dhcp_hostname ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_ip4_config_get_dhcp_hostname
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip4_config_get_never_default ()">
+<div class="refsect2">
 <a name="nm-setting-ip4-config-get-never-default"></a><h3>nm_setting_ip4_config_get_never_default ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_ip4_config_get_never_default
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip4_config_get_may_fail ()">
+<div class="refsect2">
 <a name="nm-setting-ip4-config-get-may-fail"></a><h3>nm_setting_ip4_config_get_may_fail ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_ip4_config_get_may_fail  (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 </div>
-<div class="refsect1" title="Property Details">
+<div class="refsect1">
 <a name="NMSettingIP4Config.property-details"></a><h2>Property Details</h2>
-<div class="refsect2" title='The "addresses" property'>
+<div class="refsect2">
 <a name="NMSettingIP4Config--addresses"></a><h3>The <code class="literal">"addresses"</code> property</h3>
 <pre class="programlisting">  "addresses"                <span class="type">GPtrArray_GArray_guint__</span>*  : Read / Write</pre>
 <p>
@@ -1626,7 +870,7 @@ either automatic or disabled with these methods.
 </p>
 </div>
 <hr>
-<div class="refsect2" title='The "dhcp-client-id" property'>
+<div class="refsect2">
 <a name="NMSettingIP4Config--dhcp-client-id"></a><h3>The <code class="literal">"dhcp-client-id"</code> property</h3>
 <pre class="programlisting">  "dhcp-client-id"           <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -1636,7 +880,7 @@ DHCP server may use to cusomize the DHCP lease and options.
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "dhcp-hostname" property'>
+<div class="refsect2">
 <a name="NMSettingIP4Config--dhcp-hostname"></a><h3>The <code class="literal">"dhcp-hostname"</code> property</h3>
 <pre class="programlisting">  "dhcp-hostname"            <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -1646,7 +890,7 @@ specified name will be sent to the DHCP server when acquiring a lease.
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "dhcp-send-hostname" property'>
+<div class="refsect2">
 <a name="NMSettingIP4Config--dhcp-send-hostname"></a><h3>The <code class="literal">"dhcp-send-hostname"</code> property</h3>
 <pre class="programlisting">  "dhcp-send-hostname"       <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write / Construct</pre>
 <p>
@@ -1659,7 +903,7 @@ the current persistent hostname of the computer is sent.
 <p>Default value: TRUE</p>
 </div>
 <hr>
-<div class="refsect2" title='The "dns" property'>
+<div class="refsect2">
 <a name="NMSettingIP4Config--dns"></a><h3>The <code class="literal">"dns"</code> property</h3>
 <pre class="programlisting">  "dns"                      <span class="type">GArray_guint_</span>*        : Read / Write</pre>
 <p>
@@ -1672,7 +916,7 @@ connection.
 </p>
 </div>
 <hr>
-<div class="refsect2" title='The "dns-search" property'>
+<div class="refsect2">
 <a name="NMSettingIP4Config--dns-search"></a><h3>The <code class="literal">"dns-search"</code> property</h3>
 <pre class="programlisting">  "dns-search"               <span class="type">GSList_gchararray_</span>*   : Read / Write</pre>
 <p>
@@ -1684,7 +928,7 @@ are used as the only search domains for this connection.
 </p>
 </div>
 <hr>
-<div class="refsect2" title='The "ignore-auto-dns" property'>
+<div class="refsect2">
 <a name="NMSettingIP4Config--ignore-auto-dns"></a><h3>The <code class="literal">"ignore-auto-dns"</code> property</h3>
 <pre class="programlisting">  "ignore-auto-dns"          <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write / Construct</pre>
 <p>
@@ -1696,7 +940,7 @@ and search domains specified in <a class="link" href="NMSettingIP4Config.html#NM
 <p>Default value: FALSE</p>
 </div>
 <hr>
-<div class="refsect2" title='The "ignore-auto-routes" property'>
+<div class="refsect2">
 <a name="NMSettingIP4Config--ignore-auto-routes"></a><h3>The <code class="literal">"ignore-auto-routes"</code> property</h3>
 <pre class="programlisting">  "ignore-auto-routes"       <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write / Construct</pre>
 <p>
@@ -1707,7 +951,7 @@ configured routes are ignored and only routes specified in
 <p>Default value: FALSE</p>
 </div>
 <hr>
-<div class="refsect2" title='The "may-fail" property'>
+<div class="refsect2">
 <a name="NMSettingIP4Config--may-fail"></a><h3>The <code class="literal">"may-fail"</code> property</h3>
 <pre class="programlisting">  "may-fail"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write / Construct</pre>
 <p>
@@ -1721,7 +965,7 @@ but IPv6 configuration completes successfully.
 <p>Default value: FALSE</p>
 </div>
 <hr>
-<div class="refsect2" title='The "method" property'>
+<div class="refsect2">
 <a name="NMSettingIP4Config--method"></a><h3>The <code class="literal">"method"</code> property</h3>
 <pre class="programlisting">  "method"                   <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -1741,7 +985,7 @@ This property must be set.
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "never-default" property'>
+<div class="refsect2">
 <a name="NMSettingIP4Config--never-default"></a><h3>The <code class="literal">"never-default"</code> property</h3>
 <pre class="programlisting">  "never-default"            <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write / Construct</pre>
 <p>
@@ -1751,7 +995,7 @@ meaning it will never be assigned the default route by NetworkManager.
 <p>Default value: FALSE</p>
 </div>
 <hr>
-<div class="refsect2" title='The "routes" property'>
+<div class="refsect2">
 <a name="NMSettingIP4Config--routes"></a><h3>The <code class="literal">"routes"</code> property</h3>
 <pre class="programlisting">  "routes"                   <span class="type">GPtrArray_GArray_guint__</span>*  : Read / Write</pre>
 <p>
@@ -1769,6 +1013,6 @@ or 'disabled' methods because there is no upstream network.
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.15</div>
+          Generated by GTK-Doc V1.17</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingIP6Config.html b/docs/libnm-util/html/NMSettingIP6Config.html
index 4e80d9054..060c80fe2 100644
--- a/docs/libnm-util/html/NMSettingIP6Config.html
+++ b/docs/libnm-util/html/NMSettingIP6Config.html
@@ -3,12 +3,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>NMSettingIP6Config</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="libnm-util Reference Manual">
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingIP4Config.html" title="NMSettingIP4Config">
 <link rel="next" href="NMSettingPPP.html" title="NMSettingPPP">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,7 +30,7 @@
                   <a href="#NMSettingIP6Config.properties" class="shortcut">Properties</a>
 </td></tr>
 </table>
-<div class="refentry" title="NMSettingIP6Config">
+<div class="refentry">
 <a name="NMSettingIP6Config"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
@@ -39,10 +39,10 @@
 </td>
 <td valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv" title="Synopsis">
+<div class="refsynopsisdiv">
 <a name="NMSettingIP6Config.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">#define             <a class="link" href="NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-SETTING-NAME:CAPS" title="NM_SETTING_IP6_CONFIG_SETTING_NAME">NM_SETTING_IP6_CONFIG_SETTING_NAME</a>
-enum                <a class="link" href="NMSettingIP6Config.html#NMSettingIP6ConfigError" title="enum NMSettingIP6ConfigError">NMSettingIP6ConfigError</a>;
+<a name="NMSettingIP6ConfigError"></a><a name="NMIP6Address"></a><a name="NMIP6Route"></a><pre class="synopsis">#define             <a class="link" href="NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-SETTING-NAME:CAPS" title="NM_SETTING_IP6_CONFIG_SETTING_NAME">NM_SETTING_IP6_CONFIG_SETTING_NAME</a>
+enum                <a class="link" href="NMSettingIP6Config.html#NMSettingIP6ConfigError">NMSettingIP6ConfigError</a>;
 #define             <a class="link" href="NMSettingIP6Config.html#NM-TYPE-SETTING-IP6-CONFIG-ERROR:CAPS" title="NM_TYPE_SETTING_IP6_CONFIG_ERROR">NM_TYPE_SETTING_IP6_CONFIG_ERROR</a>
 #define             <a class="link" href="NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-ERROR:CAPS" title="NM_SETTING_IP6_CONFIG_ERROR">NM_SETTING_IP6_CONFIG_ERROR</a>
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              <a class="link" href="NMSettingIP6Config.html#nm-setting-ip6-config-error-quark" title="nm_setting_ip6_config_error_quark ()">nm_setting_ip6_config_error_quark</a>   (<em class="parameter"><code><span class="type">void</span></code></em>);
@@ -61,46 +61,49 @@ enum                <a class="link" href="NMSettingIP6Config.html#NMSettingIP6Co
 #define             <a class="link" href="NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-METHOD-LINK-LOCAL:CAPS" title="NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL">NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL</a>
 #define             <a class="link" href="NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-METHOD-MANUAL:CAPS" title="NM_SETTING_IP6_CONFIG_METHOD_MANUAL">NM_SETTING_IP6_CONFIG_METHOD_MANUAL</a>
 #define             <a class="link" href="NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-METHOD-SHARED:CAPS" title="NM_SETTING_IP6_CONFIG_METHOD_SHARED">NM_SETTING_IP6_CONFIG_METHOD_SHARED</a>
-typedef             <a class="link" href="NMSettingIP6Config.html#NMIP6Address" title="NMIP6Address">NMIP6Address</a>;
-<a class="link" href="NMSettingIP6Config.html#NMIP6Address" title="NMIP6Address"><span class="returnvalue">NMIP6Address</span></a> *      <a class="link" href="NMSettingIP6Config.html#nm-ip6-address-new" title="nm_ip6_address_new ()">nm_ip6_address_new</a>                  (<em class="parameter"><code><span class="type">void</span></code></em>);
-<a class="link" href="NMSettingIP6Config.html#NMIP6Address" title="NMIP6Address"><span class="returnvalue">NMIP6Address</span></a> *      <a class="link" href="NMSettingIP6Config.html#nm-ip6-address-dup" title="nm_ip6_address_dup ()">nm_ip6_address_dup</a>                  (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address" title="NMIP6Address"><span class="type">NMIP6Address</span></a> *source</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP6Config.html#nm-ip6-address-ref" title="nm_ip6_address_ref ()">nm_ip6_address_ref</a>                  (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address" title="NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP6Config.html#nm-ip6-address-unref" title="nm_ip6_address_unref ()">nm_ip6_address_unref</a>                (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address" title="NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMSettingIP6Config.html#nm-ip6-address-compare" title="nm_ip6_address_compare ()">nm_ip6_address_compare</a>              (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address" title="NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address" title="NMIP6Address"><span class="type">NMIP6Address</span></a> *other</code></em>);
-const struct <span class="returnvalue">in6_addr</span> * <a class="link" href="NMSettingIP6Config.html#nm-ip6-address-get-address" title="nm_ip6_address_get_address ()">nm_ip6_address_get_address</a>      (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address" title="NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP6Config.html#nm-ip6-address-set-address" title="nm_ip6_address_set_address ()">nm_ip6_address_set_address</a>          (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address" title="NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>,
+typedef             <a class="link" href="NMSettingIP6Config.html#NMIP6Address">NMIP6Address</a>;
+<a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               <a class="link" href="NMSettingIP6Config.html#nm-ip6-address-get-type" title="nm_ip6_address_get_type ()">nm_ip6_address_get_type</a>             (<em class="parameter"><code><span class="type">void</span></code></em>);
+<a class="link" href="NMSettingIP6Config.html#NMIP6Address"><span class="returnvalue">NMIP6Address</span></a> *          <a class="link" href="NMSettingIP6Config.html#nm-ip6-address-new" title="nm_ip6_address_new ()">nm_ip6_address_new</a>              (<em class="parameter"><code><span class="type">void</span></code></em>);
+<a class="link" href="NMSettingIP6Config.html#NMIP6Address"><span class="returnvalue">NMIP6Address</span></a> *          <a class="link" href="NMSettingIP6Config.html#nm-ip6-address-dup" title="nm_ip6_address_dup ()">nm_ip6_address_dup</a>              (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address"><span class="type">NMIP6Address</span></a> *source</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP6Config.html#nm-ip6-address-ref" title="nm_ip6_address_ref ()">nm_ip6_address_ref</a>                  (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP6Config.html#nm-ip6-address-unref" title="nm_ip6_address_unref ()">nm_ip6_address_unref</a>                (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>);
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMSettingIP6Config.html#nm-ip6-address-compare" title="nm_ip6_address_compare ()">nm_ip6_address_compare</a>              (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address"><span class="type">NMIP6Address</span></a> *other</code></em>);
+const struct <span class="returnvalue">in6_addr</span> * <a class="link" href="NMSettingIP6Config.html#nm-ip6-address-get-address" title="nm_ip6_address_get_address ()">nm_ip6_address_get_address</a>      (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP6Config.html#nm-ip6-address-set-address" title="nm_ip6_address_set_address ()">nm_ip6_address_set_address</a>          (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>,
                                                          <em class="parameter"><code>const <span class="type">struct in6_addr</span> *addr</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             <a class="link" href="NMSettingIP6Config.html#nm-ip6-address-get-prefix" title="nm_ip6_address_get_prefix ()">nm_ip6_address_get_prefix</a>           (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address" title="NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP6Config.html#nm-ip6-address-set-prefix" title="nm_ip6_address_set_prefix ()">nm_ip6_address_set_prefix</a>           (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address" title="NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>,
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             <a class="link" href="NMSettingIP6Config.html#nm-ip6-address-get-prefix" title="nm_ip6_address_get_prefix ()">nm_ip6_address_get_prefix</a>           (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP6Config.html#nm-ip6-address-set-prefix" title="nm_ip6_address_set_prefix ()">nm_ip6_address_set_prefix</a>           (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> prefix</code></em>);
-const struct <span class="returnvalue">in6_addr</span> * <a class="link" href="NMSettingIP6Config.html#nm-ip6-address-get-gateway" title="nm_ip6_address_get_gateway ()">nm_ip6_address_get_gateway</a>      (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address" title="NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP6Config.html#nm-ip6-address-set-gateway" title="nm_ip6_address_set_gateway ()">nm_ip6_address_set_gateway</a>          (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address" title="NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>,
+const struct <span class="returnvalue">in6_addr</span> * <a class="link" href="NMSettingIP6Config.html#nm-ip6-address-get-gateway" title="nm_ip6_address_get_gateway ()">nm_ip6_address_get_gateway</a>      (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP6Config.html#nm-ip6-address-set-gateway" title="nm_ip6_address_set_gateway ()">nm_ip6_address_set_gateway</a>          (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>,
                                                          <em class="parameter"><code>const <span class="type">struct in6_addr</span> *gw</code></em>);
-typedef             <a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route">NMIP6Route</a>;
-<a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route"><span class="returnvalue">NMIP6Route</span></a> *        <a class="link" href="NMSettingIP6Config.html#nm-ip6-route-new" title="nm_ip6_route_new ()">nm_ip6_route_new</a>                    (<em class="parameter"><code><span class="type">void</span></code></em>);
-<a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route"><span class="returnvalue">NMIP6Route</span></a> *        <a class="link" href="NMSettingIP6Config.html#nm-ip6-route-dup" title="nm_ip6_route_dup ()">nm_ip6_route_dup</a>                    (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP6Config.html#nm-ip6-route-ref" title="nm_ip6_route_ref ()">nm_ip6_route_ref</a>                    (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP6Config.html#nm-ip6-route-unref" title="nm_ip6_route_unref ()">nm_ip6_route_unref</a>                  (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMSettingIP6Config.html#nm-ip6-route-compare" title="nm_ip6_route_compare ()">nm_ip6_route_compare</a>                (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route"><span class="type">NMIP6Route</span></a> *other</code></em>);
-const struct <span class="returnvalue">in6_addr</span> * <a class="link" href="NMSettingIP6Config.html#nm-ip6-route-get-dest" title="nm_ip6_route_get_dest ()">nm_ip6_route_get_dest</a>           (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP6Config.html#nm-ip6-route-set-dest" title="nm_ip6_route_set_dest ()">nm_ip6_route_set_dest</a>               (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>,
+typedef             <a class="link" href="NMSettingIP6Config.html#NMIP6Route">NMIP6Route</a>;
+<a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               <a class="link" href="NMSettingIP6Config.html#nm-ip6-route-get-type" title="nm_ip6_route_get_type ()">nm_ip6_route_get_type</a>               (<em class="parameter"><code><span class="type">void</span></code></em>);
+<a class="link" href="NMSettingIP6Config.html#NMIP6Route"><span class="returnvalue">NMIP6Route</span></a> *            <a class="link" href="NMSettingIP6Config.html#nm-ip6-route-new" title="nm_ip6_route_new ()">nm_ip6_route_new</a>                (<em class="parameter"><code><span class="type">void</span></code></em>);
+<a class="link" href="NMSettingIP6Config.html#NMIP6Route"><span class="returnvalue">NMIP6Route</span></a> *            <a class="link" href="NMSettingIP6Config.html#nm-ip6-route-dup" title="nm_ip6_route_dup ()">nm_ip6_route_dup</a>                (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP6Config.html#nm-ip6-route-ref" title="nm_ip6_route_ref ()">nm_ip6_route_ref</a>                    (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP6Config.html#nm-ip6-route-unref" title="nm_ip6_route_unref ()">nm_ip6_route_unref</a>                  (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>);
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMSettingIP6Config.html#nm-ip6-route-compare" title="nm_ip6_route_compare ()">nm_ip6_route_compare</a>                (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route"><span class="type">NMIP6Route</span></a> *other</code></em>);
+const struct <span class="returnvalue">in6_addr</span> * <a class="link" href="NMSettingIP6Config.html#nm-ip6-route-get-dest" title="nm_ip6_route_get_dest ()">nm_ip6_route_get_dest</a>           (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP6Config.html#nm-ip6-route-set-dest" title="nm_ip6_route_set_dest ()">nm_ip6_route_set_dest</a>               (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>,
                                                          <em class="parameter"><code>const <span class="type">struct in6_addr</span> *dest</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             <a class="link" href="NMSettingIP6Config.html#nm-ip6-route-get-prefix" title="nm_ip6_route_get_prefix ()">nm_ip6_route_get_prefix</a>             (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP6Config.html#nm-ip6-route-set-prefix" title="nm_ip6_route_set_prefix ()">nm_ip6_route_set_prefix</a>             (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>,
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             <a class="link" href="NMSettingIP6Config.html#nm-ip6-route-get-prefix" title="nm_ip6_route_get_prefix ()">nm_ip6_route_get_prefix</a>             (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP6Config.html#nm-ip6-route-set-prefix" title="nm_ip6_route_set_prefix ()">nm_ip6_route_set_prefix</a>             (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> prefix</code></em>);
-const struct <span class="returnvalue">in6_addr</span> * <a class="link" href="NMSettingIP6Config.html#nm-ip6-route-get-next-hop" title="nm_ip6_route_get_next_hop ()">nm_ip6_route_get_next_hop</a>       (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP6Config.html#nm-ip6-route-set-next-hop" title="nm_ip6_route_set_next_hop ()">nm_ip6_route_set_next_hop</a>           (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>,
+const struct <span class="returnvalue">in6_addr</span> * <a class="link" href="NMSettingIP6Config.html#nm-ip6-route-get-next-hop" title="nm_ip6_route_get_next_hop ()">nm_ip6_route_get_next_hop</a>       (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP6Config.html#nm-ip6-route-set-next-hop" title="nm_ip6_route_set_next_hop ()">nm_ip6_route_set_next_hop</a>           (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>,
                                                          <em class="parameter"><code>const <span class="type">struct in6_addr</span> *next_hop</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             <a class="link" href="NMSettingIP6Config.html#nm-ip6-route-get-metric" title="nm_ip6_route_get_metric ()">nm_ip6_route_get_metric</a>             (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP6Config.html#nm-ip6-route-set-metric" title="nm_ip6_route_set_metric ()">nm_ip6_route_set_metric</a>             (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>,
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             <a class="link" href="NMSettingIP6Config.html#nm-ip6-route-get-metric" title="nm_ip6_route_get_metric ()">nm_ip6_route_get_metric</a>             (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP6Config.html#nm-ip6-route-set-metric" title="nm_ip6_route_set_metric ()">nm_ip6_route_set_metric</a>             (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> metric</code></em>);
                     <a class="link" href="NMSettingIP6Config.html#NMSettingIP6Config-struct" title="NMSettingIP6Config">NMSettingIP6Config</a>;
                     <a class="link" href="NMSettingIP6Config.html#NMSettingIP6ConfigClass" title="NMSettingIP6ConfigClass">NMSettingIP6ConfigClass</a>;
 <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               <a class="link" href="NMSettingIP6Config.html#nm-setting-ip6-config-get-type" title="nm_setting_ip6_config_get_type ()">nm_setting_ip6_config_get_type</a>      (<em class="parameter"><code><span class="type">void</span></code></em>);
-<a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *         <a class="link" href="NMSettingIP6Config.html#nm-setting-ip6-config-new" title="nm_setting_ip6_config_new ()">nm_setting_ip6_config_new</a>           (<em class="parameter"><code><span class="type">void</span></code></em>);
-const <span class="returnvalue">char</span> *        <a class="link" href="NMSettingIP6Config.html#nm-setting-ip6-config-get-method" title="nm_setting_ip6_config_get_method ()">nm_setting_ip6_config_get_method</a>    (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>);
+<a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *             <a class="link" href="NMSettingIP6Config.html#nm-setting-ip6-config-new" title="nm_setting_ip6_config_new ()">nm_setting_ip6_config_new</a>       (<em class="parameter"><code><span class="type">void</span></code></em>);
+const <span class="returnvalue">char</span> *            <a class="link" href="NMSettingIP6Config.html#nm-setting-ip6-config-get-method" title="nm_setting_ip6_config_get_method ()">nm_setting_ip6_config_get_method</a>
+                                                        (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>);
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             <a class="link" href="NMSettingIP6Config.html#nm-setting-ip6-config-get-num-dns" title="nm_setting_ip6_config_get_num_dns ()">nm_setting_ip6_config_get_num_dns</a>   (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>);
 const struct <span class="returnvalue">in6_addr</span> * <a class="link" href="NMSettingIP6Config.html#nm-setting-ip6-config-get-dns" title="nm_setting_ip6_config_get_dns ()">nm_setting_ip6_config_get_dns</a>   (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> i</code></em>);
@@ -111,7 +114,7 @@ const struct <span class="returnvalue">in6_addr</span> * <a class="link" href="N
 <span class="returnvalue">void</span>                <a class="link" href="NMSettingIP6Config.html#nm-setting-ip6-config-clear-dns" title="nm_setting_ip6_config_clear_dns ()">nm_setting_ip6_config_clear_dns</a>     (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>);
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             <a class="link" href="NMSettingIP6Config.html#nm-setting-ip6-config-get-num-dns-searches" title="nm_setting_ip6_config_get_num_dns_searches ()">nm_setting_ip6_config_get_num_dns_searches</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>);
-const <span class="returnvalue">char</span> *        <a class="link" href="NMSettingIP6Config.html#nm-setting-ip6-config-get-dns-search" title="nm_setting_ip6_config_get_dns_search ()">nm_setting_ip6_config_get_dns_search</a>
+const <span class="returnvalue">char</span> *            <a class="link" href="NMSettingIP6Config.html#nm-setting-ip6-config-get-dns-search" title="nm_setting_ip6_config_get_dns_search ()">nm_setting_ip6_config_get_dns_search</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> i</code></em>);
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMSettingIP6Config.html#nm-setting-ip6-config-add-dns-search" title="nm_setting_ip6_config_add_dns_search ()">nm_setting_ip6_config_add_dns_search</a>
@@ -124,10 +127,11 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>);
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             <a class="link" href="NMSettingIP6Config.html#nm-setting-ip6-config-get-num-addresses" title="nm_setting_ip6_config_get_num_addresses ()">nm_setting_ip6_config_get_num_addresses</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>);
-<a class="link" href="NMSettingIP6Config.html#NMIP6Address" title="NMIP6Address"><span class="returnvalue">NMIP6Address</span></a> *      <a class="link" href="NMSettingIP6Config.html#nm-setting-ip6-config-get-address" title="nm_setting_ip6_config_get_address ()">nm_setting_ip6_config_get_address</a>   (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>,
+<a class="link" href="NMSettingIP6Config.html#NMIP6Address"><span class="returnvalue">NMIP6Address</span></a> *          <a class="link" href="NMSettingIP6Config.html#nm-setting-ip6-config-get-address" title="nm_setting_ip6_config_get_address ()">nm_setting_ip6_config_get_address</a>
+                                                        (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> i</code></em>);
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMSettingIP6Config.html#nm-setting-ip6-config-add-address" title="nm_setting_ip6_config_add_address ()">nm_setting_ip6_config_add_address</a>   (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address" title="NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>);
+                                                         <em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="NMSettingIP6Config.html#nm-setting-ip6-config-remove-address" title="nm_setting_ip6_config_remove_address ()">nm_setting_ip6_config_remove_address</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> i</code></em>);
@@ -135,10 +139,10 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>);
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             <a class="link" href="NMSettingIP6Config.html#nm-setting-ip6-config-get-num-routes" title="nm_setting_ip6_config_get_num_routes ()">nm_setting_ip6_config_get_num_routes</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>);
-<a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route"><span class="returnvalue">NMIP6Route</span></a> *        <a class="link" href="NMSettingIP6Config.html#nm-setting-ip6-config-get-route" title="nm_setting_ip6_config_get_route ()">nm_setting_ip6_config_get_route</a>     (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>,
+<a class="link" href="NMSettingIP6Config.html#NMIP6Route"><span class="returnvalue">NMIP6Route</span></a> *            <a class="link" href="NMSettingIP6Config.html#nm-setting-ip6-config-get-route" title="nm_setting_ip6_config_get_route ()">nm_setting_ip6_config_get_route</a> (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> i</code></em>);
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMSettingIP6Config.html#nm-setting-ip6-config-add-route" title="nm_setting_ip6_config_add_route ()">nm_setting_ip6_config_add_route</a>     (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>);
+                                                         <em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="NMSettingIP6Config.html#nm-setting-ip6-config-remove-route" title="nm_setting_ip6_config_remove_route ()">nm_setting_ip6_config_remove_route</a>  (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> i</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="NMSettingIP6Config.html#nm-setting-ip6-config-clear-routes" title="nm_setting_ip6_config_clear_routes ()">nm_setting_ip6_config_clear_routes</a>  (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>);
@@ -151,15 +155,27 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMSettingIP6Config.html#nm-setting-ip6-config-get-may-fail" title="nm_setting_ip6_config_get_may_fail ()">nm_setting_ip6_config_get_may_fail</a>  (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>);
 </pre>
 </div>
-<div class="refsect1" title="Object Hierarchy">
+<div class="refsect1">
 <a name="NMSettingIP6Config.object-hierarchy"></a><h2>Object Hierarchy</h2>
 <pre class="synopsis">
+  GEnum
+   +----NMSettingIP6ConfigError
+</pre>
+<pre class="synopsis">
+  GBoxed
+   +----NMIP6Address
+</pre>
+<pre class="synopsis">
+  GBoxed
+   +----NMIP6Route
+</pre>
+<pre class="synopsis">
   <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>
    +----<a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
          +----NMSettingIP6Config
 </pre>
 </div>
-<div class="refsect1" title="Properties">
+<div class="refsect1">
 <a name="NMSettingIP6Config.properties"></a><h2>Properties</h2>
 <pre class="synopsis">
   "<a class="link" href="NMSettingIP6Config.html#NMSettingIP6Config--addresses" title='The "addresses" property'>addresses</a>"                <span class="type">GPtrArray_GValueArray_GArray_guchar_+guint+GArray_guchar___*</span>  : Read / Write
@@ -173,14 +189,14 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
   "<a class="link" href="NMSettingIP6Config.html#NMSettingIP6Config--routes" title='The "routes" property'>routes</a>"                   <span class="type">GPtrArray_GValueArray_GArray_guchar_+guint+GArray_guchar_+guint__*</span>  : Read / Write
 </pre>
 </div>
-<div class="refsect1" title="Description">
+<div class="refsect1">
 <a name="NMSettingIP6Config.description"></a><h2>Description</h2>
 <p>
 </p>
 </div>
-<div class="refsect1" title="Details">
+<div class="refsect1">
 <a name="NMSettingIP6Config.details"></a><h2>Details</h2>
-<div class="refsect2" title="NM_SETTING_IP6_CONFIG_SETTING_NAME">
+<div class="refsect2">
 <a name="NM-SETTING-IP6-CONFIG-SETTING-NAME:CAPS"></a><h3>NM_SETTING_IP6_CONFIG_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_IP6_CONFIG_SETTING_NAME "ipv6"
 </pre>
@@ -188,7 +204,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="enum NMSettingIP6ConfigError">
+<div class="refsect2">
 <a name="NMSettingIP6ConfigError"></a><h3>enum NMSettingIP6ConfigError</h3>
 <pre class="programlisting">typedef enum
 {
@@ -202,7 +218,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_TYPE_SETTING_IP6_CONFIG_ERROR">
+<div class="refsect2">
 <a name="NM-TYPE-SETTING-IP6-CONFIG-ERROR:CAPS"></a><h3>NM_TYPE_SETTING_IP6_CONFIG_ERROR</h3>
 <pre class="programlisting">#define NM_TYPE_SETTING_IP6_CONFIG_ERROR (nm_setting_ip6_config_error_get_type ()) 
 </pre>
@@ -210,7 +226,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_IP6_CONFIG_ERROR">
+<div class="refsect2">
 <a name="NM-SETTING-IP6-CONFIG-ERROR:CAPS"></a><h3>NM_SETTING_IP6_CONFIG_ERROR</h3>
 <pre class="programlisting">#define NM_SETTING_IP6_CONFIG_ERROR nm_setting_ip6_config_error_quark ()
 </pre>
@@ -218,22 +234,14 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip6_config_error_quark ()">
+<div class="refsect2">
 <a name="nm-setting-ip6-config-error-quark"></a><h3>nm_setting_ip6_config_error_quark ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              nm_setting_ip6_config_error_quark   (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_IP6_CONFIG_METHOD">
+<div class="refsect2">
 <a name="NM-SETTING-IP6-CONFIG-METHOD:CAPS"></a><h3>NM_SETTING_IP6_CONFIG_METHOD</h3>
 <pre class="programlisting">#define NM_SETTING_IP6_CONFIG_METHOD             "method"
 </pre>
@@ -241,7 +249,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_IP6_CONFIG_DNS">
+<div class="refsect2">
 <a name="NM-SETTING-IP6-CONFIG-DNS:CAPS"></a><h3>NM_SETTING_IP6_CONFIG_DNS</h3>
 <pre class="programlisting">#define NM_SETTING_IP6_CONFIG_DNS                "dns"
 </pre>
@@ -249,7 +257,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_IP6_CONFIG_DNS_SEARCH">
+<div class="refsect2">
 <a name="NM-SETTING-IP6-CONFIG-DNS-SEARCH:CAPS"></a><h3>NM_SETTING_IP6_CONFIG_DNS_SEARCH</h3>
 <pre class="programlisting">#define NM_SETTING_IP6_CONFIG_DNS_SEARCH         "dns-search"
 </pre>
@@ -257,7 +265,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_IP6_CONFIG_ADDRESSES">
+<div class="refsect2">
 <a name="NM-SETTING-IP6-CONFIG-ADDRESSES:CAPS"></a><h3>NM_SETTING_IP6_CONFIG_ADDRESSES</h3>
 <pre class="programlisting">#define NM_SETTING_IP6_CONFIG_ADDRESSES          "addresses"
 </pre>
@@ -265,7 +273,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_IP6_CONFIG_ROUTES">
+<div class="refsect2">
 <a name="NM-SETTING-IP6-CONFIG-ROUTES:CAPS"></a><h3>NM_SETTING_IP6_CONFIG_ROUTES</h3>
 <pre class="programlisting">#define NM_SETTING_IP6_CONFIG_ROUTES             "routes"
 </pre>
@@ -273,7 +281,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES">
+<div class="refsect2">
 <a name="NM-SETTING-IP6-CONFIG-IGNORE-AUTO-ROUTES:CAPS"></a><h3>NM_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES</h3>
 <pre class="programlisting">#define NM_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES "ignore-auto-routes"
 </pre>
@@ -281,7 +289,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS">
+<div class="refsect2">
 <a name="NM-SETTING-IP6-CONFIG-IGNORE-AUTO-DNS:CAPS"></a><h3>NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS</h3>
 <pre class="programlisting">#define NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS    "ignore-auto-dns"
 </pre>
@@ -289,7 +297,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_IP6_CONFIG_NEVER_DEFAULT">
+<div class="refsect2">
 <a name="NM-SETTING-IP6-CONFIG-NEVER-DEFAULT:CAPS"></a><h3>NM_SETTING_IP6_CONFIG_NEVER_DEFAULT</h3>
 <pre class="programlisting">#define NM_SETTING_IP6_CONFIG_NEVER_DEFAULT      "never-default"
 </pre>
@@ -297,7 +305,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_IP6_CONFIG_MAY_FAIL">
+<div class="refsect2">
 <a name="NM-SETTING-IP6-CONFIG-MAY-FAIL:CAPS"></a><h3>NM_SETTING_IP6_CONFIG_MAY_FAIL</h3>
 <pre class="programlisting">#define NM_SETTING_IP6_CONFIG_MAY_FAIL           "may-fail"
 </pre>
@@ -305,7 +313,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_IP6_CONFIG_METHOD_IGNORE">
+<div class="refsect2">
 <a name="NM-SETTING-IP6-CONFIG-METHOD-IGNORE:CAPS"></a><h3>NM_SETTING_IP6_CONFIG_METHOD_IGNORE</h3>
 <pre class="programlisting">#define NM_SETTING_IP6_CONFIG_METHOD_IGNORE     "ignore"
 </pre>
@@ -313,7 +321,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_IP6_CONFIG_METHOD_AUTO">
+<div class="refsect2">
 <a name="NM-SETTING-IP6-CONFIG-METHOD-AUTO:CAPS"></a><h3>NM_SETTING_IP6_CONFIG_METHOD_AUTO</h3>
 <pre class="programlisting">#define NM_SETTING_IP6_CONFIG_METHOD_AUTO       "auto"
 </pre>
@@ -321,7 +329,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_IP6_CONFIG_METHOD_DHCP">
+<div class="refsect2">
 <a name="NM-SETTING-IP6-CONFIG-METHOD-DHCP:CAPS"></a><h3>NM_SETTING_IP6_CONFIG_METHOD_DHCP</h3>
 <pre class="programlisting">#define NM_SETTING_IP6_CONFIG_METHOD_DHCP       "dhcp"
 </pre>
@@ -329,7 +337,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL">
+<div class="refsect2">
 <a name="NM-SETTING-IP6-CONFIG-METHOD-LINK-LOCAL:CAPS"></a><h3>NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL</h3>
 <pre class="programlisting">#define NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL "link-local"
 </pre>
@@ -337,7 +345,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_IP6_CONFIG_METHOD_MANUAL">
+<div class="refsect2">
 <a name="NM-SETTING-IP6-CONFIG-METHOD-MANUAL:CAPS"></a><h3>NM_SETTING_IP6_CONFIG_METHOD_MANUAL</h3>
 <pre class="programlisting">#define NM_SETTING_IP6_CONFIG_METHOD_MANUAL     "manual"
 </pre>
@@ -345,7 +353,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_IP6_CONFIG_METHOD_SHARED">
+<div class="refsect2">
 <a name="NM-SETTING-IP6-CONFIG-METHOD-SHARED:CAPS"></a><h3>NM_SETTING_IP6_CONFIG_METHOD_SHARED</h3>
 <pre class="programlisting">#define NM_SETTING_IP6_CONFIG_METHOD_SHARED     "shared"
 </pre>
@@ -353,7 +361,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMIP6Address">
+<div class="refsect2">
 <a name="NMIP6Address"></a><h3>NMIP6Address</h3>
 <pre class="programlisting">typedef struct NMIP6Address NMIP6Address;
 </pre>
@@ -361,237 +369,95 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip6_address_new ()">
+<div class="refsect2">
+<a name="nm-ip6-address-get-type"></a><h3>nm_ip6_address_get_type ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               nm_ip6_address_get_type             (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="nm-ip6-address-new"></a><h3>nm_ip6_address_new ()</h3>
-<pre class="programlisting"><a class="link" href="NMSettingIP6Config.html#NMIP6Address" title="NMIP6Address"><span class="returnvalue">NMIP6Address</span></a> *      nm_ip6_address_new                  (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
+<pre class="programlisting"><a class="link" href="NMSettingIP6Config.html#NMIP6Address"><span class="returnvalue">NMIP6Address</span></a> *          nm_ip6_address_new              (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip6_address_dup ()">
+<div class="refsect2">
 <a name="nm-ip6-address-dup"></a><h3>nm_ip6_address_dup ()</h3>
-<pre class="programlisting"><a class="link" href="NMSettingIP6Config.html#NMIP6Address" title="NMIP6Address"><span class="returnvalue">NMIP6Address</span></a> *      nm_ip6_address_dup                  (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address" title="NMIP6Address"><span class="type">NMIP6Address</span></a> *source</code></em>);</pre>
+<pre class="programlisting"><a class="link" href="NMSettingIP6Config.html#NMIP6Address"><span class="returnvalue">NMIP6Address</span></a> *          nm_ip6_address_dup              (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address"><span class="type">NMIP6Address</span></a> *source</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>source</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip6_address_ref ()">
+<div class="refsect2">
 <a name="nm-ip6-address-ref"></a><h3>nm_ip6_address_ref ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip6_address_ref                  (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address" title="NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>);</pre>
+<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip6_address_ref                  (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>address</code></em> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip6_address_unref ()">
+<div class="refsect2">
 <a name="nm-ip6-address-unref"></a><h3>nm_ip6_address_unref ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip6_address_unref                (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address" title="NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>);</pre>
+<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip6_address_unref                (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>address</code></em> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip6_address_compare ()">
+<div class="refsect2">
 <a name="nm-ip6-address-compare"></a><h3>nm_ip6_address_compare ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_ip6_address_compare              (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address" title="NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address" title="NMIP6Address"><span class="type">NMIP6Address</span></a> *other</code></em>);</pre>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_ip6_address_compare              (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address"><span class="type">NMIP6Address</span></a> *other</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>address</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>other</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip6_address_get_address ()">
+<div class="refsect2">
 <a name="nm-ip6-address-get-address"></a><h3>nm_ip6_address_get_address ()</h3>
-<pre class="programlisting">const struct <span class="returnvalue">in6_addr</span> * nm_ip6_address_get_address      (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address" title="NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>);</pre>
+<pre class="programlisting">const struct <span class="returnvalue">in6_addr</span> * nm_ip6_address_get_address      (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>address</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip6_address_set_address ()">
+<div class="refsect2">
 <a name="nm-ip6-address-set-address"></a><h3>nm_ip6_address_set_address ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip6_address_set_address          (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address" title="NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>,
+<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip6_address_set_address          (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>,
                                                          <em class="parameter"><code>const <span class="type">struct in6_addr</span> *addr</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>address</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>addr</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip6_address_get_prefix ()">
+<div class="refsect2">
 <a name="nm-ip6-address-get-prefix"></a><h3>nm_ip6_address_get_prefix ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_ip6_address_get_prefix           (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address" title="NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>);</pre>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_ip6_address_get_prefix           (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>address</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip6_address_set_prefix ()">
+<div class="refsect2">
 <a name="nm-ip6-address-set-prefix"></a><h3>nm_ip6_address_set_prefix ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip6_address_set_prefix           (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address" title="NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>,
+<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip6_address_set_prefix           (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> prefix</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>address</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>prefix</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip6_address_get_gateway ()">
+<div class="refsect2">
 <a name="nm-ip6-address-get-gateway"></a><h3>nm_ip6_address_get_gateway ()</h3>
-<pre class="programlisting">const struct <span class="returnvalue">in6_addr</span> * nm_ip6_address_get_gateway      (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address" title="NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>);</pre>
+<pre class="programlisting">const struct <span class="returnvalue">in6_addr</span> * nm_ip6_address_get_gateway      (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>address</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip6_address_set_gateway ()">
+<div class="refsect2">
 <a name="nm-ip6-address-set-gateway"></a><h3>nm_ip6_address_set_gateway ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip6_address_set_gateway          (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address" title="NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>,
+<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip6_address_set_gateway          (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>,
                                                          <em class="parameter"><code>const <span class="type">struct in6_addr</span> *gw</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>address</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>gw</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="NMIP6Route">
+<div class="refsect2">
 <a name="NMIP6Route"></a><h3>NMIP6Route</h3>
 <pre class="programlisting">typedef struct NMIP6Route NMIP6Route;
 </pre>
@@ -599,289 +465,117 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip6_route_new ()">
+<div class="refsect2">
+<a name="nm-ip6-route-get-type"></a><h3>nm_ip6_route_get_type ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               nm_ip6_route_get_type               (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="nm-ip6-route-new"></a><h3>nm_ip6_route_new ()</h3>
-<pre class="programlisting"><a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route"><span class="returnvalue">NMIP6Route</span></a> *        nm_ip6_route_new                    (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
+<pre class="programlisting"><a class="link" href="NMSettingIP6Config.html#NMIP6Route"><span class="returnvalue">NMIP6Route</span></a> *            nm_ip6_route_new                (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip6_route_dup ()">
+<div class="refsect2">
 <a name="nm-ip6-route-dup"></a><h3>nm_ip6_route_dup ()</h3>
-<pre class="programlisting"><a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route"><span class="returnvalue">NMIP6Route</span></a> *        nm_ip6_route_dup                    (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>);</pre>
+<pre class="programlisting"><a class="link" href="NMSettingIP6Config.html#NMIP6Route"><span class="returnvalue">NMIP6Route</span></a> *            nm_ip6_route_dup                (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>route</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip6_route_ref ()">
+<div class="refsect2">
 <a name="nm-ip6-route-ref"></a><h3>nm_ip6_route_ref ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip6_route_ref                    (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>);</pre>
+<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip6_route_ref                    (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>route</code></em> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip6_route_unref ()">
+<div class="refsect2">
 <a name="nm-ip6-route-unref"></a><h3>nm_ip6_route_unref ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip6_route_unref                  (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>);</pre>
+<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip6_route_unref                  (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>route</code></em> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip6_route_compare ()">
+<div class="refsect2">
 <a name="nm-ip6-route-compare"></a><h3>nm_ip6_route_compare ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_ip6_route_compare                (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route"><span class="type">NMIP6Route</span></a> *other</code></em>);</pre>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_ip6_route_compare                (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route"><span class="type">NMIP6Route</span></a> *other</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>route</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>other</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip6_route_get_dest ()">
+<div class="refsect2">
 <a name="nm-ip6-route-get-dest"></a><h3>nm_ip6_route_get_dest ()</h3>
-<pre class="programlisting">const struct <span class="returnvalue">in6_addr</span> * nm_ip6_route_get_dest           (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>);</pre>
+<pre class="programlisting">const struct <span class="returnvalue">in6_addr</span> * nm_ip6_route_get_dest           (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>route</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip6_route_set_dest ()">
+<div class="refsect2">
 <a name="nm-ip6-route-set-dest"></a><h3>nm_ip6_route_set_dest ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip6_route_set_dest               (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>,
+<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip6_route_set_dest               (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>,
                                                          <em class="parameter"><code>const <span class="type">struct in6_addr</span> *dest</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>route</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>dest</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip6_route_get_prefix ()">
+<div class="refsect2">
 <a name="nm-ip6-route-get-prefix"></a><h3>nm_ip6_route_get_prefix ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_ip6_route_get_prefix             (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>);</pre>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_ip6_route_get_prefix             (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>route</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip6_route_set_prefix ()">
+<div class="refsect2">
 <a name="nm-ip6-route-set-prefix"></a><h3>nm_ip6_route_set_prefix ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip6_route_set_prefix             (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>,
+<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip6_route_set_prefix             (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> prefix</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>route</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>prefix</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip6_route_get_next_hop ()">
+<div class="refsect2">
 <a name="nm-ip6-route-get-next-hop"></a><h3>nm_ip6_route_get_next_hop ()</h3>
-<pre class="programlisting">const struct <span class="returnvalue">in6_addr</span> * nm_ip6_route_get_next_hop       (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>);</pre>
+<pre class="programlisting">const struct <span class="returnvalue">in6_addr</span> * nm_ip6_route_get_next_hop       (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>route</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip6_route_set_next_hop ()">
+<div class="refsect2">
 <a name="nm-ip6-route-set-next-hop"></a><h3>nm_ip6_route_set_next_hop ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip6_route_set_next_hop           (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>,
+<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip6_route_set_next_hop           (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>,
                                                          <em class="parameter"><code>const <span class="type">struct in6_addr</span> *next_hop</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>route</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>next_hop</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip6_route_get_metric ()">
+<div class="refsect2">
 <a name="nm-ip6-route-get-metric"></a><h3>nm_ip6_route_get_metric ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_ip6_route_get_metric             (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>);</pre>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_ip6_route_get_metric             (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>route</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip6_route_set_metric ()">
+<div class="refsect2">
 <a name="nm-ip6-route-set-metric"></a><h3>nm_ip6_route_set_metric ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip6_route_set_metric             (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>,
+<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip6_route_set_metric             (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> metric</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>route</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>metric</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="NMSettingIP6Config">
+<div class="refsect2">
 <a name="NMSettingIP6Config-struct"></a><h3>NMSettingIP6Config</h3>
 <pre class="programlisting">typedef struct _NMSettingIP6Config NMSettingIP6Config;</pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMSettingIP6ConfigClass">
+<div class="refsect2">
 <a name="NMSettingIP6ConfigClass"></a><h3>NMSettingIP6ConfigClass</h3>
 <pre class="programlisting">typedef struct {
 	NMSettingClass parent;
@@ -897,625 +591,224 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip6_config_get_type ()">
+<div class="refsect2">
 <a name="nm-setting-ip6-config-get-type"></a><h3>nm_setting_ip6_config_get_type ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               nm_setting_ip6_config_get_type      (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip6_config_new ()">
+<div class="refsect2">
 <a name="nm-setting-ip6-config-new"></a><h3>nm_setting_ip6_config_new ()</h3>
-<pre class="programlisting"><a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *         nm_setting_ip6_config_new           (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
+<pre class="programlisting"><a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *             nm_setting_ip6_config_new       (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip6_config_get_method ()">
+<div class="refsect2">
 <a name="nm-setting-ip6-config-get-method"></a><h3>nm_setting_ip6_config_get_method ()</h3>
-<pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_ip6_config_get_method    (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>);</pre>
+<pre class="programlisting">const <span class="returnvalue">char</span> *            nm_setting_ip6_config_get_method
+                                                        (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip6_config_get_num_dns ()">
+<div class="refsect2">
 <a name="nm-setting-ip6-config-get-num-dns"></a><h3>nm_setting_ip6_config_get_num_dns ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_setting_ip6_config_get_num_dns   (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip6_config_get_dns ()">
+<div class="refsect2">
 <a name="nm-setting-ip6-config-get-dns"></a><h3>nm_setting_ip6_config_get_dns ()</h3>
 <pre class="programlisting">const struct <span class="returnvalue">in6_addr</span> * nm_setting_ip6_config_get_dns   (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> i</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>i</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip6_config_add_dns ()">
+<div class="refsect2">
 <a name="nm-setting-ip6-config-add-dns"></a><h3>nm_setting_ip6_config_add_dns ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_ip6_config_add_dns       (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>,
                                                          <em class="parameter"><code>const <span class="type">struct in6_addr</span> *dns</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>dns</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip6_config_remove_dns ()">
+<div class="refsect2">
 <a name="nm-setting-ip6-config-remove-dns"></a><h3>nm_setting_ip6_config_remove_dns ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_setting_ip6_config_remove_dns    (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> i</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>i</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip6_config_clear_dns ()">
+<div class="refsect2">
 <a name="nm-setting-ip6-config-clear-dns"></a><h3>nm_setting_ip6_config_clear_dns ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_setting_ip6_config_clear_dns     (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip6_config_get_num_dns_searches ()">
+<div class="refsect2">
 <a name="nm-setting-ip6-config-get-num-dns-searches"></a><h3>nm_setting_ip6_config_get_num_dns_searches ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_setting_ip6_config_get_num_dns_searches
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip6_config_get_dns_search ()">
+<div class="refsect2">
 <a name="nm-setting-ip6-config-get-dns-search"></a><h3>nm_setting_ip6_config_get_dns_search ()</h3>
-<pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_ip6_config_get_dns_search
+<pre class="programlisting">const <span class="returnvalue">char</span> *            nm_setting_ip6_config_get_dns_search
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> i</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>i</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip6_config_add_dns_search ()">
+<div class="refsect2">
 <a name="nm-setting-ip6-config-add-dns-search"></a><h3>nm_setting_ip6_config_add_dns_search ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_ip6_config_add_dns_search
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *dns_search</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>dns_search</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip6_config_remove_dns_search ()">
+<div class="refsect2">
 <a name="nm-setting-ip6-config-remove-dns-search"></a><h3>nm_setting_ip6_config_remove_dns_search ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_setting_ip6_config_remove_dns_search
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> i</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>i</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip6_config_clear_dns_searches ()">
+<div class="refsect2">
 <a name="nm-setting-ip6-config-clear-dns-searches"></a><h3>nm_setting_ip6_config_clear_dns_searches ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_setting_ip6_config_clear_dns_searches
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip6_config_get_num_addresses ()">
+<div class="refsect2">
 <a name="nm-setting-ip6-config-get-num-addresses"></a><h3>nm_setting_ip6_config_get_num_addresses ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_setting_ip6_config_get_num_addresses
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip6_config_get_address ()">
+<div class="refsect2">
 <a name="nm-setting-ip6-config-get-address"></a><h3>nm_setting_ip6_config_get_address ()</h3>
-<pre class="programlisting"><a class="link" href="NMSettingIP6Config.html#NMIP6Address" title="NMIP6Address"><span class="returnvalue">NMIP6Address</span></a> *      nm_setting_ip6_config_get_address   (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>,
+<pre class="programlisting"><a class="link" href="NMSettingIP6Config.html#NMIP6Address"><span class="returnvalue">NMIP6Address</span></a> *          nm_setting_ip6_config_get_address
+                                                        (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> i</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>i</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip6_config_add_address ()">
+<div class="refsect2">
 <a name="nm-setting-ip6-config-add-address"></a><h3>nm_setting_ip6_config_add_address ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_ip6_config_add_address   (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address" title="NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>);</pre>
+                                                         <em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>address</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip6_config_remove_address ()">
+<div class="refsect2">
 <a name="nm-setting-ip6-config-remove-address"></a><h3>nm_setting_ip6_config_remove_address ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_setting_ip6_config_remove_address
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> i</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>i</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip6_config_clear_addresses ()">
+<div class="refsect2">
 <a name="nm-setting-ip6-config-clear-addresses"></a><h3>nm_setting_ip6_config_clear_addresses ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_setting_ip6_config_clear_addresses
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip6_config_get_num_routes ()">
+<div class="refsect2">
 <a name="nm-setting-ip6-config-get-num-routes"></a><h3>nm_setting_ip6_config_get_num_routes ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_setting_ip6_config_get_num_routes
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip6_config_get_route ()">
+<div class="refsect2">
 <a name="nm-setting-ip6-config-get-route"></a><h3>nm_setting_ip6_config_get_route ()</h3>
-<pre class="programlisting"><a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route"><span class="returnvalue">NMIP6Route</span></a> *        nm_setting_ip6_config_get_route     (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>,
+<pre class="programlisting"><a class="link" href="NMSettingIP6Config.html#NMIP6Route"><span class="returnvalue">NMIP6Route</span></a> *            nm_setting_ip6_config_get_route (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> i</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>i</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip6_config_add_route ()">
+<div class="refsect2">
 <a name="nm-setting-ip6-config-add-route"></a><h3>nm_setting_ip6_config_add_route ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_ip6_config_add_route     (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>);</pre>
+                                                         <em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>route</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip6_config_remove_route ()">
+<div class="refsect2">
 <a name="nm-setting-ip6-config-remove-route"></a><h3>nm_setting_ip6_config_remove_route ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_setting_ip6_config_remove_route  (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> i</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>i</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip6_config_clear_routes ()">
+<div class="refsect2">
 <a name="nm-setting-ip6-config-clear-routes"></a><h3>nm_setting_ip6_config_clear_routes ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_setting_ip6_config_clear_routes  (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip6_config_get_ignore_auto_routes ()">
+<div class="refsect2">
 <a name="nm-setting-ip6-config-get-ignore-auto-routes"></a><h3>nm_setting_ip6_config_get_ignore_auto_routes ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_ip6_config_get_ignore_auto_routes
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip6_config_get_ignore_auto_dns ()">
+<div class="refsect2">
 <a name="nm-setting-ip6-config-get-ignore-auto-dns"></a><h3>nm_setting_ip6_config_get_ignore_auto_dns ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_ip6_config_get_ignore_auto_dns
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip6_config_get_never_default ()">
+<div class="refsect2">
 <a name="nm-setting-ip6-config-get-never-default"></a><h3>nm_setting_ip6_config_get_never_default ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_ip6_config_get_never_default
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip6_config_get_may_fail ()">
+<div class="refsect2">
 <a name="nm-setting-ip6-config-get-may-fail"></a><h3>nm_setting_ip6_config_get_may_fail ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_ip6_config_get_may_fail  (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 </div>
-<div class="refsect1" title="Property Details">
+<div class="refsect1">
 <a name="NMSettingIP6Config.property-details"></a><h2>Property Details</h2>
-<div class="refsect2" title='The "addresses" property'>
+<div class="refsect2">
 <a name="NMSettingIP6Config--addresses"></a><h3>The <code class="literal">"addresses"</code> property</h3>
 <pre class="programlisting">  "addresses"                <span class="type">GPtrArray_GValueArray_GArray_guchar_+guint+GArray_guchar___*</span>  : Read / Write</pre>
 <p>
@@ -1532,7 +825,7 @@ assigned an address with these methods.
 </p>
 </div>
 <hr>
-<div class="refsect2" title='The "dns" property'>
+<div class="refsect2">
 <a name="NMSettingIP6Config--dns"></a><h3>The <code class="literal">"dns"</code> property</h3>
 <pre class="programlisting">  "dns"                      <span class="type">GPtrArray_GArray_guchar__</span>*  : Read / Write</pre>
 <p>
@@ -1546,7 +839,7 @@ this connection.
 </p>
 </div>
 <hr>
-<div class="refsect2" title='The "dns-search" property'>
+<div class="refsect2">
 <a name="NMSettingIP6Config--dns-search"></a><h3>The <code class="literal">"dns-search"</code> property</h3>
 <pre class="programlisting">  "dns-search"               <span class="type">GSList_gchararray_</span>*   : Read / Write</pre>
 <p>
@@ -1558,7 +851,7 @@ as the only search domains for this connection.
 </p>
 </div>
 <hr>
-<div class="refsect2" title='The "ignore-auto-dns" property'>
+<div class="refsect2">
 <a name="NMSettingIP6Config--ignore-auto-dns"></a><h3>The <code class="literal">"ignore-auto-dns"</code> property</h3>
 <pre class="programlisting">  "ignore-auto-dns"          <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write / Construct</pre>
 <p>
@@ -1571,7 +864,7 @@ used.
 <p>Default value: FALSE</p>
 </div>
 <hr>
-<div class="refsect2" title='The "ignore-auto-routes" property'>
+<div class="refsect2">
 <a name="NMSettingIP6Config--ignore-auto-routes"></a><h3>The <code class="literal">"ignore-auto-routes"</code> property</h3>
 <pre class="programlisting">  "ignore-auto-routes"       <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write / Construct</pre>
 <p>
@@ -1582,7 +875,7 @@ specified in <a class="link" href="NMSettingIP6Config.html#NMSettingIP6Config--r
 <p>Default value: FALSE</p>
 </div>
 <hr>
-<div class="refsect2" title='The "may-fail" property'>
+<div class="refsect2">
 <a name="NMSettingIP6Config--may-fail"></a><h3>The <code class="literal">"may-fail"</code> property</h3>
 <pre class="programlisting">  "may-fail"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write / Construct</pre>
 <p>
@@ -1596,7 +889,7 @@ but IPv4 configuration completes successfully.
 <p>Default value: FALSE</p>
 </div>
 <hr>
-<div class="refsect2" title='The "method" property'>
+<div class="refsect2">
 <a name="NMSettingIP6Config--method"></a><h3>The <code class="literal">"method"</code> property</h3>
 <pre class="programlisting">  "method"                   <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -1614,7 +907,7 @@ method are not yet supported.
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "never-default" property'>
+<div class="refsect2">
 <a name="NMSettingIP6Config--never-default"></a><h3>The <code class="literal">"never-default"</code> property</h3>
 <pre class="programlisting">  "never-default"            <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write / Construct</pre>
 <p>
@@ -1624,7 +917,7 @@ meaning it will never be assigned the default IPv6 route by NetworkManager.
 <p>Default value: FALSE</p>
 </div>
 <hr>
-<div class="refsect2" title='The "routes" property'>
+<div class="refsect2">
 <a name="NMSettingIP6Config--routes"></a><h3>The <code class="literal">"routes"</code> property</h3>
 <pre class="programlisting">  "routes"                   <span class="type">GPtrArray_GValueArray_GArray_guchar_+guint+GArray_guchar_+guint__*</span>  : Read / Write</pre>
 <p>
@@ -1642,6 +935,6 @@ automatic configuration.  Routes cannot be used with the 'shared' or
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.15</div>
+          Generated by GTK-Doc V1.17</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingOlpcMesh.html b/docs/libnm-util/html/NMSettingOlpcMesh.html
index 4543a9075..43ea8d274 100644
--- a/docs/libnm-util/html/NMSettingOlpcMesh.html
+++ b/docs/libnm-util/html/NMSettingOlpcMesh.html
@@ -3,12 +3,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>NMSettingOlpcMesh</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="libnm-util Reference Manual">
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingGsm.html" title="NMSettingGsm">
 <link rel="next" href="NMSetting8021x.html" title="NMSetting8021x">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,7 +30,7 @@
                   <a href="#NMSettingOlpcMesh.properties" class="shortcut">Properties</a>
 </td></tr>
 </table>
-<div class="refentry" title="NMSettingOlpcMesh">
+<div class="refentry">
 <a name="NMSettingOlpcMesh"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
@@ -39,10 +39,10 @@
 </td>
 <td valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv" title="Synopsis">
+<div class="refsynopsisdiv">
 <a name="NMSettingOlpcMesh.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">#define             <a class="link" href="NMSettingOlpcMesh.html#NM-SETTING-OLPC-MESH-SETTING-NAME:CAPS" title="NM_SETTING_OLPC_MESH_SETTING_NAME">NM_SETTING_OLPC_MESH_SETTING_NAME</a>
-enum                <a class="link" href="NMSettingOlpcMesh.html#NMSettingOlpcMeshError" title="enum NMSettingOlpcMeshError">NMSettingOlpcMeshError</a>;
+<a name="NMSettingOlpcMeshError"></a><pre class="synopsis">#define             <a class="link" href="NMSettingOlpcMesh.html#NM-SETTING-OLPC-MESH-SETTING-NAME:CAPS" title="NM_SETTING_OLPC_MESH_SETTING_NAME">NM_SETTING_OLPC_MESH_SETTING_NAME</a>
+enum                <a class="link" href="NMSettingOlpcMesh.html#NMSettingOlpcMeshError">NMSettingOlpcMeshError</a>;
 #define             <a class="link" href="NMSettingOlpcMesh.html#NM-TYPE-SETTING-OLPC-MESH-ERROR:CAPS" title="NM_TYPE_SETTING_OLPC_MESH_ERROR">NM_TYPE_SETTING_OLPC_MESH_ERROR</a>
 #define             <a class="link" href="NMSettingOlpcMesh.html#NM-SETTING-OLPC-MESH-ERROR:CAPS" title="NM_SETTING_OLPC_MESH_ERROR">NM_SETTING_OLPC_MESH_ERROR</a>
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              <a class="link" href="NMSettingOlpcMesh.html#nm-setting-olpc-mesh-error-quark" title="nm_setting_olpc_mesh_error_quark ()">nm_setting_olpc_mesh_error_quark</a>    (<em class="parameter"><code><span class="type">void</span></code></em>);
@@ -59,15 +59,19 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.htm
                                                         (<em class="parameter"><code><a class="link" href="NMSettingOlpcMesh.html" title="NMSettingOlpcMesh"><span class="type">NMSettingOlpcMesh</span></a> *setting</code></em>);
 </pre>
 </div>
-<div class="refsect1" title="Object Hierarchy">
+<div class="refsect1">
 <a name="NMSettingOlpcMesh.object-hierarchy"></a><h2>Object Hierarchy</h2>
 <pre class="synopsis">
+  GEnum
+   +----NMSettingOlpcMeshError
+</pre>
+<pre class="synopsis">
   <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>
    +----<a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
          +----NMSettingOlpcMesh
 </pre>
 </div>
-<div class="refsect1" title="Properties">
+<div class="refsect1">
 <a name="NMSettingOlpcMesh.properties"></a><h2>Properties</h2>
 <pre class="synopsis">
   "<a class="link" href="NMSettingOlpcMesh.html#NMSettingOlpcMesh--channel" title='The "channel" property'>channel</a>"                  <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write / Construct
@@ -75,14 +79,14 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.htm
   "<a class="link" href="NMSettingOlpcMesh.html#NMSettingOlpcMesh--ssid" title='The "ssid" property'>ssid</a>"                     <span class="type">GArray_guchar_</span>*       : Read / Write
 </pre>
 </div>
-<div class="refsect1" title="Description">
+<div class="refsect1">
 <a name="NMSettingOlpcMesh.description"></a><h2>Description</h2>
 <p>
 </p>
 </div>
-<div class="refsect1" title="Details">
+<div class="refsect1">
 <a name="NMSettingOlpcMesh.details"></a><h2>Details</h2>
-<div class="refsect2" title="NM_SETTING_OLPC_MESH_SETTING_NAME">
+<div class="refsect2">
 <a name="NM-SETTING-OLPC-MESH-SETTING-NAME:CAPS"></a><h3>NM_SETTING_OLPC_MESH_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_OLPC_MESH_SETTING_NAME "802-11-olpc-mesh"
 </pre>
@@ -90,7 +94,7 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.htm
 </p>
 </div>
 <hr>
-<div class="refsect2" title="enum NMSettingOlpcMeshError">
+<div class="refsect2">
 <a name="NMSettingOlpcMeshError"></a><h3>enum NMSettingOlpcMeshError</h3>
 <pre class="programlisting">typedef enum
 {
@@ -103,7 +107,7 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.htm
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_TYPE_SETTING_OLPC_MESH_ERROR">
+<div class="refsect2">
 <a name="NM-TYPE-SETTING-OLPC-MESH-ERROR:CAPS"></a><h3>NM_TYPE_SETTING_OLPC_MESH_ERROR</h3>
 <pre class="programlisting">#define NM_TYPE_SETTING_OLPC_MESH_ERROR (nm_setting_olpc_mesh_error_get_type ()) 
 </pre>
@@ -111,7 +115,7 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.htm
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_OLPC_MESH_ERROR">
+<div class="refsect2">
 <a name="NM-SETTING-OLPC-MESH-ERROR:CAPS"></a><h3>NM_SETTING_OLPC_MESH_ERROR</h3>
 <pre class="programlisting">#define NM_SETTING_OLPC_MESH_ERROR nm_setting_olpc_mesh_error_quark ()
 </pre>
@@ -119,22 +123,14 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.htm
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_olpc_mesh_error_quark ()">
+<div class="refsect2">
 <a name="nm-setting-olpc-mesh-error-quark"></a><h3>nm_setting_olpc_mesh_error_quark ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              nm_setting_olpc_mesh_error_quark    (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_OLPC_MESH_SSID">
+<div class="refsect2">
 <a name="NM-SETTING-OLPC-MESH-SSID:CAPS"></a><h3>NM_SETTING_OLPC_MESH_SSID</h3>
 <pre class="programlisting">#define NM_SETTING_OLPC_MESH_SSID                 "ssid"
 </pre>
@@ -142,7 +138,7 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.htm
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_OLPC_MESH_CHANNEL">
+<div class="refsect2">
 <a name="NM-SETTING-OLPC-MESH-CHANNEL:CAPS"></a><h3>NM_SETTING_OLPC_MESH_CHANNEL</h3>
 <pre class="programlisting">#define NM_SETTING_OLPC_MESH_CHANNEL              "channel"
 </pre>
@@ -150,7 +146,7 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.htm
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS">
+<div class="refsect2">
 <a name="NM-SETTING-OLPC-MESH-DHCP-ANYCAST-ADDRESS:CAPS"></a><h3>NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS</h3>
 <pre class="programlisting">#define NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS "dhcp-anycast-address"
 </pre>
@@ -158,14 +154,14 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.htm
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMSettingOlpcMesh">
+<div class="refsect2">
 <a name="NMSettingOlpcMesh-struct"></a><h3>NMSettingOlpcMesh</h3>
 <pre class="programlisting">typedef struct _NMSettingOlpcMesh NMSettingOlpcMesh;</pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMSettingOlpcMeshClass">
+<div class="refsect2">
 <a name="NMSettingOlpcMeshClass"></a><h3>NMSettingOlpcMeshClass</h3>
 <pre class="programlisting">typedef struct {
 	NMSettingClass parent;
@@ -181,22 +177,14 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.htm
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_olpc_mesh_get_type ()">
+<div class="refsect2">
 <a name="nm-setting-olpc-mesh-get-type"></a><h3>nm_setting_olpc_mesh_get_type ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               nm_setting_olpc_mesh_get_type       (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_olpc_mesh_new ()">
+<div class="refsect2">
 <a name="nm-setting-olpc-mesh-new"></a><h3>nm_setting_olpc_mesh_new ()</h3>
 <pre class="programlisting"><a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *         nm_setting_olpc_mesh_new            (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
@@ -206,82 +194,36 @@ Creates a new <a class="link" href="NMSettingOlpcMesh.html" title="NMSettingOlpc
 <col align="left" valign="top">
 <tbody><tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the new empty <a class="link" href="NMSettingOlpcMesh.html" title="NMSettingOlpcMesh"><span class="type">NMSettingOlpcMesh</span></a> object
-</td>
+<td>the new empty <a class="link" href="NMSettingOlpcMesh.html" title="NMSettingOlpcMesh"><span class="type">NMSettingOlpcMesh</span></a> object</td>
 </tr></tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_olpc_mesh_get_ssid ()">
+<div class="refsect2">
 <a name="nm-setting-olpc-mesh-get-ssid"></a><h3>nm_setting_olpc_mesh_get_ssid ()</h3>
 <pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *  nm_setting_olpc_mesh_get_ssid       (<em class="parameter"><code><a class="link" href="NMSettingOlpcMesh.html" title="NMSettingOlpcMesh"><span class="type">NMSettingOlpcMesh</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_olpc_mesh_get_channel ()">
+<div class="refsect2">
 <a name="nm-setting-olpc-mesh-get-channel"></a><h3>nm_setting_olpc_mesh_get_channel ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_setting_olpc_mesh_get_channel    (<em class="parameter"><code><a class="link" href="NMSettingOlpcMesh.html" title="NMSettingOlpcMesh"><span class="type">NMSettingOlpcMesh</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_olpc_mesh_get_dhcp_anycast_address ()">
+<div class="refsect2">
 <a name="nm-setting-olpc-mesh-get-dhcp-anycast-address"></a><h3>nm_setting_olpc_mesh_get_dhcp_anycast_address ()</h3>
 <pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *  nm_setting_olpc_mesh_get_dhcp_anycast_address
                                                         (<em class="parameter"><code><a class="link" href="NMSettingOlpcMesh.html" title="NMSettingOlpcMesh"><span class="type">NMSettingOlpcMesh</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 </div>
-<div class="refsect1" title="Property Details">
+<div class="refsect1">
 <a name="NMSettingOlpcMesh.property-details"></a><h2>Property Details</h2>
-<div class="refsect2" title='The "channel" property'>
+<div class="refsect2">
 <a name="NMSettingOlpcMesh--channel"></a><h3>The <code class="literal">"channel"</code> property</h3>
 <pre class="programlisting">  "channel"                  <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write / Construct</pre>
 <p>
@@ -290,7 +232,7 @@ Channel on which the mesh network to join is located.
 <p>Default value: 0</p>
 </div>
 <hr>
-<div class="refsect2" title='The "dhcp-anycast-address" property'>
+<div class="refsect2">
 <a name="NMSettingOlpcMesh--dhcp-anycast-address"></a><h3>The <code class="literal">"dhcp-anycast-address"</code> property</h3>
 <pre class="programlisting">  "dhcp-anycast-address"     <span class="type">GArray_guchar_</span>*       : Read / Write</pre>
 <p>
@@ -300,7 +242,7 @@ the request.
 </p>
 </div>
 <hr>
-<div class="refsect2" title='The "ssid" property'>
+<div class="refsect2">
 <a name="NMSettingOlpcMesh--ssid"></a><h3>The <code class="literal">"ssid"</code> property</h3>
 <pre class="programlisting">  "ssid"                     <span class="type">GArray_guchar_</span>*       : Read / Write</pre>
 <p>
@@ -311,6 +253,6 @@ SSID of the mesh network to join.
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.15</div>
+          Generated by GTK-Doc V1.17</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingPPP.html b/docs/libnm-util/html/NMSettingPPP.html
index 435c5b96e..eade54a59 100644
--- a/docs/libnm-util/html/NMSettingPPP.html
+++ b/docs/libnm-util/html/NMSettingPPP.html
@@ -3,12 +3,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>NMSettingPPP</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="libnm-util Reference Manual">
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingIP6Config.html" title="NMSettingIP6Config">
 <link rel="next" href="NMSettingPPPOE.html" title="NMSettingPPPOE">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,7 +30,7 @@
                   <a href="#NMSettingPPP.properties" class="shortcut">Properties</a>
 </td></tr>
 </table>
-<div class="refentry" title="NMSettingPPP">
+<div class="refentry">
 <a name="NMSettingPPP"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
@@ -39,10 +39,10 @@
 </td>
 <td valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv" title="Synopsis">
+<div class="refsynopsisdiv">
 <a name="NMSettingPPP.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">#define             <a class="link" href="NMSettingPPP.html#NM-SETTING-PPP-SETTING-NAME:CAPS" title="NM_SETTING_PPP_SETTING_NAME">NM_SETTING_PPP_SETTING_NAME</a>
-enum                <a class="link" href="NMSettingPPP.html#NMSettingPPPError" title="enum NMSettingPPPError">NMSettingPPPError</a>;
+<a name="NMSettingPPPError"></a><pre class="synopsis">#define             <a class="link" href="NMSettingPPP.html#NM-SETTING-PPP-SETTING-NAME:CAPS" title="NM_SETTING_PPP_SETTING_NAME">NM_SETTING_PPP_SETTING_NAME</a>
+enum                <a class="link" href="NMSettingPPP.html#NMSettingPPPError">NMSettingPPPError</a>;
 #define             <a class="link" href="NMSettingPPP.html#NM-TYPE-SETTING-PPP-ERROR:CAPS" title="NM_TYPE_SETTING_PPP_ERROR">NM_TYPE_SETTING_PPP_ERROR</a>
 #define             <a class="link" href="NMSettingPPP.html#NM-SETTING-PPP-ERROR:CAPS" title="NM_SETTING_PPP_ERROR">NM_SETTING_PPP_ERROR</a>
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              <a class="link" href="NMSettingPPP.html#nm-setting-ppp-error-quark" title="nm_setting_ppp_error_quark ()">nm_setting_ppp_error_quark</a>          (<em class="parameter"><code><span class="type">void</span></code></em>);
@@ -89,15 +89,19 @@ enum                <a class="link" href="NMSettingPPP.html#NMSettingPPPError" t
                                                         (<em class="parameter"><code><a class="link" href="NMSettingPPP.html" title="NMSettingPPP"><span class="type">NMSettingPPP</span></a> *setting</code></em>);
 </pre>
 </div>
-<div class="refsect1" title="Object Hierarchy">
+<div class="refsect1">
 <a name="NMSettingPPP.object-hierarchy"></a><h2>Object Hierarchy</h2>
 <pre class="synopsis">
+  GEnum
+   +----NMSettingPPPError
+</pre>
+<pre class="synopsis">
   <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>
    +----<a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
          +----NMSettingPPP
 </pre>
 </div>
-<div class="refsect1" title="Properties">
+<div class="refsect1">
 <a name="NMSettingPPP.properties"></a><h2>Properties</h2>
 <pre class="synopsis">
   "<a class="link" href="NMSettingPPP.html#NMSettingPPP--baud" title='The "baud" property'>baud</a>"                     <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write / Construct
@@ -120,14 +124,14 @@ enum                <a class="link" href="NMSettingPPP.html#NMSettingPPPError" t
   "<a class="link" href="NMSettingPPP.html#NMSettingPPP--require-mppe-128" title='The "require-mppe-128" property'>require-mppe-128</a>"         <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write / Construct
 </pre>
 </div>
-<div class="refsect1" title="Description">
+<div class="refsect1">
 <a name="NMSettingPPP.description"></a><h2>Description</h2>
 <p>
 </p>
 </div>
-<div class="refsect1" title="Details">
+<div class="refsect1">
 <a name="NMSettingPPP.details"></a><h2>Details</h2>
-<div class="refsect2" title="NM_SETTING_PPP_SETTING_NAME">
+<div class="refsect2">
 <a name="NM-SETTING-PPP-SETTING-NAME:CAPS"></a><h3>NM_SETTING_PPP_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_SETTING_NAME "ppp"
 </pre>
@@ -135,7 +139,7 @@ enum                <a class="link" href="NMSettingPPP.html#NMSettingPPPError" t
 </p>
 </div>
 <hr>
-<div class="refsect2" title="enum NMSettingPPPError">
+<div class="refsect2">
 <a name="NMSettingPPPError"></a><h3>enum NMSettingPPPError</h3>
 <pre class="programlisting">typedef enum
 {
@@ -149,7 +153,7 @@ enum                <a class="link" href="NMSettingPPP.html#NMSettingPPPError" t
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_TYPE_SETTING_PPP_ERROR">
+<div class="refsect2">
 <a name="NM-TYPE-SETTING-PPP-ERROR:CAPS"></a><h3>NM_TYPE_SETTING_PPP_ERROR</h3>
 <pre class="programlisting">#define NM_TYPE_SETTING_PPP_ERROR (nm_setting_ppp_error_get_type ()) 
 </pre>
@@ -157,7 +161,7 @@ enum                <a class="link" href="NMSettingPPP.html#NMSettingPPPError" t
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_PPP_ERROR">
+<div class="refsect2">
 <a name="NM-SETTING-PPP-ERROR:CAPS"></a><h3>NM_SETTING_PPP_ERROR</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_ERROR nm_setting_ppp_error_quark ()
 </pre>
@@ -165,22 +169,14 @@ enum                <a class="link" href="NMSettingPPP.html#NMSettingPPPError" t
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ppp_error_quark ()">
+<div class="refsect2">
 <a name="nm-setting-ppp-error-quark"></a><h3>nm_setting_ppp_error_quark ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              nm_setting_ppp_error_quark          (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_PPP_NOAUTH">
+<div class="refsect2">
 <a name="NM-SETTING-PPP-NOAUTH:CAPS"></a><h3>NM_SETTING_PPP_NOAUTH</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_NOAUTH            "noauth"
 </pre>
@@ -188,7 +184,7 @@ enum                <a class="link" href="NMSettingPPP.html#NMSettingPPPError" t
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_PPP_REFUSE_EAP">
+<div class="refsect2">
 <a name="NM-SETTING-PPP-REFUSE-EAP:CAPS"></a><h3>NM_SETTING_PPP_REFUSE_EAP</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_REFUSE_EAP        "refuse-eap"
 </pre>
@@ -196,7 +192,7 @@ enum                <a class="link" href="NMSettingPPP.html#NMSettingPPPError" t
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_PPP_REFUSE_PAP">
+<div class="refsect2">
 <a name="NM-SETTING-PPP-REFUSE-PAP:CAPS"></a><h3>NM_SETTING_PPP_REFUSE_PAP</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_REFUSE_PAP        "refuse-pap"
 </pre>
@@ -204,7 +200,7 @@ enum                <a class="link" href="NMSettingPPP.html#NMSettingPPPError" t
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_PPP_REFUSE_CHAP">
+<div class="refsect2">
 <a name="NM-SETTING-PPP-REFUSE-CHAP:CAPS"></a><h3>NM_SETTING_PPP_REFUSE_CHAP</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_REFUSE_CHAP       "refuse-chap"
 </pre>
@@ -212,7 +208,7 @@ enum                <a class="link" href="NMSettingPPP.html#NMSettingPPPError" t
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_PPP_REFUSE_MSCHAP">
+<div class="refsect2">
 <a name="NM-SETTING-PPP-REFUSE-MSCHAP:CAPS"></a><h3>NM_SETTING_PPP_REFUSE_MSCHAP</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_REFUSE_MSCHAP     "refuse-mschap"
 </pre>
@@ -220,7 +216,7 @@ enum                <a class="link" href="NMSettingPPP.html#NMSettingPPPError" t
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_PPP_REFUSE_MSCHAPV2">
+<div class="refsect2">
 <a name="NM-SETTING-PPP-REFUSE-MSCHAPV2:CAPS"></a><h3>NM_SETTING_PPP_REFUSE_MSCHAPV2</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_REFUSE_MSCHAPV2   "refuse-mschapv2"
 </pre>
@@ -228,7 +224,7 @@ enum                <a class="link" href="NMSettingPPP.html#NMSettingPPPError" t
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_PPP_NOBSDCOMP">
+<div class="refsect2">
 <a name="NM-SETTING-PPP-NOBSDCOMP:CAPS"></a><h3>NM_SETTING_PPP_NOBSDCOMP</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_NOBSDCOMP         "nobsdcomp"
 </pre>
@@ -236,7 +232,7 @@ enum                <a class="link" href="NMSettingPPP.html#NMSettingPPPError" t
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_PPP_NODEFLATE">
+<div class="refsect2">
 <a name="NM-SETTING-PPP-NODEFLATE:CAPS"></a><h3>NM_SETTING_PPP_NODEFLATE</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_NODEFLATE         "nodeflate"
 </pre>
@@ -244,7 +240,7 @@ enum                <a class="link" href="NMSettingPPP.html#NMSettingPPPError" t
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_PPP_NO_VJ_COMP">
+<div class="refsect2">
 <a name="NM-SETTING-PPP-NO-VJ-COMP:CAPS"></a><h3>NM_SETTING_PPP_NO_VJ_COMP</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_NO_VJ_COMP        "no-vj-comp"
 </pre>
@@ -252,7 +248,7 @@ enum                <a class="link" href="NMSettingPPP.html#NMSettingPPPError" t
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_PPP_REQUIRE_MPPE">
+<div class="refsect2">
 <a name="NM-SETTING-PPP-REQUIRE-MPPE:CAPS"></a><h3>NM_SETTING_PPP_REQUIRE_MPPE</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_REQUIRE_MPPE      "require-mppe"
 </pre>
@@ -260,7 +256,7 @@ enum                <a class="link" href="NMSettingPPP.html#NMSettingPPPError" t
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_PPP_REQUIRE_MPPE_128">
+<div class="refsect2">
 <a name="NM-SETTING-PPP-REQUIRE-MPPE-128:CAPS"></a><h3>NM_SETTING_PPP_REQUIRE_MPPE_128</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_REQUIRE_MPPE_128  "require-mppe-128"
 </pre>
@@ -268,7 +264,7 @@ enum                <a class="link" href="NMSettingPPP.html#NMSettingPPPError" t
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_PPP_MPPE_STATEFUL">
+<div class="refsect2">
 <a name="NM-SETTING-PPP-MPPE-STATEFUL:CAPS"></a><h3>NM_SETTING_PPP_MPPE_STATEFUL</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_MPPE_STATEFUL     "mppe-stateful"
 </pre>
@@ -276,7 +272,7 @@ enum                <a class="link" href="NMSettingPPP.html#NMSettingPPPError" t
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_PPP_CRTSCTS">
+<div class="refsect2">
 <a name="NM-SETTING-PPP-CRTSCTS:CAPS"></a><h3>NM_SETTING_PPP_CRTSCTS</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_CRTSCTS           "crtscts"
 </pre>
@@ -284,7 +280,7 @@ enum                <a class="link" href="NMSettingPPP.html#NMSettingPPPError" t
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_PPP_BAUD">
+<div class="refsect2">
 <a name="NM-SETTING-PPP-BAUD:CAPS"></a><h3>NM_SETTING_PPP_BAUD</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_BAUD              "baud"
 </pre>
@@ -292,7 +288,7 @@ enum                <a class="link" href="NMSettingPPP.html#NMSettingPPPError" t
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_PPP_MRU">
+<div class="refsect2">
 <a name="NM-SETTING-PPP-MRU:CAPS"></a><h3>NM_SETTING_PPP_MRU</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_MRU               "mru"
 </pre>
@@ -300,7 +296,7 @@ enum                <a class="link" href="NMSettingPPP.html#NMSettingPPPError" t
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_PPP_MTU">
+<div class="refsect2">
 <a name="NM-SETTING-PPP-MTU:CAPS"></a><h3>NM_SETTING_PPP_MTU</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_MTU               "mtu"
 </pre>
@@ -308,7 +304,7 @@ enum                <a class="link" href="NMSettingPPP.html#NMSettingPPPError" t
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_PPP_LCP_ECHO_FAILURE">
+<div class="refsect2">
 <a name="NM-SETTING-PPP-LCP-ECHO-FAILURE:CAPS"></a><h3>NM_SETTING_PPP_LCP_ECHO_FAILURE</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_LCP_ECHO_FAILURE  "lcp-echo-failure"
 </pre>
@@ -316,7 +312,7 @@ enum                <a class="link" href="NMSettingPPP.html#NMSettingPPPError" t
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_PPP_LCP_ECHO_INTERVAL">
+<div class="refsect2">
 <a name="NM-SETTING-PPP-LCP-ECHO-INTERVAL:CAPS"></a><h3>NM_SETTING_PPP_LCP_ECHO_INTERVAL</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_LCP_ECHO_INTERVAL "lcp-echo-interval"
 </pre>
@@ -324,14 +320,14 @@ enum                <a class="link" href="NMSettingPPP.html#NMSettingPPPError" t
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMSettingPPP">
+<div class="refsect2">
 <a name="NMSettingPPP-struct"></a><h3>NMSettingPPP</h3>
 <pre class="programlisting">typedef struct _NMSettingPPP NMSettingPPP;</pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMSettingPPPClass">
+<div class="refsect2">
 <a name="NMSettingPPPClass"></a><h3>NMSettingPPPClass</h3>
 <pre class="programlisting">typedef struct {
 	NMSettingClass parent;
@@ -347,436 +343,150 @@ enum                <a class="link" href="NMSettingPPP.html#NMSettingPPPError" t
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ppp_get_type ()">
+<div class="refsect2">
 <a name="nm-setting-ppp-get-type"></a><h3>nm_setting_ppp_get_type ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               nm_setting_ppp_get_type             (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ppp_new ()">
+<div class="refsect2">
 <a name="nm-setting-ppp-new"></a><h3>nm_setting_ppp_new ()</h3>
 <pre class="programlisting"><a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *         nm_setting_ppp_new                  (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ppp_get_noauth ()">
+<div class="refsect2">
 <a name="nm-setting-ppp-get-noauth"></a><h3>nm_setting_ppp_get_noauth ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_ppp_get_noauth           (<em class="parameter"><code><a class="link" href="NMSettingPPP.html" title="NMSettingPPP"><span class="type">NMSettingPPP</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ppp_get_refuse_eap ()">
+<div class="refsect2">
 <a name="nm-setting-ppp-get-refuse-eap"></a><h3>nm_setting_ppp_get_refuse_eap ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_ppp_get_refuse_eap       (<em class="parameter"><code><a class="link" href="NMSettingPPP.html" title="NMSettingPPP"><span class="type">NMSettingPPP</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ppp_get_refuse_pap ()">
+<div class="refsect2">
 <a name="nm-setting-ppp-get-refuse-pap"></a><h3>nm_setting_ppp_get_refuse_pap ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_ppp_get_refuse_pap       (<em class="parameter"><code><a class="link" href="NMSettingPPP.html" title="NMSettingPPP"><span class="type">NMSettingPPP</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ppp_get_refuse_chap ()">
+<div class="refsect2">
 <a name="nm-setting-ppp-get-refuse-chap"></a><h3>nm_setting_ppp_get_refuse_chap ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_ppp_get_refuse_chap      (<em class="parameter"><code><a class="link" href="NMSettingPPP.html" title="NMSettingPPP"><span class="type">NMSettingPPP</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ppp_get_refuse_mschap ()">
+<div class="refsect2">
 <a name="nm-setting-ppp-get-refuse-mschap"></a><h3>nm_setting_ppp_get_refuse_mschap ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_ppp_get_refuse_mschap    (<em class="parameter"><code><a class="link" href="NMSettingPPP.html" title="NMSettingPPP"><span class="type">NMSettingPPP</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ppp_get_refuse_mschapv2 ()">
+<div class="refsect2">
 <a name="nm-setting-ppp-get-refuse-mschapv2"></a><h3>nm_setting_ppp_get_refuse_mschapv2 ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_ppp_get_refuse_mschapv2  (<em class="parameter"><code><a class="link" href="NMSettingPPP.html" title="NMSettingPPP"><span class="type">NMSettingPPP</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ppp_get_nobsdcomp ()">
+<div class="refsect2">
 <a name="nm-setting-ppp-get-nobsdcomp"></a><h3>nm_setting_ppp_get_nobsdcomp ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_ppp_get_nobsdcomp        (<em class="parameter"><code><a class="link" href="NMSettingPPP.html" title="NMSettingPPP"><span class="type">NMSettingPPP</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ppp_get_nodeflate ()">
+<div class="refsect2">
 <a name="nm-setting-ppp-get-nodeflate"></a><h3>nm_setting_ppp_get_nodeflate ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_ppp_get_nodeflate        (<em class="parameter"><code><a class="link" href="NMSettingPPP.html" title="NMSettingPPP"><span class="type">NMSettingPPP</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ppp_get_no_vj_comp ()">
+<div class="refsect2">
 <a name="nm-setting-ppp-get-no-vj-comp"></a><h3>nm_setting_ppp_get_no_vj_comp ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_ppp_get_no_vj_comp       (<em class="parameter"><code><a class="link" href="NMSettingPPP.html" title="NMSettingPPP"><span class="type">NMSettingPPP</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ppp_get_require_mppe ()">
+<div class="refsect2">
 <a name="nm-setting-ppp-get-require-mppe"></a><h3>nm_setting_ppp_get_require_mppe ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_ppp_get_require_mppe     (<em class="parameter"><code><a class="link" href="NMSettingPPP.html" title="NMSettingPPP"><span class="type">NMSettingPPP</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ppp_get_require_mppe_128 ()">
+<div class="refsect2">
 <a name="nm-setting-ppp-get-require-mppe-128"></a><h3>nm_setting_ppp_get_require_mppe_128 ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_ppp_get_require_mppe_128 (<em class="parameter"><code><a class="link" href="NMSettingPPP.html" title="NMSettingPPP"><span class="type">NMSettingPPP</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ppp_get_mppe_stateful ()">
+<div class="refsect2">
 <a name="nm-setting-ppp-get-mppe-stateful"></a><h3>nm_setting_ppp_get_mppe_stateful ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_ppp_get_mppe_stateful    (<em class="parameter"><code><a class="link" href="NMSettingPPP.html" title="NMSettingPPP"><span class="type">NMSettingPPP</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ppp_get_crtscts ()">
+<div class="refsect2">
 <a name="nm-setting-ppp-get-crtscts"></a><h3>nm_setting_ppp_get_crtscts ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_ppp_get_crtscts          (<em class="parameter"><code><a class="link" href="NMSettingPPP.html" title="NMSettingPPP"><span class="type">NMSettingPPP</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ppp_get_baud ()">
+<div class="refsect2">
 <a name="nm-setting-ppp-get-baud"></a><h3>nm_setting_ppp_get_baud ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_setting_ppp_get_baud             (<em class="parameter"><code><a class="link" href="NMSettingPPP.html" title="NMSettingPPP"><span class="type">NMSettingPPP</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ppp_get_mru ()">
+<div class="refsect2">
 <a name="nm-setting-ppp-get-mru"></a><h3>nm_setting_ppp_get_mru ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_setting_ppp_get_mru              (<em class="parameter"><code><a class="link" href="NMSettingPPP.html" title="NMSettingPPP"><span class="type">NMSettingPPP</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ppp_get_mtu ()">
+<div class="refsect2">
 <a name="nm-setting-ppp-get-mtu"></a><h3>nm_setting_ppp_get_mtu ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_setting_ppp_get_mtu              (<em class="parameter"><code><a class="link" href="NMSettingPPP.html" title="NMSettingPPP"><span class="type">NMSettingPPP</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ppp_get_lcp_echo_failure ()">
+<div class="refsect2">
 <a name="nm-setting-ppp-get-lcp-echo-failure"></a><h3>nm_setting_ppp_get_lcp_echo_failure ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_setting_ppp_get_lcp_echo_failure (<em class="parameter"><code><a class="link" href="NMSettingPPP.html" title="NMSettingPPP"><span class="type">NMSettingPPP</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ppp_get_lcp_echo_interval ()">
+<div class="refsect2">
 <a name="nm-setting-ppp-get-lcp-echo-interval"></a><h3>nm_setting_ppp_get_lcp_echo_interval ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_setting_ppp_get_lcp_echo_interval
                                                         (<em class="parameter"><code><a class="link" href="NMSettingPPP.html" title="NMSettingPPP"><span class="type">NMSettingPPP</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 </div>
-<div class="refsect1" title="Property Details">
+<div class="refsect1">
 <a name="NMSettingPPP.property-details"></a><h2>Property Details</h2>
-<div class="refsect2" title='The "baud" property'>
+<div class="refsect2">
 <a name="NMSettingPPP--baud"></a><h3>The <code class="literal">"baud"</code> property</h3>
 <pre class="programlisting">  "baud"                     <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write / Construct</pre>
 <p>
@@ -787,7 +497,7 @@ choose the speed.
 <p>Default value: 0</p>
 </div>
 <hr>
-<div class="refsect2" title='The "crtscts" property'>
+<div class="refsect2">
 <a name="NMSettingPPP--crtscts"></a><h3>The <code class="literal">"crtscts"</code> property</h3>
 <pre class="programlisting">  "crtscts"                  <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write / Construct</pre>
 <p>
@@ -798,7 +508,7 @@ set to FALSE.
 <p>Default value: FALSE</p>
 </div>
 <hr>
-<div class="refsect2" title='The "lcp-echo-failure" property'>
+<div class="refsect2">
 <a name="NMSettingPPP--lcp-echo-failure"></a><h3>The <code class="literal">"lcp-echo-failure"</code> property</h3>
 <pre class="programlisting">  "lcp-echo-failure"         <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write / Construct</pre>
 <p>
@@ -810,7 +520,7 @@ value if this property is used.
 <p>Default value: 0</p>
 </div>
 <hr>
-<div class="refsect2" title='The "lcp-echo-interval" property'>
+<div class="refsect2">
 <a name="NMSettingPPP--lcp-echo-interval"></a><h3>The <code class="literal">"lcp-echo-interval"</code> property</h3>
 <pre class="programlisting">  "lcp-echo-interval"        <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write / Construct</pre>
 <p>
@@ -822,7 +532,7 @@ possible to autodetect this.
 <p>Default value: 0</p>
 </div>
 <hr>
-<div class="refsect2" title='The "mppe-stateful" property'>
+<div class="refsect2">
 <a name="NMSettingPPP--mppe-stateful"></a><h3>The <code class="literal">"mppe-stateful"</code> property</h3>
 <pre class="programlisting">  "mppe-stateful"            <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write / Construct</pre>
 <p>
@@ -832,7 +542,7 @@ information on stateful MPPE.",
 <p>Default value: FALSE</p>
 </div>
 <hr>
-<div class="refsect2" title='The "mru" property'>
+<div class="refsect2">
 <a name="NMSettingPPP--mru"></a><h3>The <code class="literal">"mru"</code> property</h3>
 <pre class="programlisting">  "mru"                      <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write / Construct</pre>
 <p>
@@ -844,7 +554,7 @@ larger than the specified size.  If non-zero, the MRU should be between
 <p>Default value: 0</p>
 </div>
 <hr>
-<div class="refsect2" title='The "mtu" property'>
+<div class="refsect2">
 <a name="NMSettingPPP--mtu"></a><h3>The <code class="literal">"mtu"</code> property</h3>
 <pre class="programlisting">  "mtu"                      <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write / Construct</pre>
 <p>
@@ -854,7 +564,7 @@ size.
 <p>Default value: 0</p>
 </div>
 <hr>
-<div class="refsect2" title='The "no-vj-comp" property'>
+<div class="refsect2">
 <a name="NMSettingPPP--no-vj-comp"></a><h3>The <code class="literal">"no-vj-comp"</code> property</h3>
 <pre class="programlisting">  "no-vj-comp"               <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write / Construct</pre>
 <p>
@@ -863,7 +573,7 @@ If TRUE, Van Jacobsen TCP header compression will not be requested.
 <p>Default value: FALSE</p>
 </div>
 <hr>
-<div class="refsect2" title='The "noauth" property'>
+<div class="refsect2">
 <a name="NMSettingPPP--noauth"></a><h3>The <code class="literal">"noauth"</code> property</h3>
 <pre class="programlisting">  "noauth"                   <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write / Construct</pre>
 <p>
@@ -874,7 +584,7 @@ the remote side.  In almost all cases, this should be TRUE.
 <p>Default value: TRUE</p>
 </div>
 <hr>
-<div class="refsect2" title='The "nobsdcomp" property'>
+<div class="refsect2">
 <a name="NMSettingPPP--nobsdcomp"></a><h3>The <code class="literal">"nobsdcomp"</code> property</h3>
 <pre class="programlisting">  "nobsdcomp"                <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write / Construct</pre>
 <p>
@@ -883,7 +593,7 @@ If TRUE, BSD compression will not be requested.
 <p>Default value: FALSE</p>
 </div>
 <hr>
-<div class="refsect2" title='The "nodeflate" property'>
+<div class="refsect2">
 <a name="NMSettingPPP--nodeflate"></a><h3>The <code class="literal">"nodeflate"</code> property</h3>
 <pre class="programlisting">  "nodeflate"                <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write / Construct</pre>
 <p>
@@ -892,7 +602,7 @@ If TRUE, 'deflate' compression will not be requested.
 <p>Default value: FALSE</p>
 </div>
 <hr>
-<div class="refsect2" title='The "refuse-chap" property'>
+<div class="refsect2">
 <a name="NMSettingPPP--refuse-chap"></a><h3>The <code class="literal">"refuse-chap"</code> property</h3>
 <pre class="programlisting">  "refuse-chap"              <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write / Construct</pre>
 <p>
@@ -901,7 +611,7 @@ If TRUE, the CHAP authentication method will not be used.
 <p>Default value: FALSE</p>
 </div>
 <hr>
-<div class="refsect2" title='The "refuse-eap" property'>
+<div class="refsect2">
 <a name="NMSettingPPP--refuse-eap"></a><h3>The <code class="literal">"refuse-eap"</code> property</h3>
 <pre class="programlisting">  "refuse-eap"               <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write / Construct</pre>
 <p>
@@ -910,7 +620,7 @@ If TRUE, the EAP authentication method will not be used.
 <p>Default value: FALSE</p>
 </div>
 <hr>
-<div class="refsect2" title='The "refuse-mschap" property'>
+<div class="refsect2">
 <a name="NMSettingPPP--refuse-mschap"></a><h3>The <code class="literal">"refuse-mschap"</code> property</h3>
 <pre class="programlisting">  "refuse-mschap"            <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write / Construct</pre>
 <p>
@@ -919,7 +629,7 @@ If TRUE, the MSCHAP authentication method will not be used.
 <p>Default value: FALSE</p>
 </div>
 <hr>
-<div class="refsect2" title='The "refuse-mschapv2" property'>
+<div class="refsect2">
 <a name="NMSettingPPP--refuse-mschapv2"></a><h3>The <code class="literal">"refuse-mschapv2"</code> property</h3>
 <pre class="programlisting">  "refuse-mschapv2"          <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write / Construct</pre>
 <p>
@@ -928,7 +638,7 @@ If TRUE, the MSCHAPv2 authentication method will not be used.
 <p>Default value: FALSE</p>
 </div>
 <hr>
-<div class="refsect2" title='The "refuse-pap" property'>
+<div class="refsect2">
 <a name="NMSettingPPP--refuse-pap"></a><h3>The <code class="literal">"refuse-pap"</code> property</h3>
 <pre class="programlisting">  "refuse-pap"               <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write / Construct</pre>
 <p>
@@ -937,7 +647,7 @@ If TRUE, the PAP authentication method will not be used.
 <p>Default value: FALSE</p>
 </div>
 <hr>
-<div class="refsect2" title='The "require-mppe" property'>
+<div class="refsect2">
 <a name="NMSettingPPP--require-mppe"></a><h3>The <code class="literal">"require-mppe"</code> property</h3>
 <pre class="programlisting">  "require-mppe"             <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write / Construct</pre>
 <p>
@@ -949,7 +659,7 @@ connections.
 <p>Default value: FALSE</p>
 </div>
 <hr>
-<div class="refsect2" title='The "require-mppe-128" property'>
+<div class="refsect2">
 <a name="NMSettingPPP--require-mppe-128"></a><h3>The <code class="literal">"require-mppe-128"</code> property</h3>
 <pre class="programlisting">  "require-mppe-128"         <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write / Construct</pre>
 <p>
@@ -963,6 +673,6 @@ be set to TRUE.  If 128-bit MPPE is not available the session will fail.
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.15</div>
+          Generated by GTK-Doc V1.17</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingPPPOE.html b/docs/libnm-util/html/NMSettingPPPOE.html
index a94012fd3..876692547 100644
--- a/docs/libnm-util/html/NMSettingPPPOE.html
+++ b/docs/libnm-util/html/NMSettingPPPOE.html
@@ -3,12 +3,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>NMSettingPPPOE</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="libnm-util Reference Manual">
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingPPP.html" title="NMSettingPPP">
 <link rel="next" href="NMSettingVPN.html" title="NMSettingVPN">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,7 +30,7 @@
                   <a href="#NMSettingPPPOE.properties" class="shortcut">Properties</a>
 </td></tr>
 </table>
-<div class="refentry" title="NMSettingPPPOE">
+<div class="refentry">
 <a name="NMSettingPPPOE"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
@@ -39,16 +39,17 @@
 </td>
 <td valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv" title="Synopsis">
+<div class="refsynopsisdiv">
 <a name="NMSettingPPPOE.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">#define             <a class="link" href="NMSettingPPPOE.html#NM-SETTING-PPPOE-SETTING-NAME:CAPS" title="NM_SETTING_PPPOE_SETTING_NAME">NM_SETTING_PPPOE_SETTING_NAME</a>
-enum                <a class="link" href="NMSettingPPPOE.html#NMSettingPPPOEError" title="enum NMSettingPPPOEError">NMSettingPPPOEError</a>;
+<a name="NMSettingPPPOEError"></a><pre class="synopsis">#define             <a class="link" href="NMSettingPPPOE.html#NM-SETTING-PPPOE-SETTING-NAME:CAPS" title="NM_SETTING_PPPOE_SETTING_NAME">NM_SETTING_PPPOE_SETTING_NAME</a>
+enum                <a class="link" href="NMSettingPPPOE.html#NMSettingPPPOEError">NMSettingPPPOEError</a>;
 #define             <a class="link" href="NMSettingPPPOE.html#NM-TYPE-SETTING-PPPOE-ERROR:CAPS" title="NM_TYPE_SETTING_PPPOE_ERROR">NM_TYPE_SETTING_PPPOE_ERROR</a>
 #define             <a class="link" href="NMSettingPPPOE.html#NM-SETTING-PPPOE-ERROR:CAPS" title="NM_SETTING_PPPOE_ERROR">NM_SETTING_PPPOE_ERROR</a>
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              <a class="link" href="NMSettingPPPOE.html#nm-setting-pppoe-error-quark" title="nm_setting_pppoe_error_quark ()">nm_setting_pppoe_error_quark</a>        (<em class="parameter"><code><span class="type">void</span></code></em>);
 #define             <a class="link" href="NMSettingPPPOE.html#NM-SETTING-PPPOE-SERVICE:CAPS" title="NM_SETTING_PPPOE_SERVICE">NM_SETTING_PPPOE_SERVICE</a>
 #define             <a class="link" href="NMSettingPPPOE.html#NM-SETTING-PPPOE-USERNAME:CAPS" title="NM_SETTING_PPPOE_USERNAME">NM_SETTING_PPPOE_USERNAME</a>
 #define             <a class="link" href="NMSettingPPPOE.html#NM-SETTING-PPPOE-PASSWORD:CAPS" title="NM_SETTING_PPPOE_PASSWORD">NM_SETTING_PPPOE_PASSWORD</a>
+#define             <a class="link" href="NMSettingPPPOE.html#NM-SETTING-PPPOE-PASSWORD-FLAGS:CAPS" title="NM_SETTING_PPPOE_PASSWORD_FLAGS">NM_SETTING_PPPOE_PASSWORD_FLAGS</a>
                     <a class="link" href="NMSettingPPPOE.html#NMSettingPPPOE-struct" title="NMSettingPPPOE">NMSettingPPPOE</a>;
                     <a class="link" href="NMSettingPPPOE.html#NMSettingPPPOEClass" title="NMSettingPPPOEClass">NMSettingPPPOEClass</a>;
 <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               <a class="link" href="NMSettingPPPOE.html#nm-setting-pppoe-get-type" title="nm_setting_pppoe_get_type ()">nm_setting_pppoe_get_type</a>           (<em class="parameter"><code><span class="type">void</span></code></em>);
@@ -56,32 +57,39 @@ enum                <a class="link" href="NMSettingPPPOE.html#NMSettingPPPOEErro
 const <span class="returnvalue">char</span> *        <a class="link" href="NMSettingPPPOE.html#nm-setting-pppoe-get-service" title="nm_setting_pppoe_get_service ()">nm_setting_pppoe_get_service</a>        (<em class="parameter"><code><a class="link" href="NMSettingPPPOE.html" title="NMSettingPPPOE"><span class="type">NMSettingPPPOE</span></a> *setting</code></em>);
 const <span class="returnvalue">char</span> *        <a class="link" href="NMSettingPPPOE.html#nm-setting-pppoe-get-username" title="nm_setting_pppoe_get_username ()">nm_setting_pppoe_get_username</a>       (<em class="parameter"><code><a class="link" href="NMSettingPPPOE.html" title="NMSettingPPPOE"><span class="type">NMSettingPPPOE</span></a> *setting</code></em>);
 const <span class="returnvalue">char</span> *        <a class="link" href="NMSettingPPPOE.html#nm-setting-pppoe-get-password" title="nm_setting_pppoe_get_password ()">nm_setting_pppoe_get_password</a>       (<em class="parameter"><code><a class="link" href="NMSettingPPPOE.html" title="NMSettingPPPOE"><span class="type">NMSettingPPPOE</span></a> *setting</code></em>);
+<a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="returnvalue">NMSettingSecretFlags</span></a>  <a class="link" href="NMSettingPPPOE.html#nm-setting-pppoe-get-password-flags" title="nm_setting_pppoe_get_password_flags ()">nm_setting_pppoe_get_password_flags</a>
+                                                        (<em class="parameter"><code><a class="link" href="NMSettingPPPOE.html" title="NMSettingPPPOE"><span class="type">NMSettingPPPOE</span></a> *setting</code></em>);
 </pre>
 </div>
-<div class="refsect1" title="Object Hierarchy">
+<div class="refsect1">
 <a name="NMSettingPPPOE.object-hierarchy"></a><h2>Object Hierarchy</h2>
 <pre class="synopsis">
+  GEnum
+   +----NMSettingPPPOEError
+</pre>
+<pre class="synopsis">
   <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>
    +----<a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
          +----NMSettingPPPOE
 </pre>
 </div>
-<div class="refsect1" title="Properties">
+<div class="refsect1">
 <a name="NMSettingPPPOE.properties"></a><h2>Properties</h2>
 <pre class="synopsis">
   "<a class="link" href="NMSettingPPPOE.html#NMSettingPPPOE--password" title='The "password" property'>password</a>"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write
+  "<a class="link" href="NMSettingPPPOE.html#NMSettingPPPOE--password-flags" title='The "password-flags" property'>password-flags</a>"           <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write
   "<a class="link" href="NMSettingPPPOE.html#NMSettingPPPOE--service" title='The "service" property'>service</a>"                  <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write
   "<a class="link" href="NMSettingPPPOE.html#NMSettingPPPOE--username" title='The "username" property'>username</a>"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write
 </pre>
 </div>
-<div class="refsect1" title="Description">
+<div class="refsect1">
 <a name="NMSettingPPPOE.description"></a><h2>Description</h2>
 <p>
 </p>
 </div>
-<div class="refsect1" title="Details">
+<div class="refsect1">
 <a name="NMSettingPPPOE.details"></a><h2>Details</h2>
-<div class="refsect2" title="NM_SETTING_PPPOE_SETTING_NAME">
+<div class="refsect2">
 <a name="NM-SETTING-PPPOE-SETTING-NAME:CAPS"></a><h3>NM_SETTING_PPPOE_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_PPPOE_SETTING_NAME "pppoe"
 </pre>
@@ -89,7 +97,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="enum NMSettingPPPOEError">
+<div class="refsect2">
 <a name="NMSettingPPPOEError"></a><h3>enum NMSettingPPPOEError</h3>
 <pre class="programlisting">typedef enum
 {
@@ -103,7 +111,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_TYPE_SETTING_PPPOE_ERROR">
+<div class="refsect2">
 <a name="NM-TYPE-SETTING-PPPOE-ERROR:CAPS"></a><h3>NM_TYPE_SETTING_PPPOE_ERROR</h3>
 <pre class="programlisting">#define NM_TYPE_SETTING_PPPOE_ERROR (nm_setting_pppoe_error_get_type ()) 
 </pre>
@@ -111,7 +119,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_PPPOE_ERROR">
+<div class="refsect2">
 <a name="NM-SETTING-PPPOE-ERROR:CAPS"></a><h3>NM_SETTING_PPPOE_ERROR</h3>
 <pre class="programlisting">#define NM_SETTING_PPPOE_ERROR nm_setting_pppoe_error_quark ()
 </pre>
@@ -119,53 +127,53 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_pppoe_error_quark ()">
+<div class="refsect2">
 <a name="nm-setting-pppoe-error-quark"></a><h3>nm_setting_pppoe_error_quark ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              nm_setting_pppoe_error_quark        (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_PPPOE_SERVICE">
+<div class="refsect2">
 <a name="NM-SETTING-PPPOE-SERVICE:CAPS"></a><h3>NM_SETTING_PPPOE_SERVICE</h3>
-<pre class="programlisting">#define NM_SETTING_PPPOE_SERVICE  "service"
+<pre class="programlisting">#define NM_SETTING_PPPOE_SERVICE        "service"
 </pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_PPPOE_USERNAME">
+<div class="refsect2">
 <a name="NM-SETTING-PPPOE-USERNAME:CAPS"></a><h3>NM_SETTING_PPPOE_USERNAME</h3>
-<pre class="programlisting">#define NM_SETTING_PPPOE_USERNAME "username"
+<pre class="programlisting">#define NM_SETTING_PPPOE_USERNAME       "username"
 </pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_PPPOE_PASSWORD">
+<div class="refsect2">
 <a name="NM-SETTING-PPPOE-PASSWORD:CAPS"></a><h3>NM_SETTING_PPPOE_PASSWORD</h3>
-<pre class="programlisting">#define NM_SETTING_PPPOE_PASSWORD "password"
+<pre class="programlisting">#define NM_SETTING_PPPOE_PASSWORD       "password"
 </pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMSettingPPPOE">
+<div class="refsect2">
+<a name="NM-SETTING-PPPOE-PASSWORD-FLAGS:CAPS"></a><h3>NM_SETTING_PPPOE_PASSWORD_FLAGS</h3>
+<pre class="programlisting">#define NM_SETTING_PPPOE_PASSWORD_FLAGS "password-flags"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="NMSettingPPPOE-struct"></a><h3>NMSettingPPPOE</h3>
 <pre class="programlisting">typedef struct _NMSettingPPPOE NMSettingPPPOE;</pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMSettingPPPOEClass">
+<div class="refsect2">
 <a name="NMSettingPPPOEClass"></a><h3>NMSettingPPPOEClass</h3>
 <pre class="programlisting">typedef struct {
 	NMSettingClass parent;
@@ -181,105 +189,65 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_pppoe_get_type ()">
+<div class="refsect2">
 <a name="nm-setting-pppoe-get-type"></a><h3>nm_setting_pppoe_get_type ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               nm_setting_pppoe_get_type           (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_pppoe_new ()">
+<div class="refsect2">
 <a name="nm-setting-pppoe-new"></a><h3>nm_setting_pppoe_new ()</h3>
 <pre class="programlisting"><a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *         nm_setting_pppoe_new                (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_pppoe_get_service ()">
+<div class="refsect2">
 <a name="nm-setting-pppoe-get-service"></a><h3>nm_setting_pppoe_get_service ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_pppoe_get_service        (<em class="parameter"><code><a class="link" href="NMSettingPPPOE.html" title="NMSettingPPPOE"><span class="type">NMSettingPPPOE</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_pppoe_get_username ()">
+<div class="refsect2">
 <a name="nm-setting-pppoe-get-username"></a><h3>nm_setting_pppoe_get_username ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_pppoe_get_username       (<em class="parameter"><code><a class="link" href="NMSettingPPPOE.html" title="NMSettingPPPOE"><span class="type">NMSettingPPPOE</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_pppoe_get_password ()">
+<div class="refsect2">
 <a name="nm-setting-pppoe-get-password"></a><h3>nm_setting_pppoe_get_password ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_pppoe_get_password       (<em class="parameter"><code><a class="link" href="NMSettingPPPOE.html" title="NMSettingPPPOE"><span class="type">NMSettingPPPOE</span></a> *setting</code></em>);</pre>
 <p>
 </p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-pppoe-get-password-flags"></a><h3>nm_setting_pppoe_get_password_flags ()</h3>
+<pre class="programlisting"><a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="returnvalue">NMSettingSecretFlags</span></a>  nm_setting_pppoe_get_password_flags
+                                                        (<em class="parameter"><code><a class="link" href="NMSettingPPPOE.html" title="NMSettingPPPOE"><span class="type">NMSettingPPPOE</span></a> *setting</code></em>);</pre>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
+<td>the <a class="link" href="NMSettingPPPOE.html" title="NMSettingPPPOE"><span class="type">NMSettingPPPOE</span></a>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
+<td>the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> pertaining to the <a class="link" href="NMSettingPPPOE.html#NMSettingPPPOE--password" title='The "password" property'><span class="type">"password"</span></a>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 </div>
-<div class="refsect1" title="Property Details">
+<div class="refsect1">
 <a name="NMSettingPPPOE.property-details"></a><h2>Property Details</h2>
-<div class="refsect2" title='The "password" property'>
+<div class="refsect2">
 <a name="NMSettingPPPOE--password"></a><h3>The <code class="literal">"password"</code> property</h3>
 <pre class="programlisting">  "password"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -288,7 +256,17 @@ Password used to authenticate with the PPPoE service.
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "service" property'>
+<div class="refsect2">
+<a name="NMSettingPPPOE--password-flags"></a><h3>The <code class="literal">"password-flags"</code> property</h3>
+<pre class="programlisting">  "password-flags"           <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write</pre>
+<p>
+Flags indicating how to handle <a class="link" href="NMSettingPPPOE.html#NMSettingPPPOE--password" title='The "password" property'><span class="type">"password"</span></a>:.
+</p>
+<p>Allowed values: &lt;= 7</p>
+<p>Default value: 0</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="NMSettingPPPOE--service"></a><h3>The <code class="literal">"service"</code> property</h3>
 <pre class="programlisting">  "service"                  <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -300,7 +278,7 @@ access concentrators or a specific service is known to be required.
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "username" property'>
+<div class="refsect2">
 <a name="NMSettingPPPOE--username"></a><h3>The <code class="literal">"username"</code> property</h3>
 <pre class="programlisting">  "username"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -312,6 +290,6 @@ Username used to authenticate with the PPPoE service.
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.15</div>
+          Generated by GTK-Doc V1.17</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingSerial.html b/docs/libnm-util/html/NMSettingSerial.html
index 33a60860d..5e5483ec0 100644
--- a/docs/libnm-util/html/NMSettingSerial.html
+++ b/docs/libnm-util/html/NMSettingSerial.html
@@ -3,12 +3,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>NMSettingSerial</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="libnm-util Reference Manual">
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingBluetooth.html" title="NMSettingBluetooth">
 <link rel="next" href="NMSettingCdma.html" title="NMSettingCdma">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,7 +30,7 @@
                   <a href="#NMSettingSerial.properties" class="shortcut">Properties</a>
 </td></tr>
 </table>
-<div class="refentry" title="NMSettingSerial">
+<div class="refentry">
 <a name="NMSettingSerial"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
@@ -39,10 +39,10 @@
 </td>
 <td valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv" title="Synopsis">
+<div class="refsynopsisdiv">
 <a name="NMSettingSerial.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">#define             <a class="link" href="NMSettingSerial.html#NM-SETTING-SERIAL-SETTING-NAME:CAPS" title="NM_SETTING_SERIAL_SETTING_NAME">NM_SETTING_SERIAL_SETTING_NAME</a>
-enum                <a class="link" href="NMSettingSerial.html#NMSettingSerialError" title="enum NMSettingSerialError">NMSettingSerialError</a>;
+<a name="NMSettingSerialError"></a><pre class="synopsis">#define             <a class="link" href="NMSettingSerial.html#NM-SETTING-SERIAL-SETTING-NAME:CAPS" title="NM_SETTING_SERIAL_SETTING_NAME">NM_SETTING_SERIAL_SETTING_NAME</a>
+enum                <a class="link" href="NMSettingSerial.html#NMSettingSerialError">NMSettingSerialError</a>;
 #define             <a class="link" href="NMSettingSerial.html#NM-TYPE-SETTING-SERIAL-ERROR:CAPS" title="NM_TYPE_SETTING_SERIAL_ERROR">NM_TYPE_SETTING_SERIAL_ERROR</a>
 #define             <a class="link" href="NMSettingSerial.html#NM-SETTING-SERIAL-ERROR:CAPS" title="NM_SETTING_SERIAL_ERROR">NM_SETTING_SERIAL_ERROR</a>
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              <a class="link" href="NMSettingSerial.html#nm-setting-serial-error-quark" title="nm_setting_serial_error_quark ()">nm_setting_serial_error_quark</a>       (<em class="parameter"><code><span class="type">void</span></code></em>);
@@ -62,15 +62,19 @@ enum                <a class="link" href="NMSettingSerial.html#NMSettingSerialEr
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint64"><span class="returnvalue">guint64</span></a>             <a class="link" href="NMSettingSerial.html#nm-setting-serial-get-send-delay" title="nm_setting_serial_get_send_delay ()">nm_setting_serial_get_send_delay</a>    (<em class="parameter"><code><a class="link" href="NMSettingSerial.html" title="NMSettingSerial"><span class="type">NMSettingSerial</span></a> *setting</code></em>);
 </pre>
 </div>
-<div class="refsect1" title="Object Hierarchy">
+<div class="refsect1">
 <a name="NMSettingSerial.object-hierarchy"></a><h2>Object Hierarchy</h2>
 <pre class="synopsis">
+  GEnum
+   +----NMSettingSerialError
+</pre>
+<pre class="synopsis">
   <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>
    +----<a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
          +----NMSettingSerial
 </pre>
 </div>
-<div class="refsect1" title="Properties">
+<div class="refsect1">
 <a name="NMSettingSerial.properties"></a><h2>Properties</h2>
 <pre class="synopsis">
   "<a class="link" href="NMSettingSerial.html#NMSettingSerial--baud" title='The "baud" property'>baud</a>"                     <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write / Construct
@@ -80,14 +84,14 @@ enum                <a class="link" href="NMSettingSerial.html#NMSettingSerialEr
   "<a class="link" href="NMSettingSerial.html#NMSettingSerial--stopbits" title='The "stopbits" property'>stopbits</a>"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write / Construct
 </pre>
 </div>
-<div class="refsect1" title="Description">
+<div class="refsect1">
 <a name="NMSettingSerial.description"></a><h2>Description</h2>
 <p>
 </p>
 </div>
-<div class="refsect1" title="Details">
+<div class="refsect1">
 <a name="NMSettingSerial.details"></a><h2>Details</h2>
-<div class="refsect2" title="NM_SETTING_SERIAL_SETTING_NAME">
+<div class="refsect2">
 <a name="NM-SETTING-SERIAL-SETTING-NAME:CAPS"></a><h3>NM_SETTING_SERIAL_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_SERIAL_SETTING_NAME "serial"
 </pre>
@@ -95,7 +99,7 @@ enum                <a class="link" href="NMSettingSerial.html#NMSettingSerialEr
 </p>
 </div>
 <hr>
-<div class="refsect2" title="enum NMSettingSerialError">
+<div class="refsect2">
 <a name="NMSettingSerialError"></a><h3>enum NMSettingSerialError</h3>
 <pre class="programlisting">typedef enum
 {
@@ -109,7 +113,7 @@ enum                <a class="link" href="NMSettingSerial.html#NMSettingSerialEr
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_TYPE_SETTING_SERIAL_ERROR">
+<div class="refsect2">
 <a name="NM-TYPE-SETTING-SERIAL-ERROR:CAPS"></a><h3>NM_TYPE_SETTING_SERIAL_ERROR</h3>
 <pre class="programlisting">#define NM_TYPE_SETTING_SERIAL_ERROR (nm_setting_serial_error_get_type ()) 
 </pre>
@@ -117,7 +121,7 @@ enum                <a class="link" href="NMSettingSerial.html#NMSettingSerialEr
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_SERIAL_ERROR">
+<div class="refsect2">
 <a name="NM-SETTING-SERIAL-ERROR:CAPS"></a><h3>NM_SETTING_SERIAL_ERROR</h3>
 <pre class="programlisting">#define NM_SETTING_SERIAL_ERROR nm_setting_serial_error_quark ()
 </pre>
@@ -125,22 +129,14 @@ enum                <a class="link" href="NMSettingSerial.html#NMSettingSerialEr
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_serial_error_quark ()">
+<div class="refsect2">
 <a name="nm-setting-serial-error-quark"></a><h3>nm_setting_serial_error_quark ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              nm_setting_serial_error_quark       (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_SERIAL_BAUD">
+<div class="refsect2">
 <a name="NM-SETTING-SERIAL-BAUD:CAPS"></a><h3>NM_SETTING_SERIAL_BAUD</h3>
 <pre class="programlisting">#define NM_SETTING_SERIAL_BAUD "baud"
 </pre>
@@ -148,7 +144,7 @@ enum                <a class="link" href="NMSettingSerial.html#NMSettingSerialEr
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_SERIAL_BITS">
+<div class="refsect2">
 <a name="NM-SETTING-SERIAL-BITS:CAPS"></a><h3>NM_SETTING_SERIAL_BITS</h3>
 <pre class="programlisting">#define NM_SETTING_SERIAL_BITS "bits"
 </pre>
@@ -156,7 +152,7 @@ enum                <a class="link" href="NMSettingSerial.html#NMSettingSerialEr
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_SERIAL_PARITY">
+<div class="refsect2">
 <a name="NM-SETTING-SERIAL-PARITY:CAPS"></a><h3>NM_SETTING_SERIAL_PARITY</h3>
 <pre class="programlisting">#define NM_SETTING_SERIAL_PARITY "parity"
 </pre>
@@ -164,7 +160,7 @@ enum                <a class="link" href="NMSettingSerial.html#NMSettingSerialEr
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_SERIAL_STOPBITS">
+<div class="refsect2">
 <a name="NM-SETTING-SERIAL-STOPBITS:CAPS"></a><h3>NM_SETTING_SERIAL_STOPBITS</h3>
 <pre class="programlisting">#define NM_SETTING_SERIAL_STOPBITS "stopbits"
 </pre>
@@ -172,7 +168,7 @@ enum                <a class="link" href="NMSettingSerial.html#NMSettingSerialEr
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_SERIAL_SEND_DELAY">
+<div class="refsect2">
 <a name="NM-SETTING-SERIAL-SEND-DELAY:CAPS"></a><h3>NM_SETTING_SERIAL_SEND_DELAY</h3>
 <pre class="programlisting">#define NM_SETTING_SERIAL_SEND_DELAY "send-delay"
 </pre>
@@ -180,14 +176,14 @@ enum                <a class="link" href="NMSettingSerial.html#NMSettingSerialEr
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMSettingSerial">
+<div class="refsect2">
 <a name="NMSettingSerial-struct"></a><h3>NMSettingSerial</h3>
 <pre class="programlisting">typedef struct _NMSettingSerial NMSettingSerial;</pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMSettingSerialClass">
+<div class="refsect2">
 <a name="NMSettingSerialClass"></a><h3>NMSettingSerialClass</h3>
 <pre class="programlisting">typedef struct {
 	NMSettingClass parent;
@@ -203,149 +199,58 @@ enum                <a class="link" href="NMSettingSerial.html#NMSettingSerialEr
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_serial_get_type ()">
+<div class="refsect2">
 <a name="nm-setting-serial-get-type"></a><h3>nm_setting_serial_get_type ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               nm_setting_serial_get_type          (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_serial_new ()">
+<div class="refsect2">
 <a name="nm-setting-serial-new"></a><h3>nm_setting_serial_new ()</h3>
 <pre class="programlisting"><a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *         nm_setting_serial_new               (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_serial_get_baud ()">
+<div class="refsect2">
 <a name="nm-setting-serial-get-baud"></a><h3>nm_setting_serial_get_baud ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>               nm_setting_serial_get_baud          (<em class="parameter"><code><a class="link" href="NMSettingSerial.html" title="NMSettingSerial"><span class="type">NMSettingSerial</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_serial_get_bits ()">
+<div class="refsect2">
 <a name="nm-setting-serial-get-bits"></a><h3>nm_setting_serial_get_bits ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>               nm_setting_serial_get_bits          (<em class="parameter"><code><a class="link" href="NMSettingSerial.html" title="NMSettingSerial"><span class="type">NMSettingSerial</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_serial_get_parity ()">
+<div class="refsect2">
 <a name="nm-setting-serial-get-parity"></a><h3>nm_setting_serial_get_parity ()</h3>
 <pre class="programlisting"><span class="returnvalue">char</span>                nm_setting_serial_get_parity        (<em class="parameter"><code><a class="link" href="NMSettingSerial.html" title="NMSettingSerial"><span class="type">NMSettingSerial</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_serial_get_stopbits ()">
+<div class="refsect2">
 <a name="nm-setting-serial-get-stopbits"></a><h3>nm_setting_serial_get_stopbits ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>               nm_setting_serial_get_stopbits      (<em class="parameter"><code><a class="link" href="NMSettingSerial.html" title="NMSettingSerial"><span class="type">NMSettingSerial</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_serial_get_send_delay ()">
+<div class="refsect2">
 <a name="nm-setting-serial-get-send-delay"></a><h3>nm_setting_serial_get_send_delay ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint64"><span class="returnvalue">guint64</span></a>             nm_setting_serial_get_send_delay    (<em class="parameter"><code><a class="link" href="NMSettingSerial.html" title="NMSettingSerial"><span class="type">NMSettingSerial</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 </div>
-<div class="refsect1" title="Property Details">
+<div class="refsect1">
 <a name="NMSettingSerial.property-details"></a><h2>Property Details</h2>
-<div class="refsect2" title='The "baud" property'>
+<div class="refsect2">
 <a name="NMSettingSerial--baud"></a><h3>The <code class="literal">"baud"</code> property</h3>
 <pre class="programlisting">  "baud"                     <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write / Construct</pre>
 <p>
@@ -356,7 +261,7 @@ ignore speed settings and use the highest available speed.
 <p>Default value: 57600</p>
 </div>
 <hr>
-<div class="refsect2" title='The "bits" property'>
+<div class="refsect2">
 <a name="NMSettingSerial--bits"></a><h3>The <code class="literal">"bits"</code> property</h3>
 <pre class="programlisting">  "bits"                     <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write / Construct</pre>
 <p>
@@ -366,7 +271,7 @@ Byte-width of the serial communication.
 <p>Default value: 8</p>
 </div>
 <hr>
-<div class="refsect2" title='The "parity" property'>
+<div class="refsect2">
 <a name="NMSettingSerial--parity"></a><h3>The <code class="literal">"parity"</code> property</h3>
 <pre class="programlisting">  "parity"                   <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>                 : Read / Write / Construct</pre>
 <p>
@@ -377,7 +282,7 @@ odd parity, or 'n' for no parity.
 <p>Default value: 110</p>
 </div>
 <hr>
-<div class="refsect2" title='The "send-delay" property'>
+<div class="refsect2">
 <a name="NMSettingSerial--send-delay"></a><h3>The <code class="literal">"send-delay"</code> property</h3>
 <pre class="programlisting">  "send-delay"               <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint64"><span class="type">guint64</span></a>               : Read / Write / Construct</pre>
 <p>
@@ -386,7 +291,7 @@ Time to delay between each byte sent to the modem, in microseconds.
 <p>Default value: 0</p>
 </div>
 <hr>
-<div class="refsect2" title='The "stopbits" property'>
+<div class="refsect2">
 <a name="NMSettingSerial--stopbits"></a><h3>The <code class="literal">"stopbits"</code> property</h3>
 <pre class="programlisting">  "stopbits"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write / Construct</pre>
 <p>
@@ -400,6 +305,6 @@ The 1 in '8n1' for example.
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.15</div>
+          Generated by GTK-Doc V1.17</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingVPN.html b/docs/libnm-util/html/NMSettingVPN.html
index 16df44cb0..e8cd2fb96 100644
--- a/docs/libnm-util/html/NMSettingVPN.html
+++ b/docs/libnm-util/html/NMSettingVPN.html
@@ -3,12 +3,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>NMSettingVPN</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="libnm-util Reference Manual">
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingPPPOE.html" title="NMSettingPPPOE">
 <link rel="next" href="libnm-util-nm-utils.html" title="nm-utils">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,7 +30,7 @@
                   <a href="#NMSettingVPN.properties" class="shortcut">Properties</a>
 </td></tr>
 </table>
-<div class="refentry" title="NMSettingVPN">
+<div class="refentry">
 <a name="NMSettingVPN"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
@@ -39,10 +39,10 @@
 </td>
 <td valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv" title="Synopsis">
+<div class="refsynopsisdiv">
 <a name="NMSettingVPN.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">#define             <a class="link" href="NMSettingVPN.html#NM-SETTING-VPN-SETTING-NAME:CAPS" title="NM_SETTING_VPN_SETTING_NAME">NM_SETTING_VPN_SETTING_NAME</a>
-enum                <a class="link" href="NMSettingVPN.html#NMSettingVpnError" title="enum NMSettingVpnError">NMSettingVpnError</a>;
+<a name="NMSettingVpnError"></a><pre class="synopsis">#define             <a class="link" href="NMSettingVPN.html#NM-SETTING-VPN-SETTING-NAME:CAPS" title="NM_SETTING_VPN_SETTING_NAME">NM_SETTING_VPN_SETTING_NAME</a>
+enum                <a class="link" href="NMSettingVPN.html#NMSettingVpnError">NMSettingVpnError</a>;
 #define             <a class="link" href="NMSettingVPN.html#NM-TYPE-SETTING-VPN-ERROR:CAPS" title="NM_TYPE_SETTING_VPN_ERROR">NM_TYPE_SETTING_VPN_ERROR</a>
 #define             <a class="link" href="NMSettingVPN.html#NM-SETTING-VPN-ERROR:CAPS" title="NM_SETTING_VPN_ERROR">NM_SETTING_VPN_ERROR</a>
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              <a class="link" href="NMSettingVPN.html#nm-setting-vpn-error-quark" title="nm_setting_vpn_error_quark ()">nm_setting_vpn_error_quark</a>          (<em class="parameter"><code><span class="type">void</span></code></em>);
@@ -52,7 +52,7 @@ enum                <a class="link" href="NMSettingVPN.html#NMSettingVpnError" t
 #define             <a class="link" href="NMSettingVPN.html#NM-SETTING-VPN-SECRETS:CAPS" title="NM_SETTING_VPN_SECRETS">NM_SETTING_VPN_SECRETS</a>
                     <a class="link" href="NMSettingVPN.html#NMSettingVPN-struct" title="NMSettingVPN">NMSettingVPN</a>;
                     <a class="link" href="NMSettingVPN.html#NMSettingVPNClass" title="NMSettingVPNClass">NMSettingVPNClass</a>;
-<span class="returnvalue">void</span>                (<a class="link" href="NMSettingVPN.html#VPNIterFunc" title="VPNIterFunc ()">*VPNIterFunc</a>)                      (<em class="parameter"><code>const <span class="type">char</span> *key</code></em>,
+<span class="returnvalue">void</span>                (<a class="link" href="NMSettingVPN.html#NMVPNIterFunc" title="NMVPNIterFunc ()">*NMVPNIterFunc</a>)                    (<em class="parameter"><code>const <span class="type">char</span> *key</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *value</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
 <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               <a class="link" href="NMSettingVPN.html#nm-setting-vpn-get-type" title="nm_setting_vpn_get_type ()">nm_setting_vpn_get_type</a>             (<em class="parameter"><code><span class="type">void</span></code></em>);
@@ -67,7 +67,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 <span class="returnvalue">void</span>                <a class="link" href="NMSettingVPN.html#nm-setting-vpn-remove-data-item" title="nm_setting_vpn_remove_data_item ()">nm_setting_vpn_remove_data_item</a>     (<em class="parameter"><code><a class="link" href="NMSettingVPN.html" title="NMSettingVPN"><span class="type">NMSettingVPN</span></a> *setting</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *key</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="NMSettingVPN.html#nm-setting-vpn-foreach-data-item" title="nm_setting_vpn_foreach_data_item ()">nm_setting_vpn_foreach_data_item</a>    (<em class="parameter"><code><a class="link" href="NMSettingVPN.html" title="NMSettingVPN"><span class="type">NMSettingVPN</span></a> *setting</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSettingVPN.html#VPNIterFunc" title="VPNIterFunc ()"><span class="type">VPNIterFunc</span></a> func</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="NMSettingVPN.html#NMVPNIterFunc" title="NMVPNIterFunc ()"><span class="type">NMVPNIterFunc</span></a> func</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="NMSettingVPN.html#nm-setting-vpn-add-secret" title="nm_setting_vpn_add_secret ()">nm_setting_vpn_add_secret</a>           (<em class="parameter"><code><a class="link" href="NMSettingVPN.html" title="NMSettingVPN"><span class="type">NMSettingVPN</span></a> *setting</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *key</code></em>,
@@ -77,19 +77,23 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 <span class="returnvalue">void</span>                <a class="link" href="NMSettingVPN.html#nm-setting-vpn-remove-secret" title="nm_setting_vpn_remove_secret ()">nm_setting_vpn_remove_secret</a>        (<em class="parameter"><code><a class="link" href="NMSettingVPN.html" title="NMSettingVPN"><span class="type">NMSettingVPN</span></a> *setting</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *key</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="NMSettingVPN.html#nm-setting-vpn-foreach-secret" title="nm_setting_vpn_foreach_secret ()">nm_setting_vpn_foreach_secret</a>       (<em class="parameter"><code><a class="link" href="NMSettingVPN.html" title="NMSettingVPN"><span class="type">NMSettingVPN</span></a> *setting</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSettingVPN.html#VPNIterFunc" title="VPNIterFunc ()"><span class="type">VPNIterFunc</span></a> func</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="NMSettingVPN.html#NMVPNIterFunc" title="NMVPNIterFunc ()"><span class="type">NMVPNIterFunc</span></a> func</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
 </pre>
 </div>
-<div class="refsect1" title="Object Hierarchy">
+<div class="refsect1">
 <a name="NMSettingVPN.object-hierarchy"></a><h2>Object Hierarchy</h2>
 <pre class="synopsis">
+  GEnum
+   +----NMSettingVpnError
+</pre>
+<pre class="synopsis">
   <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>
    +----<a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
          +----NMSettingVPN
 </pre>
 </div>
-<div class="refsect1" title="Properties">
+<div class="refsect1">
 <a name="NMSettingVPN.properties"></a><h2>Properties</h2>
 <pre class="synopsis">
   "<a class="link" href="NMSettingVPN.html#NMSettingVPN--data" title='The "data" property'>data</a>"                     <span class="type">GHashTable_gchararray+gchararray_*</span>  : Read / Write
@@ -98,14 +102,14 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
   "<a class="link" href="NMSettingVPN.html#NMSettingVPN--user-name" title='The "user-name" property'>user-name</a>"                <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write
 </pre>
 </div>
-<div class="refsect1" title="Description">
+<div class="refsect1">
 <a name="NMSettingVPN.description"></a><h2>Description</h2>
 <p>
 </p>
 </div>
-<div class="refsect1" title="Details">
+<div class="refsect1">
 <a name="NMSettingVPN.details"></a><h2>Details</h2>
-<div class="refsect2" title="NM_SETTING_VPN_SETTING_NAME">
+<div class="refsect2">
 <a name="NM-SETTING-VPN-SETTING-NAME:CAPS"></a><h3>NM_SETTING_VPN_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_VPN_SETTING_NAME "vpn"
 </pre>
@@ -113,7 +117,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="enum NMSettingVpnError">
+<div class="refsect2">
 <a name="NMSettingVpnError"></a><h3>enum NMSettingVpnError</h3>
 <pre class="programlisting">typedef enum
 {
@@ -126,7 +130,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_TYPE_SETTING_VPN_ERROR">
+<div class="refsect2">
 <a name="NM-TYPE-SETTING-VPN-ERROR:CAPS"></a><h3>NM_TYPE_SETTING_VPN_ERROR</h3>
 <pre class="programlisting">#define NM_TYPE_SETTING_VPN_ERROR (nm_setting_vpn_error_get_type ()) 
 </pre>
@@ -134,7 +138,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_VPN_ERROR">
+<div class="refsect2">
 <a name="NM-SETTING-VPN-ERROR:CAPS"></a><h3>NM_SETTING_VPN_ERROR</h3>
 <pre class="programlisting">#define NM_SETTING_VPN_ERROR nm_setting_vpn_error_quark ()
 </pre>
@@ -142,22 +146,14 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_vpn_error_quark ()">
+<div class="refsect2">
 <a name="nm-setting-vpn-error-quark"></a><h3>nm_setting_vpn_error_quark ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              nm_setting_vpn_error_quark          (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_VPN_SERVICE_TYPE">
+<div class="refsect2">
 <a name="NM-SETTING-VPN-SERVICE-TYPE:CAPS"></a><h3>NM_SETTING_VPN_SERVICE_TYPE</h3>
 <pre class="programlisting">#define NM_SETTING_VPN_SERVICE_TYPE "service-type"
 </pre>
@@ -165,7 +161,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_VPN_USER_NAME">
+<div class="refsect2">
 <a name="NM-SETTING-VPN-USER-NAME:CAPS"></a><h3>NM_SETTING_VPN_USER_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_VPN_USER_NAME    "user-name"
 </pre>
@@ -173,7 +169,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_VPN_DATA">
+<div class="refsect2">
 <a name="NM-SETTING-VPN-DATA:CAPS"></a><h3>NM_SETTING_VPN_DATA</h3>
 <pre class="programlisting">#define NM_SETTING_VPN_DATA         "data"
 </pre>
@@ -181,7 +177,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_VPN_SECRETS">
+<div class="refsect2">
 <a name="NM-SETTING-VPN-SECRETS:CAPS"></a><h3>NM_SETTING_VPN_SECRETS</h3>
 <pre class="programlisting">#define NM_SETTING_VPN_SECRETS      "secrets"
 </pre>
@@ -189,14 +185,14 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMSettingVPN">
+<div class="refsect2">
 <a name="NMSettingVPN-struct"></a><h3>NMSettingVPN</h3>
 <pre class="programlisting">typedef struct _NMSettingVPN NMSettingVPN;</pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMSettingVPNClass">
+<div class="refsect2">
 <a name="NMSettingVPNClass"></a><h3>NMSettingVPNClass</h3>
 <pre class="programlisting">typedef struct {
 	NMSettingClass parent;
@@ -212,330 +208,156 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="VPNIterFunc ()">
-<a name="VPNIterFunc"></a><h3>VPNIterFunc ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                (*VPNIterFunc)                      (<em class="parameter"><code>const <span class="type">char</span> *key</code></em>,
+<div class="refsect2">
+<a name="NMVPNIterFunc"></a><h3>NMVPNIterFunc ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                (*NMVPNIterFunc)                    (<em class="parameter"><code>const <span class="type">char</span> *key</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *value</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>key</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_vpn_get_type ()">
+<div class="refsect2">
 <a name="nm-setting-vpn-get-type"></a><h3>nm_setting_vpn_get_type ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               nm_setting_vpn_get_type             (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_vpn_new ()">
+<div class="refsect2">
 <a name="nm-setting-vpn-new"></a><h3>nm_setting_vpn_new ()</h3>
 <pre class="programlisting"><a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *         nm_setting_vpn_new                  (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_vpn_get_service_type ()">
+<div class="refsect2">
 <a name="nm-setting-vpn-get-service-type"></a><h3>nm_setting_vpn_get_service_type ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_vpn_get_service_type     (<em class="parameter"><code><a class="link" href="NMSettingVPN.html" title="NMSettingVPN"><span class="type">NMSettingVPN</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_vpn_get_user_name ()">
+<div class="refsect2">
 <a name="nm-setting-vpn-get-user-name"></a><h3>nm_setting_vpn_get_user_name ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_vpn_get_user_name        (<em class="parameter"><code><a class="link" href="NMSettingVPN.html" title="NMSettingVPN"><span class="type">NMSettingVPN</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_vpn_add_data_item ()">
+<div class="refsect2">
 <a name="nm-setting-vpn-add-data-item"></a><h3>nm_setting_vpn_add_data_item ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_setting_vpn_add_data_item        (<em class="parameter"><code><a class="link" href="NMSettingVPN.html" title="NMSettingVPN"><span class="type">NMSettingVPN</span></a> *setting</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *key</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *item</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>key</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>item</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_vpn_get_data_item ()">
+<div class="refsect2">
 <a name="nm-setting-vpn-get-data-item"></a><h3>nm_setting_vpn_get_data_item ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_vpn_get_data_item        (<em class="parameter"><code><a class="link" href="NMSettingVPN.html" title="NMSettingVPN"><span class="type">NMSettingVPN</span></a> *setting</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *key</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>key</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_vpn_remove_data_item ()">
+<div class="refsect2">
 <a name="nm-setting-vpn-remove-data-item"></a><h3>nm_setting_vpn_remove_data_item ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_setting_vpn_remove_data_item     (<em class="parameter"><code><a class="link" href="NMSettingVPN.html" title="NMSettingVPN"><span class="type">NMSettingVPN</span></a> *setting</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *key</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>key</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_vpn_foreach_data_item ()">
+<div class="refsect2">
 <a name="nm-setting-vpn-foreach-data-item"></a><h3>nm_setting_vpn_foreach_data_item ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_setting_vpn_foreach_data_item    (<em class="parameter"><code><a class="link" href="NMSettingVPN.html" title="NMSettingVPN"><span class="type">NMSettingVPN</span></a> *setting</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSettingVPN.html#VPNIterFunc" title="VPNIterFunc ()"><span class="type">VPNIterFunc</span></a> func</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="NMSettingVPN.html#NMVPNIterFunc" title="NMVPNIterFunc ()"><span class="type">NMVPNIterFunc</span></a> func</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
 <p>
+Iterates all data items stored in this setting
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
+<td>a <a class="link" href="NMSettingVPN.html" title="NMSettingVPN"><span class="type">NMSettingVPN</span></a>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>func</code></em> :</span></p></td>
-<td>
+<td>an user provided function. <span class="annotation">[<acronym title="The callback is valid only during the call to the method."><span class="acronym">scope call</span></acronym>]</span>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
-<td>
+<td>data to be passed to <em class="parameter"><code>func</code></em>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_vpn_add_secret ()">
+<div class="refsect2">
 <a name="nm-setting-vpn-add-secret"></a><h3>nm_setting_vpn_add_secret ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_setting_vpn_add_secret           (<em class="parameter"><code><a class="link" href="NMSettingVPN.html" title="NMSettingVPN"><span class="type">NMSettingVPN</span></a> *setting</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *key</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *secret</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>key</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>secret</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_vpn_get_secret ()">
+<div class="refsect2">
 <a name="nm-setting-vpn-get-secret"></a><h3>nm_setting_vpn_get_secret ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_vpn_get_secret           (<em class="parameter"><code><a class="link" href="NMSettingVPN.html" title="NMSettingVPN"><span class="type">NMSettingVPN</span></a> *setting</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *key</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>key</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_vpn_remove_secret ()">
+<div class="refsect2">
 <a name="nm-setting-vpn-remove-secret"></a><h3>nm_setting_vpn_remove_secret ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_setting_vpn_remove_secret        (<em class="parameter"><code><a class="link" href="NMSettingVPN.html" title="NMSettingVPN"><span class="type">NMSettingVPN</span></a> *setting</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *key</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>key</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_vpn_foreach_secret ()">
+<div class="refsect2">
 <a name="nm-setting-vpn-foreach-secret"></a><h3>nm_setting_vpn_foreach_secret ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_setting_vpn_foreach_secret       (<em class="parameter"><code><a class="link" href="NMSettingVPN.html" title="NMSettingVPN"><span class="type">NMSettingVPN</span></a> *setting</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSettingVPN.html#VPNIterFunc" title="VPNIterFunc ()"><span class="type">VPNIterFunc</span></a> func</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="NMSettingVPN.html#NMVPNIterFunc" title="NMVPNIterFunc ()"><span class="type">NMVPNIterFunc</span></a> func</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
 <p>
+Iterates all secrets stored in this setting.
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
+<td>a <a class="link" href="NMSettingVPN.html" title="NMSettingVPN"><span class="type">NMSettingVPN</span></a>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>func</code></em> :</span></p></td>
-<td>
+<td>an user provided function. <span class="annotation">[<acronym title="The callback is valid only during the call to the method."><span class="acronym">scope call</span></acronym>]</span>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
-<td>
+<td>data to be passed to <em class="parameter"><code>func</code></em>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 </div>
-<div class="refsect1" title="Property Details">
+<div class="refsect1">
 <a name="NMSettingVPN.property-details"></a><h2>Property Details</h2>
-<div class="refsect2" title='The "data" property'>
+<div class="refsect2">
 <a name="NMSettingVPN--data"></a><h3>The <code class="literal">"data"</code> property</h3>
 <pre class="programlisting">  "data"                     <span class="type">GHashTable_gchararray+gchararray_*</span>  : Read / Write</pre>
 <p>
@@ -544,7 +366,7 @@ and values must be strings.
 </p>
 </div>
 <hr>
-<div class="refsect2" title='The "secrets" property'>
+<div class="refsect2">
 <a name="NMSettingVPN--secrets"></a><h3>The <code class="literal">"secrets"</code> property</h3>
 <pre class="programlisting">  "secrets"                  <span class="type">GHashTable_gchararray+gchararray_*</span>  : Read / Write</pre>
 <p>
@@ -553,7 +375,7 @@ passwords or private keys.  Both keys and values must be strings.
 </p>
 </div>
 <hr>
-<div class="refsect2" title='The "service-type" property'>
+<div class="refsect2">
 <a name="NMSettingVPN--service-type"></a><h3>The <code class="literal">"service-type"</code> property</h3>
 <pre class="programlisting">  "service-type"             <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -564,7 +386,7 @@ plugin.
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "user-name" property'>
+<div class="refsect2">
 <a name="NMSettingVPN--user-name"></a><h3>The <code class="literal">"user-name"</code> property</h3>
 <pre class="programlisting">  "user-name"                <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>User name of the currently logged in user for connections provided by the user settings service.  This name is provided to the VPN plugin to use in lieu of a custom username provided by that VPN plugins specific configuration.  The VPN plugin itself decides which user name to use.</p>
@@ -574,6 +396,6 @@ plugin.
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.15</div>
+          Generated by GTK-Doc V1.17</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingWired.html b/docs/libnm-util/html/NMSettingWired.html
index f9333d3ea..0b7075664 100644
--- a/docs/libnm-util/html/NMSettingWired.html
+++ b/docs/libnm-util/html/NMSettingWired.html
@@ -3,12 +3,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>NMSettingWired</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="libnm-util Reference Manual">
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingConnection.html" title="NMSettingConnection">
 <link rel="next" href="NMSettingWireless.html" title="NMSettingWireless">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,7 +30,7 @@
                   <a href="#NMSettingWired.properties" class="shortcut">Properties</a>
 </td></tr>
 </table>
-<div class="refentry" title="NMSettingWired">
+<div class="refentry">
 <a name="NMSettingWired"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
@@ -39,10 +39,10 @@
 </td>
 <td valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv" title="Synopsis">
+<div class="refsynopsisdiv">
 <a name="NMSettingWired.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">#define             <a class="link" href="NMSettingWired.html#NM-SETTING-WIRED-SETTING-NAME:CAPS" title="NM_SETTING_WIRED_SETTING_NAME">NM_SETTING_WIRED_SETTING_NAME</a>
-enum                <a class="link" href="NMSettingWired.html#NMSettingWiredError" title="enum NMSettingWiredError">NMSettingWiredError</a>;
+<a name="NMSettingWiredError"></a><pre class="synopsis">#define             <a class="link" href="NMSettingWired.html#NM-SETTING-WIRED-SETTING-NAME:CAPS" title="NM_SETTING_WIRED_SETTING_NAME">NM_SETTING_WIRED_SETTING_NAME</a>
+enum                <a class="link" href="NMSettingWired.html#NMSettingWiredError">NMSettingWiredError</a>;
 #define             <a class="link" href="NMSettingWired.html#NM-TYPE-SETTING-WIRED-ERROR:CAPS" title="NM_TYPE_SETTING_WIRED_ERROR">NM_TYPE_SETTING_WIRED_ERROR</a>
 #define             <a class="link" href="NMSettingWired.html#NM-SETTING-WIRED-ERROR:CAPS" title="NM_SETTING_WIRED_ERROR">NM_SETTING_WIRED_ERROR</a>
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              <a class="link" href="NMSettingWired.html#nm-setting-wired-error-quark" title="nm_setting_wired_error_quark ()">nm_setting_wired_error_quark</a>        (<em class="parameter"><code><span class="type">void</span></code></em>);
@@ -87,15 +87,19 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
                                                          <em class="parameter"><code>const <span class="type">char</span> *key</code></em>);
 </pre>
 </div>
-<div class="refsect1" title="Object Hierarchy">
+<div class="refsect1">
 <a name="NMSettingWired.object-hierarchy"></a><h2>Object Hierarchy</h2>
 <pre class="synopsis">
+  GEnum
+   +----NMSettingWiredError
+</pre>
+<pre class="synopsis">
   <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>
    +----<a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
          +----NMSettingWired
 </pre>
 </div>
-<div class="refsect1" title="Properties">
+<div class="refsect1">
 <a name="NMSettingWired.properties"></a><h2>Properties</h2>
 <pre class="synopsis">
   "<a class="link" href="NMSettingWired.html#NMSettingWired--auto-negotiate" title='The "auto-negotiate" property'>auto-negotiate</a>"           <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write / Construct
@@ -110,14 +114,14 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
   "<a class="link" href="NMSettingWired.html#NMSettingWired--speed" title='The "speed" property'>speed</a>"                    <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write / Construct
 </pre>
 </div>
-<div class="refsect1" title="Description">
+<div class="refsect1">
 <a name="NMSettingWired.description"></a><h2>Description</h2>
 <p>
 </p>
 </div>
-<div class="refsect1" title="Details">
+<div class="refsect1">
 <a name="NMSettingWired.details"></a><h2>Details</h2>
-<div class="refsect2" title="NM_SETTING_WIRED_SETTING_NAME">
+<div class="refsect2">
 <a name="NM-SETTING-WIRED-SETTING-NAME:CAPS"></a><h3>NM_SETTING_WIRED_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_WIRED_SETTING_NAME "802-3-ethernet"
 </pre>
@@ -125,7 +129,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="enum NMSettingWiredError">
+<div class="refsect2">
 <a name="NMSettingWiredError"></a><h3>enum NMSettingWiredError</h3>
 <pre class="programlisting">typedef enum
 {
@@ -138,7 +142,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_TYPE_SETTING_WIRED_ERROR">
+<div class="refsect2">
 <a name="NM-TYPE-SETTING-WIRED-ERROR:CAPS"></a><h3>NM_TYPE_SETTING_WIRED_ERROR</h3>
 <pre class="programlisting">#define NM_TYPE_SETTING_WIRED_ERROR (nm_setting_wired_error_get_type ()) 
 </pre>
@@ -146,7 +150,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRED_ERROR">
+<div class="refsect2">
 <a name="NM-SETTING-WIRED-ERROR:CAPS"></a><h3>NM_SETTING_WIRED_ERROR</h3>
 <pre class="programlisting">#define NM_SETTING_WIRED_ERROR nm_setting_wired_error_quark ()
 </pre>
@@ -154,22 +158,14 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wired_error_quark ()">
+<div class="refsect2">
 <a name="nm-setting-wired-error-quark"></a><h3>nm_setting_wired_error_quark ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              nm_setting_wired_error_quark        (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRED_PORT">
+<div class="refsect2">
 <a name="NM-SETTING-WIRED-PORT:CAPS"></a><h3>NM_SETTING_WIRED_PORT</h3>
 <pre class="programlisting">#define NM_SETTING_WIRED_PORT "port"
 </pre>
@@ -177,7 +173,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRED_SPEED">
+<div class="refsect2">
 <a name="NM-SETTING-WIRED-SPEED:CAPS"></a><h3>NM_SETTING_WIRED_SPEED</h3>
 <pre class="programlisting">#define NM_SETTING_WIRED_SPEED "speed"
 </pre>
@@ -185,7 +181,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRED_DUPLEX">
+<div class="refsect2">
 <a name="NM-SETTING-WIRED-DUPLEX:CAPS"></a><h3>NM_SETTING_WIRED_DUPLEX</h3>
 <pre class="programlisting">#define NM_SETTING_WIRED_DUPLEX "duplex"
 </pre>
@@ -193,7 +189,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRED_AUTO_NEGOTIATE">
+<div class="refsect2">
 <a name="NM-SETTING-WIRED-AUTO-NEGOTIATE:CAPS"></a><h3>NM_SETTING_WIRED_AUTO_NEGOTIATE</h3>
 <pre class="programlisting">#define NM_SETTING_WIRED_AUTO_NEGOTIATE "auto-negotiate"
 </pre>
@@ -201,7 +197,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRED_MAC_ADDRESS">
+<div class="refsect2">
 <a name="NM-SETTING-WIRED-MAC-ADDRESS:CAPS"></a><h3>NM_SETTING_WIRED_MAC_ADDRESS</h3>
 <pre class="programlisting">#define NM_SETTING_WIRED_MAC_ADDRESS "mac-address"
 </pre>
@@ -209,7 +205,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRED_CLONED_MAC_ADDRESS">
+<div class="refsect2">
 <a name="NM-SETTING-WIRED-CLONED-MAC-ADDRESS:CAPS"></a><h3>NM_SETTING_WIRED_CLONED_MAC_ADDRESS</h3>
 <pre class="programlisting">#define NM_SETTING_WIRED_CLONED_MAC_ADDRESS "cloned-mac-address"
 </pre>
@@ -217,7 +213,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRED_MTU">
+<div class="refsect2">
 <a name="NM-SETTING-WIRED-MTU:CAPS"></a><h3>NM_SETTING_WIRED_MTU</h3>
 <pre class="programlisting">#define NM_SETTING_WIRED_MTU "mtu"
 </pre>
@@ -225,7 +221,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRED_S390_SUBCHANNELS">
+<div class="refsect2">
 <a name="NM-SETTING-WIRED-S390-SUBCHANNELS:CAPS"></a><h3>NM_SETTING_WIRED_S390_SUBCHANNELS</h3>
 <pre class="programlisting">#define NM_SETTING_WIRED_S390_SUBCHANNELS "s390-subchannels"
 </pre>
@@ -233,7 +229,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRED_S390_NETTYPE">
+<div class="refsect2">
 <a name="NM-SETTING-WIRED-S390-NETTYPE:CAPS"></a><h3>NM_SETTING_WIRED_S390_NETTYPE</h3>
 <pre class="programlisting">#define NM_SETTING_WIRED_S390_NETTYPE "s390-nettype"
 </pre>
@@ -241,7 +237,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRED_S390_OPTIONS">
+<div class="refsect2">
 <a name="NM-SETTING-WIRED-S390-OPTIONS:CAPS"></a><h3>NM_SETTING_WIRED_S390_OPTIONS</h3>
 <pre class="programlisting">#define NM_SETTING_WIRED_S390_OPTIONS "s390-options"
 </pre>
@@ -249,14 +245,14 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMSettingWired">
+<div class="refsect2">
 <a name="NMSettingWired-struct"></a><h3>NMSettingWired</h3>
 <pre class="programlisting">typedef struct _NMSettingWired NMSettingWired;</pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMSettingWiredClass">
+<div class="refsect2">
 <a name="NMSettingWiredClass"></a><h3>NMSettingWiredClass</h3>
 <pre class="programlisting">typedef struct {
 	NMSettingClass parent;
@@ -272,192 +268,71 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wired_get_type ()">
+<div class="refsect2">
 <a name="nm-setting-wired-get-type"></a><h3>nm_setting_wired_get_type ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               nm_setting_wired_get_type           (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wired_new ()">
+<div class="refsect2">
 <a name="nm-setting-wired-new"></a><h3>nm_setting_wired_new ()</h3>
 <pre class="programlisting"><a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *         nm_setting_wired_new                (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wired_get_port ()">
+<div class="refsect2">
 <a name="nm-setting-wired-get-port"></a><h3>nm_setting_wired_get_port ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_wired_get_port           (<em class="parameter"><code><a class="link" href="NMSettingWired.html" title="NMSettingWired"><span class="type">NMSettingWired</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wired_get_speed ()">
+<div class="refsect2">
 <a name="nm-setting-wired-get-speed"></a><h3>nm_setting_wired_get_speed ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_setting_wired_get_speed          (<em class="parameter"><code><a class="link" href="NMSettingWired.html" title="NMSettingWired"><span class="type">NMSettingWired</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wired_get_duplex ()">
+<div class="refsect2">
 <a name="nm-setting-wired-get-duplex"></a><h3>nm_setting_wired_get_duplex ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_wired_get_duplex         (<em class="parameter"><code><a class="link" href="NMSettingWired.html" title="NMSettingWired"><span class="type">NMSettingWired</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wired_get_auto_negotiate ()">
+<div class="refsect2">
 <a name="nm-setting-wired-get-auto-negotiate"></a><h3>nm_setting_wired_get_auto_negotiate ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_wired_get_auto_negotiate (<em class="parameter"><code><a class="link" href="NMSettingWired.html" title="NMSettingWired"><span class="type">NMSettingWired</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wired_get_mac_address ()">
+<div class="refsect2">
 <a name="nm-setting-wired-get-mac-address"></a><h3>nm_setting_wired_get_mac_address ()</h3>
 <pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *  nm_setting_wired_get_mac_address    (<em class="parameter"><code><a class="link" href="NMSettingWired.html" title="NMSettingWired"><span class="type">NMSettingWired</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wired_get_cloned_mac_address ()">
+<div class="refsect2">
 <a name="nm-setting-wired-get-cloned-mac-address"></a><h3>nm_setting_wired_get_cloned_mac_address ()</h3>
 <pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *  nm_setting_wired_get_cloned_mac_address
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWired.html" title="NMSettingWired"><span class="type">NMSettingWired</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wired_get_mtu ()">
+<div class="refsect2">
 <a name="nm-setting-wired-get-mtu"></a><h3>nm_setting_wired_get_mtu ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_setting_wired_get_mtu            (<em class="parameter"><code><a class="link" href="NMSettingWired.html" title="NMSettingWired"><span class="type">NMSettingWired</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wired_get_s390_subchannels ()">
+<div class="refsect2">
 <a name="nm-setting-wired-get-s390-subchannels"></a><h3>nm_setting_wired_get_s390_subchannels ()</h3>
 <pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="returnvalue">GPtrArray</span></a> *   nm_setting_wired_get_s390_subchannels
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWired.html" title="NMSettingWired"><span class="type">NMSettingWired</span></a> *setting</code></em>);</pre>
@@ -476,15 +351,14 @@ conjunction with that device.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> of strings, each specifying one subchannel the
-s390 device uses to communicate to the host.
-</td>
+<td>a <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> of strings, each specifying one subchannel the
+s390 device uses to communicate to the host.</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wired_get_s390_nettype ()">
+<div class="refsect2">
 <a name="nm-setting-wired-get-s390-nettype"></a><h3>nm_setting_wired_get_s390_nettype ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_wired_get_s390_nettype   (<em class="parameter"><code><a class="link" href="NMSettingWired.html" title="NMSettingWired"><span class="type">NMSettingWired</span></a> *setting</code></em>);</pre>
 <p>
@@ -501,14 +375,13 @@ of 'qeth', 'lcs', or 'ctcm'.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the s390 device type
-</td>
+<td>the s390 device type</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wired_get_num_s390_options ()">
+<div class="refsect2">
 <a name="nm-setting-wired-get-num-s390-options"></a><h3>nm_setting_wired_get_num_s390_options ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_setting_wired_get_num_s390_options
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWired.html" title="NMSettingWired"><span class="type">NMSettingWired</span></a> *setting</code></em>);</pre>
@@ -527,14 +400,13 @@ option individually using <a class="link" href="NMSettingWired.html#nm-setting-w
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the number of s390-specific device options
-</td>
+<td>the number of s390-specific device options</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wired_get_s390_option ()">
+<div class="refsect2">
 <a name="nm-setting-wired-get-s390-option"></a><h3>nm_setting_wired_get_s390_option ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_wired_get_s390_option    (<em class="parameter"><code><a class="link" href="NMSettingWired.html" title="NMSettingWired"><span class="type">NMSettingWired</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> idx</code></em>,
@@ -558,33 +430,30 @@ such as during option iteration.
 <tr>
 <td><p><span class="term"><em class="parameter"><code>idx</code></em> :</span></p></td>
 <td>index of the desired option, from 0 to
-<a class="link" href="NMSettingWired.html#nm-setting-wired-get-num-s390-options" title="nm_setting_wired_get_num_s390_options ()"><code class="function">nm_setting_wired_get_num_s390_options()</code></a> - 1
-</td>
+<a class="link" href="NMSettingWired.html#nm-setting-wired-get-num-s390-options" title="nm_setting_wired_get_num_s390_options ()"><code class="function">nm_setting_wired_get_num_s390_options()</code></a> - 1</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>out_key</code></em> :</span></p></td>
 <td>on return, the key name of the s390 specific option; this value is
-owned by the setting and should not be modified
-</td>
+owned by the setting and should not be modified</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>out_value</code></em> :</span></p></td>
 <td>on return, the value of the key of the s390 specific option; this
-value is owned by the setting and should not be modified
-</td>
+value is owned by the setting and should not be modified</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> on success if the index was valid and an option was found,
+<td>
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> on success if the index was valid and an option was found,
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if the index was invalid (ie, greater than the number of options
-currently held by the setting)
-</td>
+currently held by the setting)</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wired_get_s390_option_by_key ()">
+<div class="refsect2">
 <a name="nm-setting-wired-get-s390-option-by-key"></a><h3>nm_setting_wired_get_s390_option_by_key ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_wired_get_s390_option_by_key
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWired.html" title="NMSettingWired"><span class="type">NMSettingWired</span></a> *setting</code></em>,
@@ -603,91 +472,44 @@ Returns the value associated with the s390-specific option specified by
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>key</code></em> :</span></p></td>
-<td>the key for which to retrieve the value
-</td>
+<td>the key for which to retrieve the value</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the value, or NULL if the key/value pair was never added to the
-setting; the value is owned by the setting and must not be modified
-</td>
+<td>the value, or NULL if the key/value pair was never added to the
+setting; the value is owned by the setting and must not be modified</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wired_add_s390_option ()">
+<div class="refsect2">
 <a name="nm-setting-wired-add-s390-option"></a><h3>nm_setting_wired_add_s390_option ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_wired_add_s390_option    (<em class="parameter"><code><a class="link" href="NMSettingWired.html" title="NMSettingWired"><span class="type">NMSettingWired</span></a> *setting</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *key</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *item</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>key</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>item</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wired_remove_s390_option ()">
+<div class="refsect2">
 <a name="nm-setting-wired-remove-s390-option"></a><h3>nm_setting_wired_remove_s390_option ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_wired_remove_s390_option (<em class="parameter"><code><a class="link" href="NMSettingWired.html" title="NMSettingWired"><span class="type">NMSettingWired</span></a> *setting</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *key</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>key</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 </div>
-<div class="refsect1" title="Property Details">
+<div class="refsect1">
 <a name="NMSettingWired.property-details"></a><h2>Property Details</h2>
-<div class="refsect2" title='The "auto-negotiate" property'>
+<div class="refsect2">
 <a name="NMSettingWired--auto-negotiate"></a><h3>The <code class="literal">"auto-negotiate"</code> property</h3>
 <pre class="programlisting">  "auto-negotiate"           <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write / Construct</pre>
 <p>If TRUE, allow auto-negotiation of port speed and duplex mode.  If FALSE, do not allow auto-negotiation,in which case the 'speed' and 'duplex' properties should be set.</p>
 <p>Default value: TRUE</p>
 </div>
 <hr>
-<div class="refsect2" title='The "cloned-mac-address" property'>
+<div class="refsect2">
 <a name="NMSettingWired--cloned-mac-address"></a><h3>The <code class="literal">"cloned-mac-address"</code> property</h3>
 <pre class="programlisting">  "cloned-mac-address"       <span class="type">GArray_guchar_</span>*       : Read / Write</pre>
 <p>
@@ -696,7 +518,7 @@ permanent MAC address.  This is known as MAC cloning or spoofing.
 </p>
 </div>
 <hr>
-<div class="refsect2" title='The "duplex" property'>
+<div class="refsect2">
 <a name="NMSettingWired--duplex"></a><h3>The <code class="literal">"duplex"</code> property</h3>
 <pre class="programlisting">  "duplex"                   <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -706,7 +528,7 @@ Either 'half' or 'full'.
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "mac-address" property'>
+<div class="refsect2">
 <a name="NMSettingWired--mac-address"></a><h3>The <code class="literal">"mac-address"</code> property</h3>
 <pre class="programlisting">  "mac-address"              <span class="type">GArray_guchar_</span>*       : Read / Write</pre>
 <p>
@@ -716,7 +538,7 @@ of the device (i.e. MAC spoofing).
 </p>
 </div>
 <hr>
-<div class="refsect2" title='The "mtu" property'>
+<div class="refsect2">
 <a name="NMSettingWired--mtu"></a><h3>The <code class="literal">"mtu"</code> property</h3>
 <pre class="programlisting">  "mtu"                      <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write / Construct</pre>
 <p>
@@ -726,7 +548,7 @@ breaking larger packets up into multiple Ethernet frames.
 <p>Default value: 0</p>
 </div>
 <hr>
-<div class="refsect2" title='The "port" property'>
+<div class="refsect2">
 <a name="NMSettingWired--port"></a><h3>The <code class="literal">"port"</code> property</h3>
 <pre class="programlisting">  "port"                     <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -738,7 +560,7 @@ If the device supports only one port type, this setting is ignored.
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "s390-nettype" property'>
+<div class="refsect2">
 <a name="NMSettingWired--s390-nettype"></a><h3>The <code class="literal">"s390-nettype"</code> property</h3>
 <pre class="programlisting">  "s390-nettype"             <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -748,7 +570,7 @@ the different types of virtual network devices available on s390 systems.
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "s390-options" property'>
+<div class="refsect2">
 <a name="NMSettingWired--s390-options"></a><h3>The <code class="literal">"s390-options"</code> property</h3>
 <pre class="programlisting">  "s390-options"             <span class="type">GHashTable_gchararray+gchararray_*</span>  : Read / Write</pre>
 <p>
@@ -759,7 +581,7 @@ alphanumeric characters (ie, [a-zA-Z0-9]).
 </p>
 </div>
 <hr>
-<div class="refsect2" title='The "s390-subchannels" property'>
+<div class="refsect2">
 <a name="NMSettingWired--s390-subchannels"></a><h3>The <code class="literal">"s390-subchannels"</code> property</h3>
 <pre class="programlisting">  "s390-subchannels"         <span class="type">GPtrArray_gchararray_</span>*  : Read / Write</pre>
 <p>
@@ -772,7 +594,7 @@ composed of hexadecimal characters and the period (.) character.
 </p>
 </div>
 <hr>
-<div class="refsect2" title='The "speed" property'>
+<div class="refsect2">
 <a name="NMSettingWired--speed"></a><h3>The <code class="literal">"speed"</code> property</h3>
 <pre class="programlisting">  "speed"                    <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write / Construct</pre>
 <p>
@@ -785,6 +607,6 @@ In Mbit/s, ie 100 == 100Mbit/s.
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.15</div>
+          Generated by GTK-Doc V1.17</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingWireless.html b/docs/libnm-util/html/NMSettingWireless.html
index 368d455d5..21d51d294 100644
--- a/docs/libnm-util/html/NMSettingWireless.html
+++ b/docs/libnm-util/html/NMSettingWireless.html
@@ -3,12 +3,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>NMSettingWireless</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="libnm-util Reference Manual">
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingWired.html" title="NMSettingWired">
 <link rel="next" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,7 +30,7 @@
                   <a href="#NMSettingWireless.properties" class="shortcut">Properties</a>
 </td></tr>
 </table>
-<div class="refentry" title="NMSettingWireless">
+<div class="refentry">
 <a name="NMSettingWireless"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
@@ -39,10 +39,10 @@
 </td>
 <td valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv" title="Synopsis">
+<div class="refsynopsisdiv">
 <a name="NMSettingWireless.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">#define             <a class="link" href="NMSettingWireless.html#NM-SETTING-WIRELESS-SETTING-NAME:CAPS" title="NM_SETTING_WIRELESS_SETTING_NAME">NM_SETTING_WIRELESS_SETTING_NAME</a>
-enum                <a class="link" href="NMSettingWireless.html#NMSettingWirelessError" title="enum NMSettingWirelessError">NMSettingWirelessError</a>;
+<a name="NMSettingWirelessError"></a><pre class="synopsis">#define             <a class="link" href="NMSettingWireless.html#NM-SETTING-WIRELESS-SETTING-NAME:CAPS" title="NM_SETTING_WIRELESS_SETTING_NAME">NM_SETTING_WIRELESS_SETTING_NAME</a>
+enum                <a class="link" href="NMSettingWireless.html#NMSettingWirelessError">NMSettingWirelessError</a>;
 #define             <a class="link" href="NMSettingWireless.html#NM-TYPE-SETTING-WIRELESS-ERROR:CAPS" title="NM_TYPE_SETTING_WIRELESS_ERROR">NM_TYPE_SETTING_WIRELESS_ERROR</a>
 #define             <a class="link" href="NMSettingWireless.html#NM-SETTING-WIRELESS-ERROR:CAPS" title="NM_SETTING_WIRELESS_ERROR">NM_SETTING_WIRELESS_ERROR</a>
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              <a class="link" href="NMSettingWireless.html#nm-setting-wireless-error-quark" title="nm_setting_wireless_error_quark ()">nm_setting_wireless_error_quark</a>     (<em class="parameter"><code><span class="type">void</span></code></em>);
@@ -58,6 +58,8 @@ enum                <a class="link" href="NMSettingWireless.html#NMSettingWirele
 #define             <a class="link" href="NMSettingWireless.html#NM-SETTING-WIRELESS-MTU:CAPS" title="NM_SETTING_WIRELESS_MTU">NM_SETTING_WIRELESS_MTU</a>
 #define             <a class="link" href="NMSettingWireless.html#NM-SETTING-WIRELESS-SEEN-BSSIDS:CAPS" title="NM_SETTING_WIRELESS_SEEN_BSSIDS">NM_SETTING_WIRELESS_SEEN_BSSIDS</a>
 #define             <a class="link" href="NMSettingWireless.html#NM-SETTING-WIRELESS-SEC:CAPS" title="NM_SETTING_WIRELESS_SEC">NM_SETTING_WIRELESS_SEC</a>
+#define             <a class="link" href="NMSettingWireless.html#NM-SETTING-WIRELESS-MODE-ADHOC:CAPS" title="NM_SETTING_WIRELESS_MODE_ADHOC">NM_SETTING_WIRELESS_MODE_ADHOC</a>
+#define             <a class="link" href="NMSettingWireless.html#NM-SETTING-WIRELESS-MODE-INFRA:CAPS" title="NM_SETTING_WIRELESS_MODE_INFRA">NM_SETTING_WIRELESS_MODE_INFRA</a>
                     <a class="link" href="NMSettingWireless.html#NMSettingWireless-struct" title="NMSettingWireless">NMSettingWireless</a>;
                     <a class="link" href="NMSettingWireless.html#NMSettingWirelessClass" title="NMSettingWirelessClass">NMSettingWirelessClass</a>;
 <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               <a class="link" href="NMSettingWireless.html#nm-setting-wireless-get-type" title="nm_setting_wireless_get_type ()">nm_setting_wireless_get_type</a>        (<em class="parameter"><code><span class="type">void</span></code></em>);
@@ -83,21 +85,25 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMSettingWireless.html#nm-setting-wireless-ap-security-compatible" title="nm_setting_wireless_ap_security_compatible ()">nm_setting_wireless_ap_security_compatible</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWireless.html" title="NMSettingWireless"><span class="type">NMSettingWireless</span></a> *s_wireless</code></em>,
                                                          <em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *s_wireless_sec</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> ap_flags</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> ap_wpa</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> ap_rsn</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> ap_mode</code></em>);
+                                                         <em class="parameter"><code><span class="type">NM80211ApFlags</span> ap_flags</code></em>,
+                                                         <em class="parameter"><code><span class="type">NM80211ApSecurityFlags</span> ap_wpa</code></em>,
+                                                         <em class="parameter"><code><span class="type">NM80211ApSecurityFlags</span> ap_rsn</code></em>,
+                                                         <em class="parameter"><code><span class="type">NM80211Mode</span> ap_mode</code></em>);
 </pre>
 </div>
-<div class="refsect1" title="Object Hierarchy">
+<div class="refsect1">
 <a name="NMSettingWireless.object-hierarchy"></a><h2>Object Hierarchy</h2>
 <pre class="synopsis">
+  GEnum
+   +----NMSettingWirelessError
+</pre>
+<pre class="synopsis">
   <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>
    +----<a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
          +----NMSettingWireless
 </pre>
 </div>
-<div class="refsect1" title="Properties">
+<div class="refsect1">
 <a name="NMSettingWireless.properties"></a><h2>Properties</h2>
 <pre class="synopsis">
   "<a class="link" href="NMSettingWireless.html#NMSettingWireless--band" title='The "band" property'>band</a>"                     <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write
@@ -114,14 +120,14 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
   "<a class="link" href="NMSettingWireless.html#NMSettingWireless--tx-power" title='The "tx-power" property'>tx-power</a>"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write / Construct
 </pre>
 </div>
-<div class="refsect1" title="Description">
+<div class="refsect1">
 <a name="NMSettingWireless.description"></a><h2>Description</h2>
 <p>
 </p>
 </div>
-<div class="refsect1" title="Details">
+<div class="refsect1">
 <a name="NMSettingWireless.details"></a><h2>Details</h2>
-<div class="refsect2" title="NM_SETTING_WIRELESS_SETTING_NAME">
+<div class="refsect2">
 <a name="NM-SETTING-WIRELESS-SETTING-NAME:CAPS"></a><h3>NM_SETTING_WIRELESS_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SETTING_NAME "802-11-wireless"
 </pre>
@@ -129,7 +135,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="enum NMSettingWirelessError">
+<div class="refsect2">
 <a name="NMSettingWirelessError"></a><h3>enum NMSettingWirelessError</h3>
 <pre class="programlisting">typedef enum
 {
@@ -144,7 +150,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_TYPE_SETTING_WIRELESS_ERROR">
+<div class="refsect2">
 <a name="NM-TYPE-SETTING-WIRELESS-ERROR:CAPS"></a><h3>NM_TYPE_SETTING_WIRELESS_ERROR</h3>
 <pre class="programlisting">#define NM_TYPE_SETTING_WIRELESS_ERROR (nm_setting_wireless_error_get_type ()) 
 </pre>
@@ -152,7 +158,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRELESS_ERROR">
+<div class="refsect2">
 <a name="NM-SETTING-WIRELESS-ERROR:CAPS"></a><h3>NM_SETTING_WIRELESS_ERROR</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_ERROR nm_setting_wireless_error_quark ()
 </pre>
@@ -160,22 +166,14 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_error_quark ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-error-quark"></a><h3>nm_setting_wireless_error_quark ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              nm_setting_wireless_error_quark     (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRELESS_SSID">
+<div class="refsect2">
 <a name="NM-SETTING-WIRELESS-SSID:CAPS"></a><h3>NM_SETTING_WIRELESS_SSID</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SSID        "ssid"
 </pre>
@@ -183,7 +181,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRELESS_MODE">
+<div class="refsect2">
 <a name="NM-SETTING-WIRELESS-MODE:CAPS"></a><h3>NM_SETTING_WIRELESS_MODE</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_MODE        "mode"
 </pre>
@@ -191,7 +189,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRELESS_BAND">
+<div class="refsect2">
 <a name="NM-SETTING-WIRELESS-BAND:CAPS"></a><h3>NM_SETTING_WIRELESS_BAND</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_BAND        "band"
 </pre>
@@ -199,7 +197,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRELESS_CHANNEL">
+<div class="refsect2">
 <a name="NM-SETTING-WIRELESS-CHANNEL:CAPS"></a><h3>NM_SETTING_WIRELESS_CHANNEL</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_CHANNEL     "channel"
 </pre>
@@ -207,7 +205,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRELESS_BSSID">
+<div class="refsect2">
 <a name="NM-SETTING-WIRELESS-BSSID:CAPS"></a><h3>NM_SETTING_WIRELESS_BSSID</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_BSSID       "bssid"
 </pre>
@@ -215,7 +213,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRELESS_RATE">
+<div class="refsect2">
 <a name="NM-SETTING-WIRELESS-RATE:CAPS"></a><h3>NM_SETTING_WIRELESS_RATE</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_RATE        "rate"
 </pre>
@@ -223,7 +221,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRELESS_TX_POWER">
+<div class="refsect2">
 <a name="NM-SETTING-WIRELESS-TX-POWER:CAPS"></a><h3>NM_SETTING_WIRELESS_TX_POWER</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_TX_POWER    "tx-power"
 </pre>
@@ -231,7 +229,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRELESS_MAC_ADDRESS">
+<div class="refsect2">
 <a name="NM-SETTING-WIRELESS-MAC-ADDRESS:CAPS"></a><h3>NM_SETTING_WIRELESS_MAC_ADDRESS</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_MAC_ADDRESS "mac-address"
 </pre>
@@ -239,7 +237,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS">
+<div class="refsect2">
 <a name="NM-SETTING-WIRELESS-CLONED-MAC-ADDRESS:CAPS"></a><h3>NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS "cloned-mac-address"
 </pre>
@@ -247,7 +245,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRELESS_MTU">
+<div class="refsect2">
 <a name="NM-SETTING-WIRELESS-MTU:CAPS"></a><h3>NM_SETTING_WIRELESS_MTU</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_MTU         "mtu"
 </pre>
@@ -255,7 +253,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRELESS_SEEN_BSSIDS">
+<div class="refsect2">
 <a name="NM-SETTING-WIRELESS-SEEN-BSSIDS:CAPS"></a><h3>NM_SETTING_WIRELESS_SEEN_BSSIDS</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SEEN_BSSIDS "seen-bssids"
 </pre>
@@ -263,7 +261,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRELESS_SEC">
+<div class="refsect2">
 <a name="NM-SETTING-WIRELESS-SEC:CAPS"></a><h3>NM_SETTING_WIRELESS_SEC</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SEC         "security"
 </pre>
@@ -271,14 +269,30 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMSettingWireless">
+<div class="refsect2">
+<a name="NM-SETTING-WIRELESS-MODE-ADHOC:CAPS"></a><h3>NM_SETTING_WIRELESS_MODE_ADHOC</h3>
+<pre class="programlisting">#define NM_SETTING_WIRELESS_MODE_ADHOC  "adhoc"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-SETTING-WIRELESS-MODE-INFRA:CAPS"></a><h3>NM_SETTING_WIRELESS_MODE_INFRA</h3>
+<pre class="programlisting">#define NM_SETTING_WIRELESS_MODE_INFRA  "infrastructure"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="NMSettingWireless-struct"></a><h3>NMSettingWireless</h3>
 <pre class="programlisting">typedef struct _NMSettingWireless NMSettingWireless;</pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMSettingWirelessClass">
+<div class="refsect2">
 <a name="NMSettingWirelessClass"></a><h3>NMSettingWirelessClass</h3>
 <pre class="programlisting">typedef struct {
 	NMSettingClass parent;
@@ -294,414 +308,138 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_get_type ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-get-type"></a><h3>nm_setting_wireless_get_type ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               nm_setting_wireless_get_type        (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_new ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-new"></a><h3>nm_setting_wireless_new ()</h3>
 <pre class="programlisting"><a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *         nm_setting_wireless_new             (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_get_ssid ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-get-ssid"></a><h3>nm_setting_wireless_get_ssid ()</h3>
 <pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *  nm_setting_wireless_get_ssid        (<em class="parameter"><code><a class="link" href="NMSettingWireless.html" title="NMSettingWireless"><span class="type">NMSettingWireless</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_get_mode ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-get-mode"></a><h3>nm_setting_wireless_get_mode ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_wireless_get_mode        (<em class="parameter"><code><a class="link" href="NMSettingWireless.html" title="NMSettingWireless"><span class="type">NMSettingWireless</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_get_band ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-get-band"></a><h3>nm_setting_wireless_get_band ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_wireless_get_band        (<em class="parameter"><code><a class="link" href="NMSettingWireless.html" title="NMSettingWireless"><span class="type">NMSettingWireless</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_get_channel ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-get-channel"></a><h3>nm_setting_wireless_get_channel ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_setting_wireless_get_channel     (<em class="parameter"><code><a class="link" href="NMSettingWireless.html" title="NMSettingWireless"><span class="type">NMSettingWireless</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_get_bssid ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-get-bssid"></a><h3>nm_setting_wireless_get_bssid ()</h3>
 <pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *  nm_setting_wireless_get_bssid       (<em class="parameter"><code><a class="link" href="NMSettingWireless.html" title="NMSettingWireless"><span class="type">NMSettingWireless</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_get_rate ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-get-rate"></a><h3>nm_setting_wireless_get_rate ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_setting_wireless_get_rate        (<em class="parameter"><code><a class="link" href="NMSettingWireless.html" title="NMSettingWireless"><span class="type">NMSettingWireless</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_get_tx_power ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-get-tx-power"></a><h3>nm_setting_wireless_get_tx_power ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_setting_wireless_get_tx_power    (<em class="parameter"><code><a class="link" href="NMSettingWireless.html" title="NMSettingWireless"><span class="type">NMSettingWireless</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_get_mac_address ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-get-mac-address"></a><h3>nm_setting_wireless_get_mac_address ()</h3>
 <pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *  nm_setting_wireless_get_mac_address (<em class="parameter"><code><a class="link" href="NMSettingWireless.html" title="NMSettingWireless"><span class="type">NMSettingWireless</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_get_cloned_mac_address ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-get-cloned-mac-address"></a><h3>nm_setting_wireless_get_cloned_mac_address ()</h3>
 <pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *  nm_setting_wireless_get_cloned_mac_address
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWireless.html" title="NMSettingWireless"><span class="type">NMSettingWireless</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_get_mtu ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-get-mtu"></a><h3>nm_setting_wireless_get_mtu ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_setting_wireless_get_mtu         (<em class="parameter"><code><a class="link" href="NMSettingWireless.html" title="NMSettingWireless"><span class="type">NMSettingWireless</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_get_security ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-get-security"></a><h3>nm_setting_wireless_get_security ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_wireless_get_security    (<em class="parameter"><code><a class="link" href="NMSettingWireless.html" title="NMSettingWireless"><span class="type">NMSettingWireless</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_add_seen_bssid ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-add-seen-bssid"></a><h3>nm_setting_wireless_add_seen_bssid ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_wireless_add_seen_bssid  (<em class="parameter"><code><a class="link" href="NMSettingWireless.html" title="NMSettingWireless"><span class="type">NMSettingWireless</span></a> *setting</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *bssid</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>bssid</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_get_num_seen_bssids ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-get-num-seen-bssids"></a><h3>nm_setting_wireless_get_num_seen_bssids ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_setting_wireless_get_num_seen_bssids
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWireless.html" title="NMSettingWireless"><span class="type">NMSettingWireless</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_get_seen_bssid ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-get-seen-bssid"></a><h3>nm_setting_wireless_get_seen_bssid ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_wireless_get_seen_bssid  (<em class="parameter"><code><a class="link" href="NMSettingWireless.html" title="NMSettingWireless"><span class="type">NMSettingWireless</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> i</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>i</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_ap_security_compatible ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-ap-security-compatible"></a><h3>nm_setting_wireless_ap_security_compatible ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_wireless_ap_security_compatible
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWireless.html" title="NMSettingWireless"><span class="type">NMSettingWireless</span></a> *s_wireless</code></em>,
                                                          <em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *s_wireless_sec</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> ap_flags</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> ap_wpa</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> ap_rsn</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> ap_mode</code></em>);</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>s_wireless</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>s_wireless_sec</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>ap_flags</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>ap_wpa</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>ap_rsn</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>ap_mode</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
+                                                         <em class="parameter"><code><span class="type">NM80211ApFlags</span> ap_flags</code></em>,
+                                                         <em class="parameter"><code><span class="type">NM80211ApSecurityFlags</span> ap_wpa</code></em>,
+                                                         <em class="parameter"><code><span class="type">NM80211ApSecurityFlags</span> ap_rsn</code></em>,
+                                                         <em class="parameter"><code><span class="type">NM80211Mode</span> ap_mode</code></em>);</pre>
+<p>
+</p>
 </div>
 </div>
-<div class="refsect1" title="Property Details">
+<div class="refsect1">
 <a name="NMSettingWireless.property-details"></a><h2>Property Details</h2>
-<div class="refsect2" title='The "band" property'>
+<div class="refsect2">
 <a name="NMSettingWireless--band"></a><h3>The <code class="literal">"band"</code> property</h3>
 <pre class="programlisting">  "band"                     <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -715,7 +453,7 @@ capability and may not work with all drivers.
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "bssid" property'>
+<div class="refsect2">
 <a name="NMSettingWireless--bssid"></a><h3>The <code class="literal">"bssid"</code> property</h3>
 <pre class="programlisting">  "bssid"                    <span class="type">GArray_guchar_</span>*       : Read / Write</pre>
 <p>
@@ -726,7 +464,7 @@ creating an Ad-Hoc network and is unlikely to in the future.
 </p>
 </div>
 <hr>
-<div class="refsect2" title='The "channel" property'>
+<div class="refsect2">
 <a name="NMSettingWireless--channel"></a><h3>The <code class="literal">"channel"</code> property</h3>
 <pre class="programlisting">  "channel"                  <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write / Construct</pre>
 <p>
@@ -738,7 +476,7 @@ also requires the 'band' property to be set.
 <p>Default value: 0</p>
 </div>
 <hr>
-<div class="refsect2" title='The "cloned-mac-address" property'>
+<div class="refsect2">
 <a name="NMSettingWireless--cloned-mac-address"></a><h3>The <code class="literal">"cloned-mac-address"</code> property</h3>
 <pre class="programlisting">  "cloned-mac-address"       <span class="type">GArray_guchar_</span>*       : Read / Write</pre>
 <p>
@@ -747,7 +485,7 @@ permanent MAC address.  This is known as MAC cloning or spoofing.
 </p>
 </div>
 <hr>
-<div class="refsect2" title='The "mac-address" property'>
+<div class="refsect2">
 <a name="NMSettingWireless--mac-address"></a><h3>The <code class="literal">"mac-address"</code> property</h3>
 <pre class="programlisting">  "mac-address"              <span class="type">GArray_guchar_</span>*       : Read / Write</pre>
 <p>
@@ -757,7 +495,7 @@ of the device (i.e. MAC spoofing).
 </p>
 </div>
 <hr>
-<div class="refsect2" title='The "mode" property'>
+<div class="refsect2">
 <a name="NMSettingWireless--mode"></a><h3>The <code class="literal">"mode"</code> property</h3>
 <pre class="programlisting">  "mode"                     <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -767,7 +505,7 @@ infrastructure is assumed.
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "mtu" property'>
+<div class="refsect2">
 <a name="NMSettingWireless--mtu"></a><h3>The <code class="literal">"mtu"</code> property</h3>
 <pre class="programlisting">  "mtu"                      <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write / Construct</pre>
 <p>
@@ -777,7 +515,7 @@ breaking larger packets up into multiple Ethernet frames.
 <p>Default value: 0</p>
 </div>
 <hr>
-<div class="refsect2" title='The "rate" property'>
+<div class="refsect2">
 <a name="NMSettingWireless--rate"></a><h3>The <code class="literal">"rate"</code> property</h3>
 <pre class="programlisting">  "rate"                     <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write / Construct</pre>
 <p>
@@ -789,7 +527,7 @@ support setting a static bitrate.
 <p>Default value: 0</p>
 </div>
 <hr>
-<div class="refsect2" title='The "security" property'>
+<div class="refsect2">
 <a name="NMSettingWireless--security"></a><h3>The <code class="literal">"security"</code> property</h3>
 <pre class="programlisting">  "security"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -800,7 +538,7 @@ the connection contains a valid 802-11-wireless-security setting.
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "seen-bssids" property'>
+<div class="refsect2">
 <a name="NMSettingWireless--seen-bssids"></a><h3>The <code class="literal">"seen-bssids"</code> property</h3>
 <pre class="programlisting">  "seen-bssids"              <span class="type">GSList_gchararray_</span>*   : Read / Write</pre>
 <p>
@@ -814,7 +552,7 @@ find hidden APs by matching up scan results with the BSSIDs in this list.
 </p>
 </div>
 <hr>
-<div class="refsect2" title='The "ssid" property'>
+<div class="refsect2">
 <a name="NMSettingWireless--ssid"></a><h3>The <code class="literal">"ssid"</code> property</h3>
 <pre class="programlisting">  "ssid"                     <span class="type">GArray_guchar_</span>*       : Read / Write</pre>
 <p>
@@ -822,7 +560,7 @@ SSID of the WiFi network.
 </p>
 </div>
 <hr>
-<div class="refsect2" title='The "tx-power" property'>
+<div class="refsect2">
 <a name="NMSettingWireless--tx-power"></a><h3>The <code class="literal">"tx-power"</code> property</h3>
 <pre class="programlisting">  "tx-power"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write / Construct</pre>
 <p>
@@ -836,6 +574,6 @@ devices support setting a static transmit power.
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.15</div>
+          Generated by GTK-Doc V1.17</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingWirelessSecurity.html b/docs/libnm-util/html/NMSettingWirelessSecurity.html
index 6e90df86e..7fdbc9528 100644
--- a/docs/libnm-util/html/NMSettingWirelessSecurity.html
+++ b/docs/libnm-util/html/NMSettingWirelessSecurity.html
@@ -3,12 +3,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>NMSettingWirelessSecurity</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="libnm-util Reference Manual">
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingWireless.html" title="NMSettingWireless">
 <link rel="next" href="NMSettingBluetooth.html" title="NMSettingBluetooth">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,7 +30,7 @@
                   <a href="#NMSettingWirelessSecurity.properties" class="shortcut">Properties</a>
 </td></tr>
 </table>
-<div class="refentry" title="NMSettingWirelessSecurity">
+<div class="refentry">
 <a name="NMSettingWirelessSecurity"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
@@ -39,10 +39,10 @@
 </td>
 <td valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv" title="Synopsis">
+<div class="refsynopsisdiv">
 <a name="NMSettingWirelessSecurity.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">#define             <a class="link" href="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-SETTING-NAME:CAPS" title="NM_SETTING_WIRELESS_SECURITY_SETTING_NAME">NM_SETTING_WIRELESS_SECURITY_SETTING_NAME</a>
-enum                <a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurityError" title="enum NMSettingWirelessSecurityError">NMSettingWirelessSecurityError</a>;
+<a name="NMSettingWirelessSecurityError"></a><pre class="synopsis">#define             <a class="link" href="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-SETTING-NAME:CAPS" title="NM_SETTING_WIRELESS_SECURITY_SETTING_NAME">NM_SETTING_WIRELESS_SECURITY_SETTING_NAME</a>
+enum                <a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurityError">NMSettingWirelessSecurityError</a>;
 #define             <a class="link" href="NMSettingWirelessSecurity.html#NM-TYPE-SETTING-WIRELESS-SECURITY-ERROR:CAPS" title="NM_TYPE_SETTING_WIRELESS_SECURITY_ERROR">NM_TYPE_SETTING_WIRELESS_SECURITY_ERROR</a>
 #define             <a class="link" href="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-ERROR:CAPS" title="NM_SETTING_WIRELESS_SECURITY_ERROR">NM_SETTING_WIRELESS_SECURITY_ERROR</a>
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              <a class="link" href="NMSettingWirelessSecurity.html#nm-setting-wireless-security-error-quark" title="nm_setting_wireless_security_error_quark ()">nm_setting_wireless_security_error_quark</a>
@@ -59,9 +59,12 @@ enum                <a class="link" href="NMSettingWirelessSecurity.html#NMWepKe
 #define             <a class="link" href="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-WEP-KEY1:CAPS" title="NM_SETTING_WIRELESS_SECURITY_WEP_KEY1">NM_SETTING_WIRELESS_SECURITY_WEP_KEY1</a>
 #define             <a class="link" href="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-WEP-KEY2:CAPS" title="NM_SETTING_WIRELESS_SECURITY_WEP_KEY2">NM_SETTING_WIRELESS_SECURITY_WEP_KEY2</a>
 #define             <a class="link" href="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-WEP-KEY3:CAPS" title="NM_SETTING_WIRELESS_SECURITY_WEP_KEY3">NM_SETTING_WIRELESS_SECURITY_WEP_KEY3</a>
+#define             <a class="link" href="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-WEP-KEY-FLAGS:CAPS" title="NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS">NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS</a>
+#define             <a class="link" href="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-WEP-KEY-TYPE:CAPS" title="NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE">NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE</a>
 #define             <a class="link" href="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-PSK:CAPS" title="NM_SETTING_WIRELESS_SECURITY_PSK">NM_SETTING_WIRELESS_SECURITY_PSK</a>
+#define             <a class="link" href="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-PSK-FLAGS:CAPS" title="NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS">NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS</a>
 #define             <a class="link" href="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-LEAP-PASSWORD:CAPS" title="NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD">NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD</a>
-#define             <a class="link" href="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-WEP-KEY-TYPE:CAPS" title="NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE">NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE</a>
+#define             <a class="link" href="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-LEAP-PASSWORD-FLAGS:CAPS" title="NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS">NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS</a>
                     <a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity-struct" title="NMSettingWirelessSecurity">NMSettingWirelessSecurity</a>;
                     <a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurityClass" title="NMSettingWirelessSecurityClass">NMSettingWirelessSecurityClass</a>;
 <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               <a class="link" href="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-type" title="nm_setting_wireless_security_get_type ()">nm_setting_wireless_security_get_type</a>
@@ -110,10 +113,14 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>);
 const <span class="returnvalue">char</span> *        <a class="link" href="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-psk" title="nm_setting_wireless_security_get_psk ()">nm_setting_wireless_security_get_psk</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>);
+<a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="returnvalue">NMSettingSecretFlags</span></a>  <a class="link" href="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-psk-flags" title="nm_setting_wireless_security_get_psk_flags ()">nm_setting_wireless_security_get_psk_flags</a>
+                                                        (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>);
 const <span class="returnvalue">char</span> *        <a class="link" href="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-leap-username" title="nm_setting_wireless_security_get_leap_username ()">nm_setting_wireless_security_get_leap_username</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>);
 const <span class="returnvalue">char</span> *        <a class="link" href="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-leap-password" title="nm_setting_wireless_security_get_leap_password ()">nm_setting_wireless_security_get_leap_password</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>);
+<a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="returnvalue">NMSettingSecretFlags</span></a>  <a class="link" href="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-leap-password-flags" title="nm_setting_wireless_security_get_leap_password_flags ()">nm_setting_wireless_security_get_leap_password_flags</a>
+                                                        (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>);
 const <span class="returnvalue">char</span> *        <a class="link" href="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-wep-key" title="nm_setting_wireless_security_get_wep_key ()">nm_setting_wireless_security_get_wep_key</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> idx</code></em>);
@@ -125,29 +132,38 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>);
 const <span class="returnvalue">char</span> *        <a class="link" href="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-auth-alg" title="nm_setting_wireless_security_get_auth_alg ()">nm_setting_wireless_security_get_auth_alg</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>);
+<a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="returnvalue">NMSettingSecretFlags</span></a>  <a class="link" href="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-wep-key-flags" title="nm_setting_wireless_security_get_wep_key_flags ()">nm_setting_wireless_security_get_wep_key_flags</a>
+                                                        (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>);
 <a class="link" href="NMSettingWirelessSecurity.html#NMWepKeyType" title="enum NMWepKeyType"><span class="returnvalue">NMWepKeyType</span></a>        <a class="link" href="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-wep-key-type" title="nm_setting_wireless_security_get_wep_key_type ()">nm_setting_wireless_security_get_wep_key_type</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>);
 </pre>
 </div>
-<div class="refsect1" title="Object Hierarchy">
+<div class="refsect1">
 <a name="NMSettingWirelessSecurity.object-hierarchy"></a><h2>Object Hierarchy</h2>
 <pre class="synopsis">
+  GEnum
+   +----NMSettingWirelessSecurityError
+</pre>
+<pre class="synopsis">
   <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>
    +----<a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
          +----NMSettingWirelessSecurity
 </pre>
 </div>
-<div class="refsect1" title="Properties">
+<div class="refsect1">
 <a name="NMSettingWirelessSecurity.properties"></a><h2>Properties</h2>
 <pre class="synopsis">
   "<a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--auth-alg" title='The "auth-alg" property'>auth-alg</a>"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write
   "<a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--group" title='The "group" property'>group</a>"                    <span class="type">GSList_gchararray_</span>*   : Read / Write
   "<a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--key-mgmt" title='The "key-mgmt" property'>key-mgmt</a>"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write
   "<a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--leap-password" title='The "leap-password" property'>leap-password</a>"            <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write
+  "<a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--leap-password-flags" title='The "leap-password-flags" property'>leap-password-flags</a>"      <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write
   "<a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--leap-username" title='The "leap-username" property'>leap-username</a>"            <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write
   "<a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--pairwise" title='The "pairwise" property'>pairwise</a>"                 <span class="type">GSList_gchararray_</span>*   : Read / Write
   "<a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--proto" title='The "proto" property'>proto</a>"                    <span class="type">GSList_gchararray_</span>*   : Read / Write
   "<a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--psk" title='The "psk" property'>psk</a>"                      <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write
+  "<a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--psk-flags" title='The "psk-flags" property'>psk-flags</a>"                <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write
+  "<a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--wep-key-flags" title='The "wep-key-flags" property'>wep-key-flags</a>"            <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write
   "<a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--wep-key-type" title='The "wep-key-type" property'>wep-key-type</a>"             <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write / Construct
   "<a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--wep-key0" title='The "wep-key0" property'>wep-key0</a>"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write
   "<a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--wep-key1" title='The "wep-key1" property'>wep-key1</a>"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write
@@ -156,14 +172,14 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
   "<a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--wep-tx-keyidx" title='The "wep-tx-keyidx" property'>wep-tx-keyidx</a>"            <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write / Construct
 </pre>
 </div>
-<div class="refsect1" title="Description">
+<div class="refsect1">
 <a name="NMSettingWirelessSecurity.description"></a><h2>Description</h2>
 <p>
 </p>
 </div>
-<div class="refsect1" title="Details">
+<div class="refsect1">
 <a name="NMSettingWirelessSecurity.details"></a><h2>Details</h2>
-<div class="refsect2" title="NM_SETTING_WIRELESS_SECURITY_SETTING_NAME">
+<div class="refsect2">
 <a name="NM-SETTING-WIRELESS-SECURITY-SETTING-NAME:CAPS"></a><h3>NM_SETTING_WIRELESS_SECURITY_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_SETTING_NAME "802-11-wireless-security"
 </pre>
@@ -171,7 +187,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="enum NMSettingWirelessSecurityError">
+<div class="refsect2">
 <a name="NMSettingWirelessSecurityError"></a><h3>enum NMSettingWirelessSecurityError</h3>
 <pre class="programlisting">typedef enum
 {
@@ -188,7 +204,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_TYPE_SETTING_WIRELESS_SECURITY_ERROR">
+<div class="refsect2">
 <a name="NM-TYPE-SETTING-WIRELESS-SECURITY-ERROR:CAPS"></a><h3>NM_TYPE_SETTING_WIRELESS_SECURITY_ERROR</h3>
 <pre class="programlisting">#define NM_TYPE_SETTING_WIRELESS_SECURITY_ERROR (nm_setting_wireless_security_error_get_type ()) 
 </pre>
@@ -196,7 +212,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRELESS_SECURITY_ERROR">
+<div class="refsect2">
 <a name="NM-SETTING-WIRELESS-SECURITY-ERROR:CAPS"></a><h3>NM_SETTING_WIRELESS_SECURITY_ERROR</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_ERROR nm_setting_wireless_security_error_quark ()
 </pre>
@@ -204,23 +220,15 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_security_error_quark ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-security-error-quark"></a><h3>nm_setting_wireless_security_error_quark ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              nm_setting_wireless_security_error_quark
                                                         (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="enum NMWepKeyType">
+<div class="refsect2">
 <a name="NMWepKeyType"></a><h3>enum NMWepKeyType</h3>
 <pre class="programlisting">typedef enum {
 	NM_WEP_KEY_TYPE_UNKNOWN = 0,
@@ -234,7 +242,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRELESS_SECURITY_KEY_MGMT">
+<div class="refsect2">
 <a name="NM-SETTING-WIRELESS-SECURITY-KEY-MGMT:CAPS"></a><h3>NM_SETTING_WIRELESS_SECURITY_KEY_MGMT</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_KEY_MGMT "key-mgmt"
 </pre>
@@ -242,7 +250,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX">
+<div class="refsect2">
 <a name="NM-SETTING-WIRELESS-SECURITY-WEP-TX-KEYIDX:CAPS"></a><h3>NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX "wep-tx-keyidx"
 </pre>
@@ -250,7 +258,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRELESS_SECURITY_AUTH_ALG">
+<div class="refsect2">
 <a name="NM-SETTING-WIRELESS-SECURITY-AUTH-ALG:CAPS"></a><h3>NM_SETTING_WIRELESS_SECURITY_AUTH_ALG</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_AUTH_ALG "auth-alg"
 </pre>
@@ -258,7 +266,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRELESS_SECURITY_PROTO">
+<div class="refsect2">
 <a name="NM-SETTING-WIRELESS-SECURITY-PROTO:CAPS"></a><h3>NM_SETTING_WIRELESS_SECURITY_PROTO</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_PROTO "proto"
 </pre>
@@ -266,7 +274,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRELESS_SECURITY_PAIRWISE">
+<div class="refsect2">
 <a name="NM-SETTING-WIRELESS-SECURITY-PAIRWISE:CAPS"></a><h3>NM_SETTING_WIRELESS_SECURITY_PAIRWISE</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_PAIRWISE "pairwise"
 </pre>
@@ -274,7 +282,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRELESS_SECURITY_GROUP">
+<div class="refsect2">
 <a name="NM-SETTING-WIRELESS-SECURITY-GROUP:CAPS"></a><h3>NM_SETTING_WIRELESS_SECURITY_GROUP</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_GROUP "group"
 </pre>
@@ -282,7 +290,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME">
+<div class="refsect2">
 <a name="NM-SETTING-WIRELESS-SECURITY-LEAP-USERNAME:CAPS"></a><h3>NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME "leap-username"
 </pre>
@@ -290,7 +298,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRELESS_SECURITY_WEP_KEY0">
+<div class="refsect2">
 <a name="NM-SETTING-WIRELESS-SECURITY-WEP-KEY0:CAPS"></a><h3>NM_SETTING_WIRELESS_SECURITY_WEP_KEY0</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY0 "wep-key0"
 </pre>
@@ -298,7 +306,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRELESS_SECURITY_WEP_KEY1">
+<div class="refsect2">
 <a name="NM-SETTING-WIRELESS-SECURITY-WEP-KEY1:CAPS"></a><h3>NM_SETTING_WIRELESS_SECURITY_WEP_KEY1</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY1 "wep-key1"
 </pre>
@@ -306,7 +314,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRELESS_SECURITY_WEP_KEY2">
+<div class="refsect2">
 <a name="NM-SETTING-WIRELESS-SECURITY-WEP-KEY2:CAPS"></a><h3>NM_SETTING_WIRELESS_SECURITY_WEP_KEY2</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY2 "wep-key2"
 </pre>
@@ -314,7 +322,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRELESS_SECURITY_WEP_KEY3">
+<div class="refsect2">
 <a name="NM-SETTING-WIRELESS-SECURITY-WEP-KEY3:CAPS"></a><h3>NM_SETTING_WIRELESS_SECURITY_WEP_KEY3</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY3 "wep-key3"
 </pre>
@@ -322,7 +330,23 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRELESS_SECURITY_PSK">
+<div class="refsect2">
+<a name="NM-SETTING-WIRELESS-SECURITY-WEP-KEY-FLAGS:CAPS"></a><h3>NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS</h3>
+<pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS "wep-key-flags"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-SETTING-WIRELESS-SECURITY-WEP-KEY-TYPE:CAPS"></a><h3>NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE</h3>
+<pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE "wep-key-type"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="NM-SETTING-WIRELESS-SECURITY-PSK:CAPS"></a><h3>NM_SETTING_WIRELESS_SECURITY_PSK</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_PSK "psk"
 </pre>
@@ -330,7 +354,15 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD">
+<div class="refsect2">
+<a name="NM-SETTING-WIRELESS-SECURITY-PSK-FLAGS:CAPS"></a><h3>NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS</h3>
+<pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS "psk-flags"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="NM-SETTING-WIRELESS-SECURITY-LEAP-PASSWORD:CAPS"></a><h3>NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD "leap-password"
 </pre>
@@ -338,22 +370,22 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE">
-<a name="NM-SETTING-WIRELESS-SECURITY-WEP-KEY-TYPE:CAPS"></a><h3>NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE</h3>
-<pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE "wep-key-type"
+<div class="refsect2">
+<a name="NM-SETTING-WIRELESS-SECURITY-LEAP-PASSWORD-FLAGS:CAPS"></a><h3>NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS</h3>
+<pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS "leap-password-flags"
 </pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMSettingWirelessSecurity">
+<div class="refsect2">
 <a name="NMSettingWirelessSecurity-struct"></a><h3>NMSettingWirelessSecurity</h3>
 <pre class="programlisting">typedef struct _NMSettingWirelessSecurity NMSettingWirelessSecurity;</pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMSettingWirelessSecurityClass">
+<div class="refsect2">
 <a name="NMSettingWirelessSecurityClass"></a><h3>NMSettingWirelessSecurityClass</h3>
 <pre class="programlisting">typedef struct {
 	NMSettingClass parent;
@@ -369,522 +401,236 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_security_get_type ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-security-get-type"></a><h3>nm_setting_wireless_security_get_type ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               nm_setting_wireless_security_get_type
                                                         (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_security_new ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-security-new"></a><h3>nm_setting_wireless_security_new ()</h3>
 <pre class="programlisting"><a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *         nm_setting_wireless_security_new    (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_security_get_key_mgmt ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-security-get-key-mgmt"></a><h3>nm_setting_wireless_security_get_key_mgmt ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_wireless_security_get_key_mgmt
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_security_get_num_protos ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-security-get-num-protos"></a><h3>nm_setting_wireless_security_get_num_protos ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_setting_wireless_security_get_num_protos
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_security_get_proto ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-security-get-proto"></a><h3>nm_setting_wireless_security_get_proto ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_wireless_security_get_proto
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> i</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>i</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_security_add_proto ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-security-add-proto"></a><h3>nm_setting_wireless_security_add_proto ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_wireless_security_add_proto
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *proto</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>proto</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_security_remove_proto ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-security-remove-proto"></a><h3>nm_setting_wireless_security_remove_proto ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_setting_wireless_security_remove_proto
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> i</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>i</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_security_clear_protos ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-security-clear-protos"></a><h3>nm_setting_wireless_security_clear_protos ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_setting_wireless_security_clear_protos
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_security_get_num_pairwise ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-security-get-num-pairwise"></a><h3>nm_setting_wireless_security_get_num_pairwise ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_setting_wireless_security_get_num_pairwise
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_security_get_pairwise ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-security-get-pairwise"></a><h3>nm_setting_wireless_security_get_pairwise ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_wireless_security_get_pairwise
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> i</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>i</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_security_add_pairwise ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-security-add-pairwise"></a><h3>nm_setting_wireless_security_add_pairwise ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_wireless_security_add_pairwise
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *pairwise</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>pairwise</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_security_remove_pairwise ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-security-remove-pairwise"></a><h3>nm_setting_wireless_security_remove_pairwise ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_setting_wireless_security_remove_pairwise
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> i</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>i</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_security_clear_pairwise ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-security-clear-pairwise"></a><h3>nm_setting_wireless_security_clear_pairwise ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_setting_wireless_security_clear_pairwise
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_security_get_num_groups ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-security-get-num-groups"></a><h3>nm_setting_wireless_security_get_num_groups ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_setting_wireless_security_get_num_groups
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_security_get_group ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-security-get-group"></a><h3>nm_setting_wireless_security_get_group ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_wireless_security_get_group
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> i</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>i</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_security_add_group ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-security-add-group"></a><h3>nm_setting_wireless_security_add_group ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_wireless_security_add_group
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *group</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>group</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_security_remove_group ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-security-remove-group"></a><h3>nm_setting_wireless_security_remove_group ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_setting_wireless_security_remove_group
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> i</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>i</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_security_clear_groups ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-security-clear-groups"></a><h3>nm_setting_wireless_security_clear_groups ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_setting_wireless_security_clear_groups
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_security_get_psk ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-security-get-psk"></a><h3>nm_setting_wireless_security_get_psk ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_wireless_security_get_psk
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>);</pre>
 <p>
 </p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-wireless-security-get-psk-flags"></a><h3>nm_setting_wireless_security_get_psk_flags ()</h3>
+<pre class="programlisting"><a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="returnvalue">NMSettingSecretFlags</span></a>  nm_setting_wireless_security_get_psk_flags
+                                                        (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>);</pre>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
+<td>the <a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
+<td>the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> pertaining to the
+<a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--psk" title='The "psk" property'><span class="type">"psk"</span></a>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_security_get_leap_username ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-security-get-leap-username"></a><h3>nm_setting_wireless_security_get_leap_username ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_wireless_security_get_leap_username
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_security_get_leap_password ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-security-get-leap-password"></a><h3>nm_setting_wireless_security_get_leap_password ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_wireless_security_get_leap_password
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>);</pre>
 <p>
 </p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-wireless-security-get-leap-password-flags"></a><h3>nm_setting_wireless_security_get_leap_password_flags ()</h3>
+<pre class="programlisting"><a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="returnvalue">NMSettingSecretFlags</span></a>  nm_setting_wireless_security_get_leap_password_flags
+                                                        (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>);</pre>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
+<td>the <a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
+<td>the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> pertaining to the
+<a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--leap-password" title='The "leap-password" property'><span class="type">"leap-password"</span></a>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_security_get_wep_key ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-security-get-wep-key"></a><h3>nm_setting_wireless_security_get_wep_key ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_wireless_security_get_wep_key
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> idx</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>idx</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_security_set_wep_key ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-security-set-wep-key"></a><h3>nm_setting_wireless_security_set_wep_key ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_setting_wireless_security_set_wep_key
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>,
@@ -892,100 +638,55 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
                                                          <em class="parameter"><code>const <span class="type">char</span> *key</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>idx</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>key</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_security_get_wep_tx_keyidx ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-security-get-wep-tx-keyidx"></a><h3>nm_setting_wireless_security_get_wep_tx_keyidx ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_setting_wireless_security_get_wep_tx_keyidx
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_security_get_auth_alg ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-security-get-auth-alg"></a><h3>nm_setting_wireless_security_get_auth_alg ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_wireless_security_get_auth_alg
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>);</pre>
 <p>
 </p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-wireless-security-get-wep-key-flags"></a><h3>nm_setting_wireless_security_get_wep_key_flags ()</h3>
+<pre class="programlisting"><a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="returnvalue">NMSettingSecretFlags</span></a>  nm_setting_wireless_security_get_wep_key_flags
+                                                        (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>);</pre>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
+<td>the <a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
+<td>the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> pertaining to the all WEP keys</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_security_get_wep_key_type ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-security-get-wep-key-type"></a><h3>nm_setting_wireless_security_get_wep_key_type ()</h3>
 <pre class="programlisting"><a class="link" href="NMSettingWirelessSecurity.html#NMWepKeyType" title="enum NMWepKeyType"><span class="returnvalue">NMWepKeyType</span></a>        nm_setting_wireless_security_get_wep_key_type
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 </div>
-<div class="refsect1" title="Property Details">
+<div class="refsect1">
 <a name="NMSettingWirelessSecurity.property-details"></a><h2>Property Details</h2>
-<div class="refsect2" title='The "auth-alg" property'>
+<div class="refsect2">
 <a name="NMSettingWirelessSecurity--auth-alg"></a><h3>The <code class="literal">"auth-alg"</code> property</h3>
 <pre class="programlisting">  "auth-alg"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -998,7 +699,7 @@ the 'leap-username' and 'leap-password' properties must be specified.
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "group" property'>
+<div class="refsect2">
 <a name="NMSettingWirelessSecurity--group"></a><h3>The <code class="literal">"group"</code> property</h3>
 <pre class="programlisting">  "group"                    <span class="type">GSList_gchararray_</span>*   : Read / Write</pre>
 <p>
@@ -1008,7 +709,7 @@ one of 'wep40', 'wep104', 'tkip', or 'ccmp'.
 </p>
 </div>
 <hr>
-<div class="refsect2" title='The "key-mgmt" property'>
+<div class="refsect2">
 <a name="NMSettingWirelessSecurity--key-mgmt"></a><h3>The <code class="literal">"key-mgmt"</code> property</h3>
 <pre class="programlisting">  "key-mgmt"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -1020,7 +721,7 @@ any WiFi connection that uses security.
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "leap-password" property'>
+<div class="refsect2">
 <a name="NMSettingWirelessSecurity--leap-password"></a><h3>The <code class="literal">"leap-password"</code> property</h3>
 <pre class="programlisting">  "leap-password"            <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -1030,7 +731,17 @@ The login password for legacy LEAP connections (ie, key-mgmt =
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "leap-username" property'>
+<div class="refsect2">
+<a name="NMSettingWirelessSecurity--leap-password-flags"></a><h3>The <code class="literal">"leap-password-flags"</code> property</h3>
+<pre class="programlisting">  "leap-password-flags"      <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write</pre>
+<p>
+Flags indicating how to handle <a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--leap-password" title='The "leap-password" property'><span class="type">"leap-password"</span></a>.
+</p>
+<p>Allowed values: &lt;= 7</p>
+<p>Default value: 0</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="NMSettingWirelessSecurity--leap-username"></a><h3>The <code class="literal">"leap-username"</code> property</h3>
 <pre class="programlisting">  "leap-username"            <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -1040,7 +751,7 @@ The login username for legacy LEAP connections (ie, key-mgmt =
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "pairwise" property'>
+<div class="refsect2">
 <a name="NMSettingWirelessSecurity--pairwise"></a><h3>The <code class="literal">"pairwise"</code> property</h3>
 <pre class="programlisting">  "pairwise"                 <span class="type">GSList_gchararray_</span>*   : Read / Write</pre>
 <p>
@@ -1050,7 +761,7 @@ specified pairwise encryption capabilities.  Each element may be one of
 </p>
 </div>
 <hr>
-<div class="refsect2" title='The "proto" property'>
+<div class="refsect2">
 <a name="NMSettingWirelessSecurity--proto"></a><h3>The <code class="literal">"proto"</code> property</h3>
 <pre class="programlisting">  "proto"                    <span class="type">GSList_gchararray_</span>*   : Read / Write</pre>
 <p>
@@ -1060,7 +771,7 @@ not specified, both WPA and RSN connections are allowed.
 </p>
 </div>
 <hr>
-<div class="refsect2" title='The "psk" property'>
+<div class="refsect2">
 <a name="NMSettingWirelessSecurity--psk"></a><h3>The <code class="literal">"psk"</code> property</h3>
 <pre class="programlisting">  "psk"                      <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -1074,7 +785,27 @@ connecting to the WiFi network.
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "wep-key-type" property'>
+<div class="refsect2">
+<a name="NMSettingWirelessSecurity--psk-flags"></a><h3>The <code class="literal">"psk-flags"</code> property</h3>
+<pre class="programlisting">  "psk-flags"                <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write</pre>
+<p>
+Flags indicating how to handle <a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--psk" title='The "psk" property'><span class="type">"psk"</span></a>
+</p>
+<p>Allowed values: &lt;= 7</p>
+<p>Default value: 0</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMSettingWirelessSecurity--wep-key-flags"></a><h3>The <code class="literal">"wep-key-flags"</code> property</h3>
+<pre class="programlisting">  "wep-key-flags"            <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write</pre>
+<p>
+Flags indicating how to handle <a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> WEP keys.
+</p>
+<p>Allowed values: &lt;= 7</p>
+<p>Default value: 0</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="NMSettingWirelessSecurity--wep-key-type"></a><h3>The <code class="literal">"wep-key-type"</code> property</h3>
 <pre class="programlisting">  "wep-key-type"             <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write / Construct</pre>
 <p>
@@ -1090,7 +821,7 @@ actual WEP key.
 <p>Default value: 0</p>
 </div>
 <hr>
-<div class="refsect2" title='The "wep-key0" property'>
+<div class="refsect2">
 <a name="NMSettingWirelessSecurity--wep-key0"></a><h3>The <code class="literal">"wep-key0"</code> property</h3>
 <pre class="programlisting">  "wep-key0"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -1100,7 +831,7 @@ Index 0 WEP key.  This is the WEP key used in most networks.  See the
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "wep-key1" property'>
+<div class="refsect2">
 <a name="NMSettingWirelessSecurity--wep-key1"></a><h3>The <code class="literal">"wep-key1"</code> property</h3>
 <pre class="programlisting">  "wep-key1"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -1110,7 +841,7 @@ Index 1 WEP key.  This WEP index is not used by most networks.  See the
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "wep-key2" property'>
+<div class="refsect2">
 <a name="NMSettingWirelessSecurity--wep-key2"></a><h3>The <code class="literal">"wep-key2"</code> property</h3>
 <pre class="programlisting">  "wep-key2"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -1120,7 +851,7 @@ Index 2 WEP key.  This WEP index is not used by most networks.  See the
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "wep-key3" property'>
+<div class="refsect2">
 <a name="NMSettingWirelessSecurity--wep-key3"></a><h3>The <code class="literal">"wep-key3"</code> property</h3>
 <pre class="programlisting">  "wep-key3"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -1130,7 +861,7 @@ Index 3 WEP key.  This WEP index is not used by most networks.  See the
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "wep-tx-keyidx" property'>
+<div class="refsect2">
 <a name="NMSettingWirelessSecurity--wep-tx-keyidx"></a><h3>The <code class="literal">"wep-tx-keyidx"</code> property</h3>
 <pre class="programlisting">  "wep-tx-keyidx"            <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write / Construct</pre>
 <p>
@@ -1146,6 +877,6 @@ Linksys WRT54G) number the keys 1 - 4.
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.15</div>
+          Generated by GTK-Doc V1.17</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/annotation-glossary.html b/docs/libnm-util/html/annotation-glossary.html
index 68c91a18b..e0a1c8696 100644
--- a/docs/libnm-util/html/annotation-glossary.html
+++ b/docs/libnm-util/html/annotation-glossary.html
@@ -3,11 +3,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Annotation Glossary</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="libnm-util Reference Manual">
 <link rel="up" href="index.html" title="libnm-util Reference Manual">
 <link rel="prev" href="api-index-full.html" title="API Index">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -19,18 +19,53 @@
 <th width="100%" align="center">libnm-util Reference Manual</th>
 <td> </td>
 </tr>
-<tr><td colspan="5" class="shortcuts"><a class="shortcut" href="#glsE">E</a></td></tr>
+<tr><td colspan="5" class="shortcuts">
+<a class="shortcut" href="#glsO">O</a>
+                      | 
+                   <a class="shortcut" href="#glsA">A</a>
+                      | 
+                   <a class="shortcut" href="#glsE">E</a>
+                      | 
+                   <a class="shortcut" href="#glsT">T</a>
+                      | 
+                   <a class="shortcut" href="#glsS">S</a>
+                      | 
+                   <a class="shortcut" href="#glsT">T</a>
+</td></tr>
 </table>
-<div class="glossary" title="Annotation Glossary">
+<div class="glossary">
 <div class="titlepage"><div><div><h2 class="title">
 <a name="annotation-glossary"></a>Annotation Glossary</h2></div></div></div>
+<a name="glsO"></a><h3 class="title">O</h3>
+<dt>
+<a name="annotation-glossterm-out"></a>out</dt>
+<dd><p>Parameter for returning results. Default is <acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>.</p></dd>
+<a name="glsA"></a><h3 class="title">A</h3>
+<dt>
+<a name="annotation-glossterm-allow-none"></a>allow-none</dt>
+<dd><p>NULL is ok, both for passing and for returning.</p></dd>
 <a name="glsE"></a><h3 class="title">E</h3>
 <dt>
 <a name="annotation-glossterm-element-type"></a>element-type</dt>
 <dd><p>Generics and defining elements of containers and arrays.</p></dd>
+<a name="glsT"></a><h3 class="title">T</h3>
+<dt>
+<a name="annotation-glossterm-transfer%20container"></a>transfer container</dt>
+<dd><p>Free data container after the code is done.</p></dd>
+<a name="glsS"></a><h3 class="title">S</h3>
+<dt>
+<a name="annotation-glossterm-scope%20call"></a>scope call</dt>
+<dd><p>The callback is valid only during the call to the method.</p></dd>
+<a name="glsT"></a><h3 class="title">T</h3>
+<dt>
+<a name="annotation-glossterm-transfer%20full"></a>transfer full</dt>
+<dd><p>Free data after the code is done.</p></dd>
+<dt>
+<a name="annotation-glossterm-transfer%20none"></a>transfer none</dt>
+<dd><p>Don't free data after the code is done.</p></dd>
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.15</div>
+          Generated by GTK-Doc V1.17</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/api-index-full.html b/docs/libnm-util/html/api-index-full.html
index 73178ec7f..b6776b7dc 100644
--- a/docs/libnm-util/html/api-index-full.html
+++ b/docs/libnm-util/html/api-index-full.html
@@ -3,12 +3,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>API Index</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="libnm-util Reference Manual">
 <link rel="up" href="index.html" title="libnm-util Reference Manual">
 <link rel="prev" href="object-tree.html" title="Object Hierarchy">
 <link rel="next" href="annotation-glossary.html" title="Annotation Glossary">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -23,16 +23,8 @@
 <tr><td colspan="5" class="shortcuts">
 <a class="shortcut" href="#idxC">C</a>
                       | 
-                   <a class="shortcut" href="#idxD">D</a>
-                      | 
-                   <a class="shortcut" href="#idxE">E</a>
-                      | 
-                   <a class="shortcut" href="#idxG">G</a>
-                      | 
                    <a class="shortcut" href="#idxI">I</a>
                       | 
-                   <a class="shortcut" href="#idxP">P</a>
-                      | 
                    <a class="shortcut" href="#idxS">S</a>
                       | 
                    <a class="shortcut" href="#idxT">T</a>
@@ -44,212 +36,209 @@
                    <a class="shortcut" href="#idxW">W</a>
 </td></tr>
 </table>
-<div class="index" title="API Index">
+<div class="index">
 <div class="titlepage"><div><div><h2 class="title">
 <a name="api-index-full"></a>API Index</h2></div></div></div>
 <a name="idx"></a><a name="idxC"></a><h3 class="title">C</h3>
 <dt>
-<a class="link" href="NMConnection.html#NMConnection-struct" title="NMConnection">NMConnection</a>, struct in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+NMConnection, struct in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMConnection.html#NMConnection-secrets-updated" title='The "secrets-updated" signal'>NMConnection::secrets-updated</a>, object signal in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+NMConnection::secrets-updated, object signal in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMConnection.html#NMConnection--path" title='The "path" property'>NMConnection:path</a>, object property in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+NMConnection:path, object property in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMConnection.html#NMConnection--scope" title='The "scope" property'>NMConnection:scope</a>, object property in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+NMConnectionClass, struct in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMConnection.html#NMConnectionClass" title="NMConnectionClass">NMConnectionClass</a>, struct in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+NMConnectionError, enum in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMConnection.html#NMConnectionError" title="enum NMConnectionError">NMConnectionError</a>, enum in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+nm_connection_add_setting, function in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMConnection.html#NMConnectionScope" title="enum NMConnectionScope">NMConnectionScope</a>, enum in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+nm_connection_clear_secrets, function in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMConnection.html#nm-connection-add-setting" title="nm_connection_add_setting ()">nm_connection_add_setting</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+nm_connection_compare, function in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMConnection.html#nm-connection-clear-secrets" title="nm_connection_clear_secrets ()">nm_connection_clear_secrets</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+nm_connection_create_setting, function in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMConnection.html#nm-connection-compare" title="nm_connection_compare ()">nm_connection_compare</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+nm_connection_diff, function in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMConnection.html#nm-connection-create-setting" title="nm_connection_create_setting ()">nm_connection_create_setting</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+nm_connection_dump, function in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMConnection.html#nm-connection-diff" title="nm_connection_diff ()">nm_connection_diff</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+nm_connection_duplicate, function in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMConnection.html#nm-connection-dump" title="nm_connection_dump ()">nm_connection_dump</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+NM_CONNECTION_ERROR, macro in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMConnection.html#nm-connection-duplicate" title="nm_connection_duplicate ()">nm_connection_duplicate</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+nm_connection_error_quark, function in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMConnection.html#NM-CONNECTION-ERROR:CAPS" title="NM_CONNECTION_ERROR">NM_CONNECTION_ERROR</a>, macro in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+nm_connection_for_each_setting_value, function in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMConnection.html#nm-connection-error-quark" title="nm_connection_error_quark ()">nm_connection_error_quark</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+nm_connection_get_id, function in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMConnection.html#nm-connection-for-each-setting-value" title="nm_connection_for_each_setting_value ()">nm_connection_for_each_setting_value</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+nm_connection_get_path, function in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMConnection.html#nm-connection-get-path" title="nm_connection_get_path ()">nm_connection_get_path</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+nm_connection_get_setting, function in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMConnection.html#nm-connection-get-scope" title="nm_connection_get_scope ()">nm_connection_get_scope</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+nm_connection_get_setting_802_1x, function in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMConnection.html#nm-connection-get-setting" title="nm_connection_get_setting ()">nm_connection_get_setting</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+nm_connection_get_setting_bluetooth, function in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMConnection.html#nm-connection-get-setting-by-name" title="nm_connection_get_setting_by_name ()">nm_connection_get_setting_by_name</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+nm_connection_get_setting_by_name, function in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMConnection.html#nm-connection-get-type" title="nm_connection_get_type ()">nm_connection_get_type</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+nm_connection_get_setting_cdma, function in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMConnection.html#nm-connection-lookup-setting-type" title="nm_connection_lookup_setting_type ()">nm_connection_lookup_setting_type</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+nm_connection_get_setting_connection, function in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMConnection.html#nm-connection-lookup-setting-type-by-quark" title="nm_connection_lookup_setting_type_by_quark ()">nm_connection_lookup_setting_type_by_quark</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+nm_connection_get_setting_gsm, function in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMConnection.html#nm-connection-need-secrets" title="nm_connection_need_secrets ()">nm_connection_need_secrets</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+nm_connection_get_setting_ip4_config, function in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMConnection.html#nm-connection-new" title="nm_connection_new ()">nm_connection_new</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+nm_connection_get_setting_ip6_config, function in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMConnection.html#nm-connection-new-from-hash" title="nm_connection_new_from_hash ()">nm_connection_new_from_hash</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+nm_connection_get_setting_olpc_mesh, function in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMConnection.html#NM-CONNECTION-PATH:CAPS" title="NM_CONNECTION_PATH">NM_CONNECTION_PATH</a>, macro in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+nm_connection_get_setting_ppp, function in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMConnection.html#nm-connection-remove-setting" title="nm_connection_remove_setting ()">nm_connection_remove_setting</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+nm_connection_get_setting_pppoe, function in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMConnection.html#nm-connection-replace-settings" title="nm_connection_replace_settings ()">nm_connection_replace_settings</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+nm_connection_get_setting_vpn, function in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMConnection.html#NM-CONNECTION-SCOPE:CAPS" title="NM_CONNECTION_SCOPE">NM_CONNECTION_SCOPE</a>, macro in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+nm_connection_get_setting_wimax, function in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMConnection.html#nm-connection-set-path" title="nm_connection_set_path ()">nm_connection_set_path</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+nm_connection_get_setting_wired, function in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMConnection.html#nm-connection-set-scope" title="nm_connection_set_scope ()">nm_connection_set_scope</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+nm_connection_get_setting_wireless, function in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMConnection.html#nm-connection-to-hash" title="nm_connection_to_hash ()">nm_connection_to_hash</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+nm_connection_get_setting_wireless_security, function in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMConnection.html#nm-connection-update-secrets" title="nm_connection_update_secrets ()">nm_connection_update_secrets</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+nm_connection_get_type, function in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMConnection.html#nm-connection-verify" title="nm_connection_verify ()">nm_connection_verify</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+nm_connection_get_uuid, function in NMConnection
 </dt>
 <dd></dd>
-<a name="idxD"></a><h3 class="title">D</h3>
 <dt>
-<a class="link" href="libnm-util-nm-utils.html#nm-debug" title="nm_debug()">nm_debug</a>, macro in <a class="link" href="libnm-util-nm-utils.html" title="nm-utils">nm-utils</a>
+nm_connection_lookup_setting_type, function in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-util-nm-utils.html#nm-debug-str" title="nm_debug_str()">nm_debug_str</a>, macro in <a class="link" href="libnm-util-nm-utils.html" title="nm-utils">nm-utils</a>
+nm_connection_lookup_setting_type_by_quark, function in NMConnection
 </dt>
 <dd></dd>
-<a name="idxE"></a><h3 class="title">E</h3>
 <dt>
-<a class="link" href="libnm-util-nm-utils.html#nm-error" title="nm_error()">nm_error</a>, macro in <a class="link" href="libnm-util-nm-utils.html" title="nm-utils">nm-utils</a>
+nm_connection_need_secrets, function in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-util-nm-utils.html#nm-error-str" title="nm_error_str()">nm_error_str</a>, macro in <a class="link" href="libnm-util-nm-utils.html" title="nm-utils">nm-utils</a>
+nm_connection_new, function in NMConnection
 </dt>
 <dd></dd>
-<a name="idxG"></a><h3 class="title">G</h3>
 <dt>
-<a class="link" href="libnm-util-nm-utils.html#nm-get-timestamp" title="nm_get_timestamp()">nm_get_timestamp</a>, macro in <a class="link" href="libnm-util-nm-utils.html" title="nm-utils">nm-utils</a>
+nm_connection_new_from_hash, function in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSettingGsm.html#NM-GSM-NETWORK-ANY:CAPS" title="NM_GSM_NETWORK_ANY">NM_GSM_NETWORK_ANY</a>, macro in <a class="link" href="NMSettingGsm.html" title="NMSettingGsm">NMSettingGsm</a>
+NM_CONNECTION_PATH, macro in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSettingGsm.html#NM-GSM-NETWORK-GPRS-EDGE:CAPS" title="NM_GSM_NETWORK_GPRS_EDGE">NM_GSM_NETWORK_GPRS_EDGE</a>, macro in <a class="link" href="NMSettingGsm.html" title="NMSettingGsm">NMSettingGsm</a>
+nm_connection_remove_setting, function in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSettingGsm.html#NM-GSM-NETWORK-PREFER-GPRS-EDGE:CAPS" title="NM_GSM_NETWORK_PREFER_GPRS_EDGE">NM_GSM_NETWORK_PREFER_GPRS_EDGE</a>, macro in <a class="link" href="NMSettingGsm.html" title="NMSettingGsm">NMSettingGsm</a>
+nm_connection_replace_settings, function in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSettingGsm.html#NM-GSM-NETWORK-PREFER-UMTS-HSPA:CAPS" title="NM_GSM_NETWORK_PREFER_UMTS_HSPA">NM_GSM_NETWORK_PREFER_UMTS_HSPA</a>, macro in <a class="link" href="NMSettingGsm.html" title="NMSettingGsm">NMSettingGsm</a>
+nm_connection_set_path, function in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSettingGsm.html#NM-GSM-NETWORK-UMTS-HSPA:CAPS" title="NM_GSM_NETWORK_UMTS_HSPA">NM_GSM_NETWORK_UMTS_HSPA</a>, macro in <a class="link" href="NMSettingGsm.html" title="NMSettingGsm">NMSettingGsm</a>
+nm_connection_to_hash, function in NMConnection
 </dt>
 <dd></dd>
-<a name="idxI"></a><h3 class="title">I</h3>
 <dt>
-<a class="link" href="libnm-util-nm-utils.html#nm-info" title="nm_info()">nm_info</a>, macro in <a class="link" href="libnm-util-nm-utils.html" title="nm-utils">nm-utils</a>
+nm_connection_update_secrets, function in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-util-nm-utils.html#nm-info-str" title="nm_info_str()">nm_info_str</a>, macro in <a class="link" href="libnm-util-nm-utils.html" title="nm-utils">nm-utils</a>
+nm_connection_verify, function in NMConnection
 </dt>
 <dd></dd>
+<a name="idxI"></a><h3 class="title">I</h3>
 <dt>
-<a class="link" href="NMSettingIP4Config.html#NMIP4Address" title="NMIP4Address">NMIP4Address</a>, typedef in <a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config">NMSettingIP4Config</a>
+<a class="link" href="NMSettingIP4Config.html#NMIP4Address">NMIP4Address</a>, typedef in <a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config">NMSettingIP4Config</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route">NMIP4Route</a>, typedef in <a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config">NMSettingIP4Config</a>
+<a class="link" href="NMSettingIP4Config.html#NMIP4Route">NMIP4Route</a>, typedef in <a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config">NMSettingIP4Config</a>
 </dt>
 <dd></dd>
 <dt>
@@ -273,6 +262,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingIP4Config.html#nm-ip4-address-get-type" title="nm_ip4_address_get_type ()">nm_ip4_address_get_type</a>, function in <a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config">NMSettingIP4Config</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingIP4Config.html#nm-ip4-address-new" title="nm_ip4_address_new ()">nm_ip4_address_new</a>, function in <a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config">NMSettingIP4Config</a>
 </dt>
 <dd></dd>
@@ -321,6 +314,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingIP4Config.html#nm-ip4-route-get-type" title="nm_ip4_route_get_type ()">nm_ip4_route_get_type</a>, function in <a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config">NMSettingIP4Config</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingIP4Config.html#nm-ip4-route-new" title="nm_ip4_route_new ()">nm_ip4_route_new</a>, function in <a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config">NMSettingIP4Config</a>
 </dt>
 <dd></dd>
@@ -349,11 +346,11 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSettingIP6Config.html#NMIP6Address" title="NMIP6Address">NMIP6Address</a>, typedef in <a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config">NMSettingIP6Config</a>
+<a class="link" href="NMSettingIP6Config.html#NMIP6Address">NMIP6Address</a>, typedef in <a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config">NMSettingIP6Config</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route">NMIP6Route</a>, typedef in <a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config">NMSettingIP6Config</a>
+<a class="link" href="NMSettingIP6Config.html#NMIP6Route">NMIP6Route</a>, typedef in <a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config">NMSettingIP6Config</a>
 </dt>
 <dd></dd>
 <dt>
@@ -377,6 +374,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingIP6Config.html#nm-ip6-address-get-type" title="nm_ip6_address_get_type ()">nm_ip6_address_get_type</a>, function in <a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config">NMSettingIP6Config</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingIP6Config.html#nm-ip6-address-new" title="nm_ip6_address_new ()">nm_ip6_address_new</a>, function in <a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config">NMSettingIP6Config</a>
 </dt>
 <dd></dd>
@@ -425,6 +426,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingIP6Config.html#nm-ip6-route-get-type" title="nm_ip6_route_get_type ()">nm_ip6_route_get_type</a>, function in <a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config">NMSettingIP6Config</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingIP6Config.html#nm-ip6-route-new" title="nm_ip6_route_new ()">nm_ip6_route_new</a>, function in <a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config">NMSettingIP6Config</a>
 </dt>
 <dd></dd>
@@ -452,11 +457,6 @@
 <a class="link" href="NMSettingIP6Config.html#nm-ip6-route-unref" title="nm_ip6_route_unref ()">nm_ip6_route_unref</a>, function in <a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config">NMSettingIP6Config</a>
 </dt>
 <dd></dd>
-<a name="idxP"></a><h3 class="title">P</h3>
-<dt>
-<a class="link" href="libnm-util-nm-utils.html#nm-print-backtrace" title="nm_print_backtrace">nm_print_backtrace</a>, macro in <a class="link" href="libnm-util-nm-utils.html" title="nm-utils">nm-utils</a>
-</dt>
-<dd></dd>
 <a name="idxS"></a><h3 class="title">S</h3>
 <dt>
 <a class="link" href="NMSetting.html#NMSetting-struct" title="NMSetting">NMSetting</a>, struct in <a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
@@ -495,6 +495,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSetting8021x.html#NMSetting8021x--password-flags" title='The "password-flags" property'>NMSetting8021x:password-flags</a>, object property in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase1-fast-provisioning" title='The "phase1-fast-provisioning" property'>NMSetting8021x:phase1-fast-provisioning</a>, object property in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
 </dt>
 <dd></dd>
@@ -535,6 +539,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-private-key-password-flags" title='The "phase2-private-key-password-flags" property'>NMSetting8021x:phase2-private-key-password-flags</a>, object property in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSetting8021x.html#NMSetting8021x--private-key" title='The "private-key" property'>NMSetting8021x:private-key</a>, object property in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
 </dt>
 <dd></dd>
@@ -543,19 +551,19 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSetting8021x.html#NMSetting8021x--system-ca-certs" title='The "system-ca-certs" property'>NMSetting8021x:system-ca-certs</a>, object property in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
+<a class="link" href="NMSetting8021x.html#NMSetting8021x--private-key-password-flags" title='The "private-key-password-flags" property'>NMSetting8021x:private-key-password-flags</a>, object property in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSetting8021x.html#NMSetting8021xCKFormat" title="enum NMSetting8021xCKFormat">NMSetting8021xCKFormat</a>, enum in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
+<a class="link" href="NMSetting8021x.html#NMSetting8021x--system-ca-certs" title='The "system-ca-certs" property'>NMSetting8021x:system-ca-certs</a>, object property in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme" title="enum NMSetting8021xCKScheme">NMSetting8021xCKScheme</a>, enum in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
+<a class="link" href="NMSetting8021x.html#NMSetting8021xCKFormat" title="enum NMSetting8021xCKFormat">NMSetting8021xCKFormat</a>, enum in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSetting8021x.html#NMSetting8021xCKType" title="enum NMSetting8021xCKType">NMSetting8021xCKType</a>, enum in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
+<a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme" title="enum NMSetting8021xCKScheme">NMSetting8021xCKScheme</a>, enum in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
 </dt>
 <dd></dd>
 <dt>
@@ -563,7 +571,7 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSetting8021x.html#NMSetting8021xError" title="enum NMSetting8021xError">NMSetting8021xError</a>, enum in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
+<a class="link" href="NMSetting8021x.html#NMSetting8021xError">NMSetting8021xError</a>, enum in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
 </dt>
 <dd></dd>
 <dt>
@@ -587,7 +595,7 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSettingBluetooth.html#NMSettingBluetoothError" title="enum NMSettingBluetoothError">NMSettingBluetoothError</a>, enum in <a class="link" href="NMSettingBluetooth.html" title="NMSettingBluetooth">NMSettingBluetooth</a>
+<a class="link" href="NMSettingBluetooth.html#NMSettingBluetoothError">NMSettingBluetoothError</a>, enum in <a class="link" href="NMSettingBluetooth.html" title="NMSettingBluetooth">NMSettingBluetooth</a>
 </dt>
 <dd></dd>
 <dt>
@@ -603,6 +611,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingCdma.html#NMSettingCdma--password-flags" title='The "password-flags" property'>NMSettingCdma:password-flags</a>, object property in <a class="link" href="NMSettingCdma.html" title="NMSettingCdma">NMSettingCdma</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingCdma.html#NMSettingCdma--username" title='The "username" property'>NMSettingCdma:username</a>, object property in <a class="link" href="NMSettingCdma.html" title="NMSettingCdma">NMSettingCdma</a>
 </dt>
 <dd></dd>
@@ -611,7 +623,7 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSettingCdma.html#NMSettingCdmaError" title="enum NMSettingCdmaError">NMSettingCdmaError</a>, enum in <a class="link" href="NMSettingCdma.html" title="NMSettingCdma">NMSettingCdma</a>
+<a class="link" href="NMSettingCdma.html#NMSettingCdmaError">NMSettingCdmaError</a>, enum in <a class="link" href="NMSettingCdma.html" title="NMSettingCdma">NMSettingCdma</a>
 </dt>
 <dd></dd>
 <dt>
@@ -635,6 +647,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingConnection.html#NMSettingConnection--permissions" title='The "permissions" property'>NMSettingConnection:permissions</a>, object property in <a class="link" href="NMSettingConnection.html" title="NMSettingConnection">NMSettingConnection</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingConnection.html#NMSettingConnection--read-only" title='The "read-only" property'>NMSettingConnection:read-only</a>, object property in <a class="link" href="NMSettingConnection.html" title="NMSettingConnection">NMSettingConnection</a>
 </dt>
 <dd></dd>
@@ -655,7 +671,7 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSettingConnection.html#NMSettingConnectionError" title="enum NMSettingConnectionError">NMSettingConnectionError</a>, enum in <a class="link" href="NMSettingConnection.html" title="NMSettingConnection">NMSettingConnection</a>
+<a class="link" href="NMSettingConnection.html#NMSettingConnectionError">NMSettingConnectionError</a>, enum in <a class="link" href="NMSettingConnection.html" title="NMSettingConnection">NMSettingConnection</a>
 </dt>
 <dd></dd>
 <dt>
@@ -663,7 +679,7 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSetting.html#NMSettingError" title="enum NMSettingError">NMSettingError</a>, enum in <a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
+<a class="link" href="NMSetting.html#NMSettingError">NMSettingError</a>, enum in <a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
 </dt>
 <dd></dd>
 <dt>
@@ -679,10 +695,6 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSettingGsm.html#NMSettingGsm--band" title='The "band" property'>NMSettingGsm:band</a>, object property in <a class="link" href="NMSettingGsm.html" title="NMSettingGsm">NMSettingGsm</a>
-</dt>
-<dd></dd>
-<dt>
 <a class="link" href="NMSettingGsm.html#NMSettingGsm--home-only" title='The "home-only" property'>NMSettingGsm:home-only</a>, object property in <a class="link" href="NMSettingGsm.html" title="NMSettingGsm">NMSettingGsm</a>
 </dt>
 <dd></dd>
@@ -703,11 +715,15 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingGsm.html#NMSettingGsm--password-flags" title='The "password-flags" property'>NMSettingGsm:password-flags</a>, object property in <a class="link" href="NMSettingGsm.html" title="NMSettingGsm">NMSettingGsm</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingGsm.html#NMSettingGsm--pin" title='The "pin" property'>NMSettingGsm:pin</a>, object property in <a class="link" href="NMSettingGsm.html" title="NMSettingGsm">NMSettingGsm</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSettingGsm.html#NMSettingGsm--puk" title='The "puk" property'>NMSettingGsm:puk</a>, object property in <a class="link" href="NMSettingGsm.html" title="NMSettingGsm">NMSettingGsm</a>
+<a class="link" href="NMSettingGsm.html#NMSettingGsm--pin-flags" title='The "pin-flags" property'>NMSettingGsm:pin-flags</a>, object property in <a class="link" href="NMSettingGsm.html" title="NMSettingGsm">NMSettingGsm</a>
 </dt>
 <dd></dd>
 <dt>
@@ -719,7 +735,7 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSettingGsm.html#NMSettingGsmError" title="enum NMSettingGsmError">NMSettingGsmError</a>, enum in <a class="link" href="NMSettingGsm.html" title="NMSettingGsm">NMSettingGsm</a>
+<a class="link" href="NMSettingGsm.html#NMSettingGsmError">NMSettingGsmError</a>, enum in <a class="link" href="NMSettingGsm.html" title="NMSettingGsm">NMSettingGsm</a>
 </dt>
 <dd></dd>
 <dt>
@@ -731,6 +747,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSetting.html#NMSettingHashFlags" title="enum NMSettingHashFlags">NMSettingHashFlags</a>, enum in <a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingIP4Config.html#NMSettingIP4Config-struct" title="NMSettingIP4Config">NMSettingIP4Config</a>, struct in <a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config">NMSettingIP4Config</a>
 </dt>
 <dd></dd>
@@ -787,7 +807,7 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSettingIP4Config.html#NMSettingIP4ConfigError" title="enum NMSettingIP4ConfigError">NMSettingIP4ConfigError</a>, enum in <a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config">NMSettingIP4Config</a>
+<a class="link" href="NMSettingIP4Config.html#NMSettingIP4ConfigError">NMSettingIP4ConfigError</a>, enum in <a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config">NMSettingIP4Config</a>
 </dt>
 <dd></dd>
 <dt>
@@ -835,7 +855,7 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSettingIP6Config.html#NMSettingIP6ConfigError" title="enum NMSettingIP6ConfigError">NMSettingIP6ConfigError</a>, enum in <a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config">NMSettingIP6Config</a>
+<a class="link" href="NMSettingIP6Config.html#NMSettingIP6ConfigError">NMSettingIP6ConfigError</a>, enum in <a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config">NMSettingIP6Config</a>
 </dt>
 <dd></dd>
 <dt>
@@ -859,7 +879,7 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSettingOlpcMesh.html#NMSettingOlpcMeshError" title="enum NMSettingOlpcMeshError">NMSettingOlpcMeshError</a>, enum in <a class="link" href="NMSettingOlpcMesh.html" title="NMSettingOlpcMesh">NMSettingOlpcMesh</a>
+<a class="link" href="NMSettingOlpcMesh.html#NMSettingOlpcMeshError">NMSettingOlpcMeshError</a>, enum in <a class="link" href="NMSettingOlpcMesh.html" title="NMSettingOlpcMesh">NMSettingOlpcMesh</a>
 </dt>
 <dd></dd>
 <dt>
@@ -943,7 +963,7 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSettingPPP.html#NMSettingPPPError" title="enum NMSettingPPPError">NMSettingPPPError</a>, enum in <a class="link" href="NMSettingPPP.html" title="NMSettingPPP">NMSettingPPP</a>
+<a class="link" href="NMSettingPPP.html#NMSettingPPPError">NMSettingPPPError</a>, enum in <a class="link" href="NMSettingPPP.html" title="NMSettingPPP">NMSettingPPP</a>
 </dt>
 <dd></dd>
 <dt>
@@ -955,6 +975,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingPPPOE.html#NMSettingPPPOE--password-flags" title='The "password-flags" property'>NMSettingPPPOE:password-flags</a>, object property in <a class="link" href="NMSettingPPPOE.html" title="NMSettingPPPOE">NMSettingPPPOE</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingPPPOE.html#NMSettingPPPOE--service" title='The "service" property'>NMSettingPPPOE:service</a>, object property in <a class="link" href="NMSettingPPPOE.html" title="NMSettingPPPOE">NMSettingPPPOE</a>
 </dt>
 <dd></dd>
@@ -967,7 +991,11 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSettingPPPOE.html#NMSettingPPPOEError" title="enum NMSettingPPPOEError">NMSettingPPPOEError</a>, enum in <a class="link" href="NMSettingPPPOE.html" title="NMSettingPPPOE">NMSettingPPPOE</a>
+<a class="link" href="NMSettingPPPOE.html#NMSettingPPPOEError">NMSettingPPPOEError</a>, enum in <a class="link" href="NMSettingPPPOE.html" title="NMSettingPPPOE">NMSettingPPPOE</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags">NMSettingSecretFlags</a>, enum in <a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
 </dt>
 <dd></dd>
 <dt>
@@ -999,7 +1027,7 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSettingSerial.html#NMSettingSerialError" title="enum NMSettingSerialError">NMSettingSerialError</a>, enum in <a class="link" href="NMSettingSerial.html" title="NMSettingSerial">NMSettingSerial</a>
+<a class="link" href="NMSettingSerial.html#NMSettingSerialError">NMSettingSerialError</a>, enum in <a class="link" href="NMSettingSerial.html" title="NMSettingSerial">NMSettingSerial</a>
 </dt>
 <dd></dd>
 <dt>
@@ -1031,7 +1059,27 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSettingVPN.html#NMSettingVpnError" title="enum NMSettingVpnError">NMSettingVpnError</a>, enum in <a class="link" href="NMSettingVPN.html" title="NMSettingVPN">NMSettingVPN</a>
+<a class="link" href="NMSettingVPN.html#NMSettingVpnError">NMSettingVpnError</a>, enum in <a class="link" href="NMSettingVPN.html" title="NMSettingVPN">NMSettingVPN</a>
+</dt>
+<dd></dd>
+<dt>
+NMSettingWimax, struct in NMSettingWimax
+</dt>
+<dd></dd>
+<dt>
+NMSettingWimax:mac-address, object property in NMSettingWimax
+</dt>
+<dd></dd>
+<dt>
+NMSettingWimax:network-name, object property in NMSettingWimax
+</dt>
+<dd></dd>
+<dt>
+NMSettingWimaxClass, struct in NMSettingWimax
+</dt>
+<dd></dd>
+<dt>
+NMSettingWimaxError, enum in NMSettingWimax
 </dt>
 <dd></dd>
 <dt>
@@ -1083,7 +1131,7 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSettingWired.html#NMSettingWiredError" title="enum NMSettingWiredError">NMSettingWiredError</a>, enum in <a class="link" href="NMSettingWired.html" title="NMSettingWired">NMSettingWired</a>
+<a class="link" href="NMSettingWired.html#NMSettingWiredError">NMSettingWiredError</a>, enum in <a class="link" href="NMSettingWired.html" title="NMSettingWired">NMSettingWired</a>
 </dt>
 <dd></dd>
 <dt>
@@ -1143,7 +1191,7 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSettingWireless.html#NMSettingWirelessError" title="enum NMSettingWirelessError">NMSettingWirelessError</a>, enum in <a class="link" href="NMSettingWireless.html" title="NMSettingWireless">NMSettingWireless</a>
+<a class="link" href="NMSettingWireless.html#NMSettingWirelessError">NMSettingWirelessError</a>, enum in <a class="link" href="NMSettingWireless.html" title="NMSettingWireless">NMSettingWireless</a>
 </dt>
 <dd></dd>
 <dt>
@@ -1167,6 +1215,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--leap-password-flags" title='The "leap-password-flags" property'>NMSettingWirelessSecurity:leap-password-flags</a>, object property in <a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity">NMSettingWirelessSecurity</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--leap-username" title='The "leap-username" property'>NMSettingWirelessSecurity:leap-username</a>, object property in <a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity">NMSettingWirelessSecurity</a>
 </dt>
 <dd></dd>
@@ -1183,6 +1235,14 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--psk-flags" title='The "psk-flags" property'>NMSettingWirelessSecurity:psk-flags</a>, object property in <a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity">NMSettingWirelessSecurity</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--wep-key-flags" title='The "wep-key-flags" property'>NMSettingWirelessSecurity:wep-key-flags</a>, object property in <a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity">NMSettingWirelessSecurity</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--wep-key-type" title='The "wep-key-type" property'>NMSettingWirelessSecurity:wep-key-type</a>, object property in <a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity">NMSettingWirelessSecurity</a>
 </dt>
 <dd></dd>
@@ -1211,7 +1271,7 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurityError" title="enum NMSettingWirelessSecurityError">NMSettingWirelessSecurityError</a>, enum in <a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity">NMSettingWirelessSecurity</a>
+<a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurityError">NMSettingWirelessSecurityError</a>, enum in <a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity">NMSettingWirelessSecurity</a>
 </dt>
 <dd></dd>
 <dt>
@@ -1255,10 +1315,6 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-ca-cert" title="nm_setting_802_1x_get_ca_cert ()">nm_setting_802_1x_get_ca_cert</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
-</dt>
-<dd></dd>
-<dt>
 <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-ca-cert-blob" title="nm_setting_802_1x_get_ca_cert_blob ()">nm_setting_802_1x_get_ca_cert_blob</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
 </dt>
 <dd></dd>
@@ -1275,10 +1331,6 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-client-cert" title="nm_setting_802_1x_get_client_cert ()">nm_setting_802_1x_get_client_cert</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
-</dt>
-<dd></dd>
-<dt>
 <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-client-cert-blob" title="nm_setting_802_1x_get_client_cert_blob ()">nm_setting_802_1x_get_client_cert_blob</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
 </dt>
 <dd></dd>
@@ -1307,6 +1359,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-password-flags" title="nm_setting_802_1x_get_password_flags ()">nm_setting_802_1x_get_password_flags</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase1-fast-provisioning" title="nm_setting_802_1x_get_phase1_fast_provisioning ()">nm_setting_802_1x_get_phase1_fast_provisioning</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
 </dt>
 <dd></dd>
@@ -1327,10 +1383,6 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-ca-cert" title="nm_setting_802_1x_get_phase2_ca_cert ()">nm_setting_802_1x_get_phase2_ca_cert</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
-</dt>
-<dd></dd>
-<dt>
 <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-ca-cert-blob" title="nm_setting_802_1x_get_phase2_ca_cert_blob ()">nm_setting_802_1x_get_phase2_ca_cert_blob</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
 </dt>
 <dd></dd>
@@ -1347,10 +1399,6 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-client-cert" title="nm_setting_802_1x_get_phase2_client_cert ()">nm_setting_802_1x_get_phase2_client_cert</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
-</dt>
-<dd></dd>
-<dt>
 <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-client-cert-blob" title="nm_setting_802_1x_get_phase2_client_cert_blob ()">nm_setting_802_1x_get_phase2_client_cert_blob</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
 </dt>
 <dd></dd>
@@ -1363,10 +1411,6 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key" title="nm_setting_802_1x_get_phase2_private_key ()">nm_setting_802_1x_get_phase2_private_key</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
-</dt>
-<dd></dd>
-<dt>
 <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-blob" title="nm_setting_802_1x_get_phase2_private_key_blob ()">nm_setting_802_1x_get_phase2_private_key_blob</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
 </dt>
 <dd></dd>
@@ -1379,15 +1423,15 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-path" title="nm_setting_802_1x_get_phase2_private_key_path ()">nm_setting_802_1x_get_phase2_private_key_path</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
+<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-password-flags" title="nm_setting_802_1x_get_phase2_private_key_password_flags ()">nm_setting_802_1x_get_phase2_private_key_password_flags</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-scheme" title="nm_setting_802_1x_get_phase2_private_key_scheme ()">nm_setting_802_1x_get_phase2_private_key_scheme</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
+<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-path" title="nm_setting_802_1x_get_phase2_private_key_path ()">nm_setting_802_1x_get_phase2_private_key_path</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-type" title="nm_setting_802_1x_get_phase2_private_key_type ()">nm_setting_802_1x_get_phase2_private_key_type</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
+<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-scheme" title="nm_setting_802_1x_get_phase2_private_key_scheme ()">nm_setting_802_1x_get_phase2_private_key_scheme</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
 </dt>
 <dd></dd>
 <dt>
@@ -1395,7 +1439,7 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-private-key" title="nm_setting_802_1x_get_private_key ()">nm_setting_802_1x_get_private_key</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
+<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-pin-flags" title="nm_setting_802_1x_get_pin_flags ()">nm_setting_802_1x_get_pin_flags</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
 </dt>
 <dd></dd>
 <dt>
@@ -1411,19 +1455,15 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-private-key-path" title="nm_setting_802_1x_get_private_key_path ()">nm_setting_802_1x_get_private_key_path</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
+<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-private-key-password-flags" title="nm_setting_802_1x_get_private_key_password_flags ()">nm_setting_802_1x_get_private_key_password_flags</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-private-key-scheme" title="nm_setting_802_1x_get_private_key_scheme ()">nm_setting_802_1x_get_private_key_scheme</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
-</dt>
-<dd></dd>
-<dt>
-<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-private-key-type" title="nm_setting_802_1x_get_private_key_type ()">nm_setting_802_1x_get_private_key_type</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
+<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-private-key-path" title="nm_setting_802_1x_get_private_key_path ()">nm_setting_802_1x_get_private_key_path</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-psk" title="nm_setting_802_1x_get_psk ()">nm_setting_802_1x_get_psk</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
+<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-private-key-scheme" title="nm_setting_802_1x_get_private_key_scheme ()">nm_setting_802_1x_get_private_key_scheme</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
 </dt>
 <dd></dd>
 <dt>
@@ -1447,6 +1487,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-PASSWORD-FLAGS:CAPS" title="NM_SETTING_802_1X_PASSWORD_FLAGS">NM_SETTING_802_1X_PASSWORD_FLAGS</a>, macro in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-PHASE1-FAST-PROVISIONING:CAPS" title="NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING">NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING</a>, macro in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
 </dt>
 <dd></dd>
@@ -1487,10 +1531,18 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-PHASE2-PRIVATE-KEY-PASSWORD-FLAGS:CAPS" title="NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS">NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS</a>, macro in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-PIN:CAPS" title="NM_SETTING_802_1X_PIN">NM_SETTING_802_1X_PIN</a>, macro in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-PIN-FLAGS:CAPS" title="NM_SETTING_802_1X_PIN_FLAGS">NM_SETTING_802_1X_PIN_FLAGS</a>, macro in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-PRIVATE-KEY:CAPS" title="NM_SETTING_802_1X_PRIVATE_KEY">NM_SETTING_802_1X_PRIVATE_KEY</a>, macro in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
 </dt>
 <dd></dd>
@@ -1499,7 +1551,7 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-PSK:CAPS" title="NM_SETTING_802_1X_PSK">NM_SETTING_802_1X_PSK</a>, macro in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
+<a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-PRIVATE-KEY-PASSWORD-FLAGS:CAPS" title="NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS">NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS</a>, macro in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
 </dt>
 <dd></dd>
 <dt>
@@ -1515,50 +1567,26 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-ca-cert-from-file" title="nm_setting_802_1x_set_ca_cert_from_file ()">nm_setting_802_1x_set_ca_cert_from_file</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
-</dt>
-<dd></dd>
-<dt>
 <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-client-cert" title="nm_setting_802_1x_set_client_cert ()">nm_setting_802_1x_set_client_cert</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-client-cert-from-file" title="nm_setting_802_1x_set_client_cert_from_file ()">nm_setting_802_1x_set_client_cert_from_file</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
-</dt>
-<dd></dd>
-<dt>
 <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-phase2-ca-cert" title="nm_setting_802_1x_set_phase2_ca_cert ()">nm_setting_802_1x_set_phase2_ca_cert</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-phase2-ca-cert-from-file" title="nm_setting_802_1x_set_phase2_ca_cert_from_file ()">nm_setting_802_1x_set_phase2_ca_cert_from_file</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
-</dt>
-<dd></dd>
-<dt>
 <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-phase2-client-cert" title="nm_setting_802_1x_set_phase2_client_cert ()">nm_setting_802_1x_set_phase2_client_cert</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-phase2-client-cert-from-file" title="nm_setting_802_1x_set_phase2_client_cert_from_file ()">nm_setting_802_1x_set_phase2_client_cert_from_file</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
-</dt>
-<dd></dd>
-<dt>
 <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-phase2-private-key" title="nm_setting_802_1x_set_phase2_private_key ()">nm_setting_802_1x_set_phase2_private_key</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-phase2-private-key-from-file" title="nm_setting_802_1x_set_phase2_private_key_from_file ()">nm_setting_802_1x_set_phase2_private_key_from_file</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
-</dt>
-<dd></dd>
-<dt>
 <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-private-key" title="nm_setting_802_1x_set_private_key ()">nm_setting_802_1x_set_private_key</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-private-key-from-file" title="nm_setting_802_1x_set_private_key_from_file ()">nm_setting_802_1x_set_private_key_from_file</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
-</dt>
-<dd></dd>
-<dt>
 <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-SYSTEM-CA-CERTS:CAPS" title="NM_SETTING_802_1X_SYSTEM_CA_CERTS">NM_SETTING_802_1X_SYSTEM_CA_CERTS</a>, macro in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
 </dt>
 <dd></dd>
@@ -1623,6 +1651,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingCdma.html#nm-setting-cdma-get-password-flags" title="nm_setting_cdma_get_password_flags ()">nm_setting_cdma_get_password_flags</a>, function in <a class="link" href="NMSettingCdma.html" title="NMSettingCdma">NMSettingCdma</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingCdma.html#nm-setting-cdma-get-type" title="nm_setting_cdma_get_type ()">nm_setting_cdma_get_type</a>, function in <a class="link" href="NMSettingCdma.html" title="NMSettingCdma">NMSettingCdma</a>
 </dt>
 <dd></dd>
@@ -1643,6 +1675,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingCdma.html#NM-SETTING-CDMA-PASSWORD-FLAGS:CAPS" title="NM_SETTING_CDMA_PASSWORD_FLAGS">NM_SETTING_CDMA_PASSWORD_FLAGS</a>, macro in <a class="link" href="NMSettingCdma.html" title="NMSettingCdma">NMSettingCdma</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingCdma.html#NM-SETTING-CDMA-SETTING-NAME:CAPS" title="NM_SETTING_CDMA_SETTING_NAME">NM_SETTING_CDMA_SETTING_NAME</a>, macro in <a class="link" href="NMSettingCdma.html" title="NMSettingCdma">NMSettingCdma</a>
 </dt>
 <dd></dd>
@@ -1659,6 +1695,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingConnection.html#nm-setting-connection-add-permission" title="nm_setting_connection_add_permission ()">nm_setting_connection_add_permission</a>, function in <a class="link" href="NMSettingConnection.html" title="NMSettingConnection">NMSettingConnection</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingConnection.html#NM-SETTING-CONNECTION-AUTOCONNECT:CAPS" title="NM_SETTING_CONNECTION_AUTOCONNECT">NM_SETTING_CONNECTION_AUTOCONNECT</a>, macro in <a class="link" href="NMSettingConnection.html" title="NMSettingConnection">NMSettingConnection</a>
 </dt>
 <dd></dd>
@@ -1683,6 +1723,14 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingConnection.html#nm-setting-connection-get-num-permissions" title="nm_setting_connection_get_num_permissions ()">nm_setting_connection_get_num_permissions</a>, function in <a class="link" href="NMSettingConnection.html" title="NMSettingConnection">NMSettingConnection</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingConnection.html#nm-setting-connection-get-permission" title="nm_setting_connection_get_permission ()">nm_setting_connection_get_permission</a>, function in <a class="link" href="NMSettingConnection.html" title="NMSettingConnection">NMSettingConnection</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingConnection.html#nm-setting-connection-get-read-only" title="nm_setting_connection_get_read_only ()">nm_setting_connection_get_read_only</a>, function in <a class="link" href="NMSettingConnection.html" title="NMSettingConnection">NMSettingConnection</a>
 </dt>
 <dd></dd>
@@ -1707,10 +1755,22 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingConnection.html#NM-SETTING-CONNECTION-PERMISSIONS:CAPS" title="NM_SETTING_CONNECTION_PERMISSIONS">NM_SETTING_CONNECTION_PERMISSIONS</a>, macro in <a class="link" href="NMSettingConnection.html" title="NMSettingConnection">NMSettingConnection</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingConnection.html#nm-setting-connection-permissions-user-allowed" title="nm_setting_connection_permissions_user_allowed ()">nm_setting_connection_permissions_user_allowed</a>, function in <a class="link" href="NMSettingConnection.html" title="NMSettingConnection">NMSettingConnection</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingConnection.html#NM-SETTING-CONNECTION-READ-ONLY:CAPS" title="NM_SETTING_CONNECTION_READ_ONLY">NM_SETTING_CONNECTION_READ_ONLY</a>, macro in <a class="link" href="NMSettingConnection.html" title="NMSettingConnection">NMSettingConnection</a>
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingConnection.html#nm-setting-connection-remove-permission" title="nm_setting_connection_remove_permission ()">nm_setting_connection_remove_permission</a>, function in <a class="link" href="NMSettingConnection.html" title="NMSettingConnection">NMSettingConnection</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingConnection.html#NM-SETTING-CONNECTION-SETTING-NAME:CAPS" title="NM_SETTING_CONNECTION_SETTING_NAME">NM_SETTING_CONNECTION_SETTING_NAME</a>, macro in <a class="link" href="NMSettingConnection.html" title="NMSettingConnection">NMSettingConnection</a>
 </dt>
 <dd></dd>
@@ -1751,19 +1811,19 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSetting.html#nm-setting-get-type" title="nm_setting_get_type ()">nm_setting_get_type</a>, function in <a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
+<a class="link" href="NMSetting.html#nm-setting-get-secret-flags" title="nm_setting_get_secret_flags ()">nm_setting_get_secret_flags</a>, function in <a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSettingGsm.html#NM-SETTING-GSM-ALLOWED-BANDS:CAPS" title="NM_SETTING_GSM_ALLOWED_BANDS">NM_SETTING_GSM_ALLOWED_BANDS</a>, macro in <a class="link" href="NMSettingGsm.html" title="NMSettingGsm">NMSettingGsm</a>
+<a class="link" href="NMSetting.html#nm-setting-get-type" title="nm_setting_get_type ()">nm_setting_get_type</a>, function in <a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSettingGsm.html#NM-SETTING-GSM-APN:CAPS" title="NM_SETTING_GSM_APN">NM_SETTING_GSM_APN</a>, macro in <a class="link" href="NMSettingGsm.html" title="NMSettingGsm">NMSettingGsm</a>
+<a class="link" href="NMSettingGsm.html#NM-SETTING-GSM-ALLOWED-BANDS:CAPS" title="NM_SETTING_GSM_ALLOWED_BANDS">NM_SETTING_GSM_ALLOWED_BANDS</a>, macro in <a class="link" href="NMSettingGsm.html" title="NMSettingGsm">NMSettingGsm</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSettingGsm.html#NM-SETTING-GSM-BAND:CAPS" title="NM_SETTING_GSM_BAND">NM_SETTING_GSM_BAND</a>, macro in <a class="link" href="NMSettingGsm.html" title="NMSettingGsm">NMSettingGsm</a>
+<a class="link" href="NMSettingGsm.html#NM-SETTING-GSM-APN:CAPS" title="NM_SETTING_GSM_APN">NM_SETTING_GSM_APN</a>, macro in <a class="link" href="NMSettingGsm.html" title="NMSettingGsm">NMSettingGsm</a>
 </dt>
 <dd></dd>
 <dt>
@@ -1783,10 +1843,6 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSettingGsm.html#nm-setting-gsm-get-band" title="nm_setting_gsm_get_band ()">nm_setting_gsm_get_band</a>, function in <a class="link" href="NMSettingGsm.html" title="NMSettingGsm">NMSettingGsm</a>
-</dt>
-<dd></dd>
-<dt>
 <a class="link" href="NMSettingGsm.html#nm-setting-gsm-get-home-only" title="nm_setting_gsm_get_home_only ()">nm_setting_gsm_get_home_only</a>, function in <a class="link" href="NMSettingGsm.html" title="NMSettingGsm">NMSettingGsm</a>
 </dt>
 <dd></dd>
@@ -1807,11 +1863,15 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingGsm.html#nm-setting-gsm-get-password-flags" title="nm_setting_gsm_get_password_flags ()">nm_setting_gsm_get_password_flags</a>, function in <a class="link" href="NMSettingGsm.html" title="NMSettingGsm">NMSettingGsm</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingGsm.html#nm-setting-gsm-get-pin" title="nm_setting_gsm_get_pin ()">nm_setting_gsm_get_pin</a>, function in <a class="link" href="NMSettingGsm.html" title="NMSettingGsm">NMSettingGsm</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSettingGsm.html#nm-setting-gsm-get-puk" title="nm_setting_gsm_get_puk ()">nm_setting_gsm_get_puk</a>, function in <a class="link" href="NMSettingGsm.html" title="NMSettingGsm">NMSettingGsm</a>
+<a class="link" href="NMSettingGsm.html#nm-setting-gsm-get-pin-flags" title="nm_setting_gsm_get_pin_flags ()">nm_setting_gsm_get_pin_flags</a>, function in <a class="link" href="NMSettingGsm.html" title="NMSettingGsm">NMSettingGsm</a>
 </dt>
 <dd></dd>
 <dt>
@@ -1847,11 +1907,15 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingGsm.html#NM-SETTING-GSM-PASSWORD-FLAGS:CAPS" title="NM_SETTING_GSM_PASSWORD_FLAGS">NM_SETTING_GSM_PASSWORD_FLAGS</a>, macro in <a class="link" href="NMSettingGsm.html" title="NMSettingGsm">NMSettingGsm</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingGsm.html#NM-SETTING-GSM-PIN:CAPS" title="NM_SETTING_GSM_PIN">NM_SETTING_GSM_PIN</a>, macro in <a class="link" href="NMSettingGsm.html" title="NMSettingGsm">NMSettingGsm</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSettingGsm.html#NM-SETTING-GSM-PUK:CAPS" title="NM_SETTING_GSM_PUK">NM_SETTING_GSM_PUK</a>, macro in <a class="link" href="NMSettingGsm.html" title="NMSettingGsm">NMSettingGsm</a>
+<a class="link" href="NMSettingGsm.html#NM-SETTING-GSM-PIN-FLAGS:CAPS" title="NM_SETTING_GSM_PIN_FLAGS">NM_SETTING_GSM_PIN_FLAGS</a>, macro in <a class="link" href="NMSettingGsm.html" title="NMSettingGsm">NMSettingGsm</a>
 </dt>
 <dd></dd>
 <dt>
@@ -2327,6 +2391,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingPPPOE.html#nm-setting-pppoe-get-password-flags" title="nm_setting_pppoe_get_password_flags ()">nm_setting_pppoe_get_password_flags</a>, function in <a class="link" href="NMSettingPPPOE.html" title="NMSettingPPPOE">NMSettingPPPOE</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingPPPOE.html#nm-setting-pppoe-get-service" title="nm_setting_pppoe_get_service ()">nm_setting_pppoe_get_service</a>, function in <a class="link" href="NMSettingPPPOE.html" title="NMSettingPPPOE">NMSettingPPPOE</a>
 </dt>
 <dd></dd>
@@ -2347,6 +2415,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingPPPOE.html#NM-SETTING-PPPOE-PASSWORD-FLAGS:CAPS" title="NM_SETTING_PPPOE_PASSWORD_FLAGS">NM_SETTING_PPPOE_PASSWORD_FLAGS</a>, macro in <a class="link" href="NMSettingPPPOE.html" title="NMSettingPPPOE">NMSettingPPPOE</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingPPPOE.html#NM-SETTING-PPPOE-SERVICE:CAPS" title="NM_SETTING_PPPOE_SERVICE">NM_SETTING_PPPOE_SERVICE</a>, macro in <a class="link" href="NMSettingPPPOE.html" title="NMSettingPPPOE">NMSettingPPPOE</a>
 </dt>
 <dd></dd>
@@ -2523,6 +2595,10 @@
 </dt>
 <dd></dd>
 <dt>
+NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingSerial.html#NM-SETTING-SERIAL-BAUD:CAPS" title="NM_SETTING_SERIAL_BAUD">NM_SETTING_SERIAL_BAUD</a>, macro in <a class="link" href="NMSettingSerial.html" title="NMSettingSerial">NMSettingSerial</a>
 </dt>
 <dd></dd>
@@ -2583,6 +2659,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSetting.html#nm-setting-set-secret-flags" title="nm_setting_set_secret_flags ()">nm_setting_set_secret_flags</a>, function in <a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSetting.html#nm-setting-to-hash" title="nm_setting_to_hash ()">nm_setting_to_hash</a>, function in <a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
 </dt>
 <dd></dd>
@@ -2675,6 +2755,42 @@
 </dt>
 <dd></dd>
 <dt>
+NM_SETTING_WIMAX_ERROR, macro in NMSettingWimax
+</dt>
+<dd></dd>
+<dt>
+nm_setting_wimax_error_quark, function in NMSettingWimax
+</dt>
+<dd></dd>
+<dt>
+nm_setting_wimax_get_mac_address, function in NMSettingWimax
+</dt>
+<dd></dd>
+<dt>
+nm_setting_wimax_get_network_name, function in NMSettingWimax
+</dt>
+<dd></dd>
+<dt>
+nm_setting_wimax_get_type, function in NMSettingWimax
+</dt>
+<dd></dd>
+<dt>
+NM_SETTING_WIMAX_MAC_ADDRESS, macro in NMSettingWimax
+</dt>
+<dd></dd>
+<dt>
+NM_SETTING_WIMAX_NETWORK_NAME, macro in NMSettingWimax
+</dt>
+<dd></dd>
+<dt>
+nm_setting_wimax_new, function in NMSettingWimax
+</dt>
+<dd></dd>
+<dt>
+NM_SETTING_WIMAX_SETTING_NAME, macro in NMSettingWimax
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingWired.html#nm-setting-wired-add-s390-option" title="nm_setting_wired_add_s390_option ()">nm_setting_wired_add_s390_option</a>, function in <a class="link" href="NMSettingWired.html" title="NMSettingWired">NMSettingWired</a>
 </dt>
 <dd></dd>
@@ -2887,6 +3003,14 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingWireless.html#NM-SETTING-WIRELESS-MODE-ADHOC:CAPS" title="NM_SETTING_WIRELESS_MODE_ADHOC">NM_SETTING_WIRELESS_MODE_ADHOC</a>, macro in <a class="link" href="NMSettingWireless.html" title="NMSettingWireless">NMSettingWireless</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingWireless.html#NM-SETTING-WIRELESS-MODE-INFRA:CAPS" title="NM_SETTING_WIRELESS_MODE_INFRA">NM_SETTING_WIRELESS_MODE_INFRA</a>, macro in <a class="link" href="NMSettingWireless.html" title="NMSettingWireless">NMSettingWireless</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingWireless.html#NM-SETTING-WIRELESS-MTU:CAPS" title="NM_SETTING_WIRELESS_MTU">NM_SETTING_WIRELESS_MTU</a>, macro in <a class="link" href="NMSettingWireless.html" title="NMSettingWireless">NMSettingWireless</a>
 </dt>
 <dd></dd>
@@ -2955,6 +3079,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-leap-password-flags" title="nm_setting_wireless_security_get_leap_password_flags ()">nm_setting_wireless_security_get_leap_password_flags</a>, function in <a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity">NMSettingWirelessSecurity</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-leap-username" title="nm_setting_wireless_security_get_leap_username ()">nm_setting_wireless_security_get_leap_username</a>, function in <a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity">NMSettingWirelessSecurity</a>
 </dt>
 <dd></dd>
@@ -2983,6 +3111,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-psk-flags" title="nm_setting_wireless_security_get_psk_flags ()">nm_setting_wireless_security_get_psk_flags</a>, function in <a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity">NMSettingWirelessSecurity</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-type" title="nm_setting_wireless_security_get_type ()">nm_setting_wireless_security_get_type</a>, function in <a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity">NMSettingWirelessSecurity</a>
 </dt>
 <dd></dd>
@@ -2991,6 +3123,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-wep-key-flags" title="nm_setting_wireless_security_get_wep_key_flags ()">nm_setting_wireless_security_get_wep_key_flags</a>, function in <a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity">NMSettingWirelessSecurity</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-wep-key-type" title="nm_setting_wireless_security_get_wep_key_type ()">nm_setting_wireless_security_get_wep_key_type</a>, function in <a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity">NMSettingWirelessSecurity</a>
 </dt>
 <dd></dd>
@@ -3011,6 +3147,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-LEAP-PASSWORD-FLAGS:CAPS" title="NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS">NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS</a>, macro in <a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity">NMSettingWirelessSecurity</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-LEAP-USERNAME:CAPS" title="NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME">NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME</a>, macro in <a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity">NMSettingWirelessSecurity</a>
 </dt>
 <dd></dd>
@@ -3031,6 +3171,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-PSK-FLAGS:CAPS" title="NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS">NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS</a>, macro in <a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity">NMSettingWirelessSecurity</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingWirelessSecurity.html#nm-setting-wireless-security-remove-group" title="nm_setting_wireless_security_remove_group ()">nm_setting_wireless_security_remove_group</a>, function in <a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity">NMSettingWirelessSecurity</a>
 </dt>
 <dd></dd>
@@ -3067,6 +3211,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-WEP-KEY-FLAGS:CAPS" title="NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS">NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS</a>, macro in <a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity">NMSettingWirelessSecurity</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-WEP-KEY-TYPE:CAPS" title="NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE">NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE</a>, macro in <a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity">NMSettingWirelessSecurity</a>
 </dt>
 <dd></dd>
@@ -3092,7 +3240,7 @@
 <dd></dd>
 <a name="idxT"></a><h3 class="title">T</h3>
 <dt>
-<a class="link" href="NMConnection.html#NM-TYPE-CONNECTION-ERROR:CAPS" title="NM_TYPE_CONNECTION_ERROR">NM_TYPE_CONNECTION_ERROR</a>, macro in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+NM_TYPE_CONNECTION_ERROR, macro in NMConnection
 </dt>
 <dd></dd>
 <dt>
@@ -3148,6 +3296,10 @@
 </dt>
 <dd></dd>
 <dt>
+NM_TYPE_SETTING_WIMAX_ERROR, macro in NMSettingWimax
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingWired.html#NM-TYPE-SETTING-WIRED-ERROR:CAPS" title="NM_TYPE_SETTING_WIRED_ERROR">NM_TYPE_SETTING_WIRED_ERROR</a>, macro in <a class="link" href="NMSettingWired.html" title="NMSettingWired">NMSettingWired</a>
 </dt>
 <dd></dd>
@@ -3282,25 +3434,17 @@
 <dd></dd>
 <a name="idxV"></a><h3 class="title">V</h3>
 <dt>
-<a class="link" href="NMSettingVPN.html#VPNIterFunc" title="VPNIterFunc ()">VPNIterFunc</a>, user_function in <a class="link" href="NMSettingVPN.html" title="NMSettingVPN">NMSettingVPN</a>
+<a class="link" href="NMSettingVPN.html#NMVPNIterFunc" title="NMVPNIterFunc ()">NMVPNIterFunc</a>, user_function in <a class="link" href="NMSettingVPN.html" title="NMSettingVPN">NMSettingVPN</a>
 </dt>
 <dd></dd>
 <a name="idxW"></a><h3 class="title">W</h3>
 <dt>
-<a class="link" href="libnm-util-nm-utils.html#nm-warning" title="nm_warning()">nm_warning</a>, macro in <a class="link" href="libnm-util-nm-utils.html" title="nm-utils">nm-utils</a>
-</dt>
-<dd></dd>
-<dt>
-<a class="link" href="libnm-util-nm-utils.html#nm-warning-str" title="nm_warning_str()">nm_warning_str</a>, macro in <a class="link" href="libnm-util-nm-utils.html" title="nm-utils">nm-utils</a>
-</dt>
-<dd></dd>
-<dt>
 <a class="link" href="NMSettingWirelessSecurity.html#NMWepKeyType" title="enum NMWepKeyType">NMWepKeyType</a>, enum in <a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity">NMSettingWirelessSecurity</a>
 </dt>
 <dd></dd>
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.15</div>
+          Generated by GTK-Doc V1.17</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/ch01.html b/docs/libnm-util/html/ch01.html
index 7159dcc51..04e80a11f 100644
--- a/docs/libnm-util/html/ch01.html
+++ b/docs/libnm-util/html/ch01.html
@@ -3,12 +3,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>libnm-util API Reference</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="libnm-util Reference Manual">
 <link rel="up" href="index.html" title="libnm-util Reference Manual">
 <link rel="prev" href="index.html" title="libnm-util Reference Manual">
-<link rel="next" href="NMConnection.html" title="NMConnection">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
+<link rel="next" href="NMSetting.html" title="NMSetting">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -17,16 +17,13 @@
 <td> </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
 <th width="100%" align="center">libnm-util Reference Manual</th>
-<td><a accesskey="n" href="NMConnection.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+<td><a accesskey="n" href="NMSetting.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
 </tr></table>
-<div class="chapter" title="libnm-util API Reference">
+<div class="chapter">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="id2992775"></a>libnm-util API Reference</h2></div></div></div>
+<a name="id460025"></a>libnm-util API Reference</h2></div></div></div>
 <div class="toc"><dl>
 <dt>
-<span class="refentrytitle"><a href="NMConnection.html">NMConnection</a></span><span class="refpurpose"> — Describes a connection to specific network or provider</span>
-</dt>
-<dt>
 <span class="refentrytitle"><a href="NMSetting.html">NMSetting</a></span><span class="refpurpose"> — Describes related configuration information</span>
 </dt>
 <dt>
@@ -78,9 +75,10 @@
 <span class="refentrytitle"><a href="libnm-util-nm-utils.html">nm-utils</a></span><span class="refpurpose"> — Utility functions</span>
 </dt>
 </dl></div>
+<span style="color: red">&lt;xi:include&gt;&lt;/xi:include&gt;</span>
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.15</div>
+          Generated by GTK-Doc V1.17</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/index.html b/docs/libnm-util/html/index.html
index 88c9e9946..90ada1bff 100644
--- a/docs/libnm-util/html/index.html
+++ b/docs/libnm-util/html/index.html
@@ -3,21 +3,21 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>libnm-util Reference Manual</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="libnm-util Reference Manual">
 <link rel="next" href="ch01.html" title="libnm-util API Reference">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<div class="book" title="libnm-util Reference Manual">
+<div class="book">
 <div class="titlepage">
 <div>
 <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">libnm-util Reference Manual</p></th></tr></table></div>
 <div><p class="releaseinfo">
-      for libnm-util 0.8
+      for libnm-util 0.9
       The latest version of this documentation can be found on-line at
-      <a class="ulink" href="http://projects.gnome.org/NetworkManager/developers/libnm-util/08/" target="_top">http://projects.gnome.org/NetworkManager/developers/libnm-util/08/</a>.
+      <a class="ulink" href="http://projects.gnome.org/NetworkManager/developers/libnm-util/09/" target="_top">http://projects.gnome.org/NetworkManager/developers/libnm-util/09/</a>.
     </p></div>
 </div>
 <hr>
@@ -26,9 +26,6 @@
 <dt><span class="chapter"><a href="ch01.html">libnm-util API Reference</a></span></dt>
 <dd><dl>
 <dt>
-<span class="refentrytitle"><a href="NMConnection.html">NMConnection</a></span><span class="refpurpose"> — Describes a connection to specific network or provider</span>
-</dt>
-<dt>
 <span class="refentrytitle"><a href="NMSetting.html">NMSetting</a></span><span class="refpurpose"> — Describes related configuration information</span>
 </dt>
 <dt>
@@ -87,6 +84,6 @@
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.15</div>
+          Generated by GTK-Doc V1.17</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/index.sgml b/docs/libnm-util/html/index.sgml
index ee50d977d..d9981473f 100644
--- a/docs/libnm-util/html/index.sgml
+++ b/docs/libnm-util/html/index.sgml
@@ -1,57 +1,7 @@
-<ONLINE href="http://projects.gnome.org/NetworkManager/developers/libnm-util/08/">
-<ANCHOR id="NMConnection" href="libnm-util/NMConnection.html">
-<ANCHOR id="NMConnection.synopsis" href="libnm-util/NMConnection.html#NMConnection.synopsis">
-<ANCHOR id="NMConnection.object-hierarchy" href="libnm-util/NMConnection.html#NMConnection.object-hierarchy">
-<ANCHOR id="NMConnection.properties" href="libnm-util/NMConnection.html#NMConnection.properties">
-<ANCHOR id="NMConnection.signals" href="libnm-util/NMConnection.html#NMConnection.signals">
-<ANCHOR id="NMConnection.description" href="libnm-util/NMConnection.html#NMConnection.description">
-<ANCHOR id="NMConnection.details" href="libnm-util/NMConnection.html#NMConnection.details">
-<ANCHOR id="NMConnectionScope" href="libnm-util/NMConnection.html#NMConnectionScope">
-<ANCHOR id="NM-CONNECTION-SCOPE-UNKNOWN:CAPS" href="libnm-util/NMConnection.html#NM-CONNECTION-SCOPE-UNKNOWN:CAPS">
-<ANCHOR id="NM-CONNECTION-SCOPE-SYSTEM:CAPS" href="libnm-util/NMConnection.html#NM-CONNECTION-SCOPE-SYSTEM:CAPS">
-<ANCHOR id="NM-CONNECTION-SCOPE-USER:CAPS" href="libnm-util/NMConnection.html#NM-CONNECTION-SCOPE-USER:CAPS">
-<ANCHOR id="NMConnectionError" href="libnm-util/NMConnection.html#NMConnectionError">
-<ANCHOR id="NM-CONNECTION-ERROR-UNKNOWN:CAPS" href="libnm-util/NMConnection.html#NM-CONNECTION-ERROR-UNKNOWN:CAPS">
-<ANCHOR id="NM-CONNECTION-ERROR-CONNECTION-SETTING-NOT-FOUND:CAPS" href="libnm-util/NMConnection.html#NM-CONNECTION-ERROR-CONNECTION-SETTING-NOT-FOUND:CAPS">
-<ANCHOR id="NM-TYPE-CONNECTION-ERROR:CAPS" href="libnm-util/NMConnection.html#NM-TYPE-CONNECTION-ERROR:CAPS">
-<ANCHOR id="NM-CONNECTION-ERROR:CAPS" href="libnm-util/NMConnection.html#NM-CONNECTION-ERROR:CAPS">
-<ANCHOR id="nm-connection-error-quark" href="libnm-util/NMConnection.html#nm-connection-error-quark">
-<ANCHOR id="NM-CONNECTION-SCOPE:CAPS" href="libnm-util/NMConnection.html#NM-CONNECTION-SCOPE:CAPS">
-<ANCHOR id="NM-CONNECTION-PATH:CAPS" href="libnm-util/NMConnection.html#NM-CONNECTION-PATH:CAPS">
-<ANCHOR id="NMConnection-struct" href="libnm-util/NMConnection.html#NMConnection-struct">
-<ANCHOR id="NMConnectionClass" href="libnm-util/NMConnection.html#NMConnectionClass">
-<ANCHOR id="nm-connection-get-type" href="libnm-util/NMConnection.html#nm-connection-get-type">
-<ANCHOR id="nm-connection-new" href="libnm-util/NMConnection.html#nm-connection-new">
-<ANCHOR id="nm-connection-new-from-hash" href="libnm-util/NMConnection.html#nm-connection-new-from-hash">
-<ANCHOR id="nm-connection-duplicate" href="libnm-util/NMConnection.html#nm-connection-duplicate">
-<ANCHOR id="nm-connection-add-setting" href="libnm-util/NMConnection.html#nm-connection-add-setting">
-<ANCHOR id="nm-connection-remove-setting" href="libnm-util/NMConnection.html#nm-connection-remove-setting">
-<ANCHOR id="nm-connection-get-setting" href="libnm-util/NMConnection.html#nm-connection-get-setting">
-<ANCHOR id="nm-connection-get-setting-by-name" href="libnm-util/NMConnection.html#nm-connection-get-setting-by-name">
-<ANCHOR id="nm-connection-replace-settings" href="libnm-util/NMConnection.html#nm-connection-replace-settings">
-<ANCHOR id="nm-connection-compare" href="libnm-util/NMConnection.html#nm-connection-compare">
-<ANCHOR id="nm-connection-diff" href="libnm-util/NMConnection.html#nm-connection-diff">
-<ANCHOR id="nm-connection-verify" href="libnm-util/NMConnection.html#nm-connection-verify">
-<ANCHOR id="nm-connection-need-secrets" href="libnm-util/NMConnection.html#nm-connection-need-secrets">
-<ANCHOR id="nm-connection-clear-secrets" href="libnm-util/NMConnection.html#nm-connection-clear-secrets">
-<ANCHOR id="nm-connection-update-secrets" href="libnm-util/NMConnection.html#nm-connection-update-secrets">
-<ANCHOR id="nm-connection-set-scope" href="libnm-util/NMConnection.html#nm-connection-set-scope">
-<ANCHOR id="nm-connection-get-scope" href="libnm-util/NMConnection.html#nm-connection-get-scope">
-<ANCHOR id="nm-connection-set-path" href="libnm-util/NMConnection.html#nm-connection-set-path">
-<ANCHOR id="nm-connection-get-path" href="libnm-util/NMConnection.html#nm-connection-get-path">
-<ANCHOR id="nm-connection-for-each-setting-value" href="libnm-util/NMConnection.html#nm-connection-for-each-setting-value">
-<ANCHOR id="nm-connection-to-hash" href="libnm-util/NMConnection.html#nm-connection-to-hash">
-<ANCHOR id="nm-connection-dump" href="libnm-util/NMConnection.html#nm-connection-dump">
-<ANCHOR id="nm-connection-create-setting" href="libnm-util/NMConnection.html#nm-connection-create-setting">
-<ANCHOR id="nm-connection-lookup-setting-type" href="libnm-util/NMConnection.html#nm-connection-lookup-setting-type">
-<ANCHOR id="nm-connection-lookup-setting-type-by-quark" href="libnm-util/NMConnection.html#nm-connection-lookup-setting-type-by-quark">
-<ANCHOR id="NMConnection.property-details" href="libnm-util/NMConnection.html#NMConnection.property-details">
-<ANCHOR id="NMConnection--path" href="libnm-util/NMConnection.html#NMConnection--path">
-<ANCHOR id="NMConnection--scope" href="libnm-util/NMConnection.html#NMConnection--scope">
-<ANCHOR id="NMConnection.signal-details" href="libnm-util/NMConnection.html#NMConnection.signal-details">
-<ANCHOR id="NMConnection-secrets-updated" href="libnm-util/NMConnection.html#NMConnection-secrets-updated">
+<ONLINE href="http://projects.gnome.org/NetworkManager/developers/libnm-util/09/">
 <ANCHOR id="NMSetting" href="libnm-util/NMSetting.html">
 <ANCHOR id="NMSetting.synopsis" href="libnm-util/NMSetting.html#NMSetting.synopsis">
+<ANCHOR id="NMSettingError" href="libnm-util/NMSetting.html#NMSettingError">
 <ANCHOR id="NMSetting.object-hierarchy" href="libnm-util/NMSetting.html#NMSetting.object-hierarchy">
 <ANCHOR id="NMSetting.properties" href="libnm-util/NMSetting.html#NMSetting.properties">
 <ANCHOR id="NMSetting.description" href="libnm-util/NMSetting.html#NMSetting.description">
@@ -69,10 +19,19 @@
 <ANCHOR id="NM-SETTING-PARAM-SECRET:CAPS" href="libnm-util/NMSetting.html#NM-SETTING-PARAM-SECRET:CAPS">
 <ANCHOR id="NM-SETTING-PARAM-FUZZY-IGNORE:CAPS" href="libnm-util/NMSetting.html#NM-SETTING-PARAM-FUZZY-IGNORE:CAPS">
 <ANCHOR id="NM-SETTING-NAME:CAPS" href="libnm-util/NMSetting.html#NM-SETTING-NAME:CAPS">
+<ANCHOR id="NMSettingSecretFlags" href="libnm-util/NMSetting.html#NMSettingSecretFlags">
+<ANCHOR id="NM-SETTING-SECRET-FLAG-NONE:CAPS" href="libnm-util/NMSetting.html#NM-SETTING-SECRET-FLAG-NONE:CAPS">
+<ANCHOR id="NM-SETTING-SECRET-FLAG-AGENT-OWNED:CAPS" href="libnm-util/NMSetting.html#NM-SETTING-SECRET-FLAG-AGENT-OWNED:CAPS">
+<ANCHOR id="NM-SETTING-SECRET-FLAG-NOT-SAVED:CAPS" href="libnm-util/NMSetting.html#NM-SETTING-SECRET-FLAG-NOT-SAVED:CAPS">
+<ANCHOR id="NM-SETTING-SECRET-FLAG-NOT-REQUIRED:CAPS" href="libnm-util/NMSetting.html#NM-SETTING-SECRET-FLAG-NOT-REQUIRED:CAPS">
 <ANCHOR id="NMSetting-struct" href="libnm-util/NMSetting.html#NMSetting-struct">
 <ANCHOR id="NMSettingClass" href="libnm-util/NMSetting.html#NMSettingClass">
 <ANCHOR id="NMSettingValueIterFn" href="libnm-util/NMSetting.html#NMSettingValueIterFn">
 <ANCHOR id="nm-setting-get-type" href="libnm-util/NMSetting.html#nm-setting-get-type">
+<ANCHOR id="NMSettingHashFlags" href="libnm-util/NMSetting.html#NMSettingHashFlags">
+<ANCHOR id="NM-SETTING-HASH-FLAG-ALL:CAPS" href="libnm-util/NMSetting.html#NM-SETTING-HASH-FLAG-ALL:CAPS">
+<ANCHOR id="NM-SETTING-HASH-FLAG-NO-SECRETS:CAPS" href="libnm-util/NMSetting.html#NM-SETTING-HASH-FLAG-NO-SECRETS:CAPS">
+<ANCHOR id="NM-SETTING-HASH-FLAG-ONLY-SECRETS:CAPS" href="libnm-util/NMSetting.html#NM-SETTING-HASH-FLAG-ONLY-SECRETS:CAPS">
 <ANCHOR id="nm-setting-to-hash" href="libnm-util/NMSetting.html#nm-setting-to-hash">
 <ANCHOR id="nm-setting-new-from-hash" href="libnm-util/NMSetting.html#nm-setting-new-from-hash">
 <ANCHOR id="nm-setting-duplicate" href="libnm-util/NMSetting.html#nm-setting-duplicate">
@@ -94,10 +53,13 @@
 <ANCHOR id="nm-setting-clear-secrets" href="libnm-util/NMSetting.html#nm-setting-clear-secrets">
 <ANCHOR id="nm-setting-need-secrets" href="libnm-util/NMSetting.html#nm-setting-need-secrets">
 <ANCHOR id="nm-setting-update-secrets" href="libnm-util/NMSetting.html#nm-setting-update-secrets">
+<ANCHOR id="nm-setting-get-secret-flags" href="libnm-util/NMSetting.html#nm-setting-get-secret-flags">
+<ANCHOR id="nm-setting-set-secret-flags" href="libnm-util/NMSetting.html#nm-setting-set-secret-flags">
 <ANCHOR id="NMSetting.property-details" href="libnm-util/NMSetting.html#NMSetting.property-details">
 <ANCHOR id="NMSetting--name" href="libnm-util/NMSetting.html#NMSetting--name">
 <ANCHOR id="NMSettingConnection" href="libnm-util/NMSettingConnection.html">
 <ANCHOR id="NMSettingConnection.synopsis" href="libnm-util/NMSettingConnection.html#NMSettingConnection.synopsis">
+<ANCHOR id="NMSettingConnectionError" href="libnm-util/NMSettingConnection.html#NMSettingConnectionError">
 <ANCHOR id="NMSettingConnection.object-hierarchy" href="libnm-util/NMSettingConnection.html#NMSettingConnection.object-hierarchy">
 <ANCHOR id="NMSettingConnection.properties" href="libnm-util/NMSettingConnection.html#NMSettingConnection.properties">
 <ANCHOR id="NMSettingConnection.description" href="libnm-util/NMSettingConnection.html#NMSettingConnection.description">
@@ -117,6 +79,7 @@
 <ANCHOR id="NM-SETTING-CONNECTION-AUTOCONNECT:CAPS" href="libnm-util/NMSettingConnection.html#NM-SETTING-CONNECTION-AUTOCONNECT:CAPS">
 <ANCHOR id="NM-SETTING-CONNECTION-TIMESTAMP:CAPS" href="libnm-util/NMSettingConnection.html#NM-SETTING-CONNECTION-TIMESTAMP:CAPS">
 <ANCHOR id="NM-SETTING-CONNECTION-READ-ONLY:CAPS" href="libnm-util/NMSettingConnection.html#NM-SETTING-CONNECTION-READ-ONLY:CAPS">
+<ANCHOR id="NM-SETTING-CONNECTION-PERMISSIONS:CAPS" href="libnm-util/NMSettingConnection.html#NM-SETTING-CONNECTION-PERMISSIONS:CAPS">
 <ANCHOR id="NMSettingConnection-struct" href="libnm-util/NMSettingConnection.html#NMSettingConnection-struct">
 <ANCHOR id="NMSettingConnectionClass" href="libnm-util/NMSettingConnection.html#NMSettingConnectionClass">
 <ANCHOR id="nm-setting-connection-get-type" href="libnm-util/NMSettingConnection.html#nm-setting-connection-get-type">
@@ -127,15 +90,22 @@
 <ANCHOR id="nm-setting-connection-get-autoconnect" href="libnm-util/NMSettingConnection.html#nm-setting-connection-get-autoconnect">
 <ANCHOR id="nm-setting-connection-get-timestamp" href="libnm-util/NMSettingConnection.html#nm-setting-connection-get-timestamp">
 <ANCHOR id="nm-setting-connection-get-read-only" href="libnm-util/NMSettingConnection.html#nm-setting-connection-get-read-only">
+<ANCHOR id="nm-setting-connection-get-num-permissions" href="libnm-util/NMSettingConnection.html#nm-setting-connection-get-num-permissions">
+<ANCHOR id="nm-setting-connection-get-permission" href="libnm-util/NMSettingConnection.html#nm-setting-connection-get-permission">
+<ANCHOR id="nm-setting-connection-permissions-user-allowed" href="libnm-util/NMSettingConnection.html#nm-setting-connection-permissions-user-allowed">
+<ANCHOR id="nm-setting-connection-add-permission" href="libnm-util/NMSettingConnection.html#nm-setting-connection-add-permission">
+<ANCHOR id="nm-setting-connection-remove-permission" href="libnm-util/NMSettingConnection.html#nm-setting-connection-remove-permission">
 <ANCHOR id="NMSettingConnection.property-details" href="libnm-util/NMSettingConnection.html#NMSettingConnection.property-details">
 <ANCHOR id="NMSettingConnection--autoconnect" href="libnm-util/NMSettingConnection.html#NMSettingConnection--autoconnect">
 <ANCHOR id="NMSettingConnection--id" href="libnm-util/NMSettingConnection.html#NMSettingConnection--id">
+<ANCHOR id="NMSettingConnection--permissions" href="libnm-util/NMSettingConnection.html#NMSettingConnection--permissions">
 <ANCHOR id="NMSettingConnection--read-only" href="libnm-util/NMSettingConnection.html#NMSettingConnection--read-only">
 <ANCHOR id="NMSettingConnection--timestamp" href="libnm-util/NMSettingConnection.html#NMSettingConnection--timestamp">
 <ANCHOR id="NMSettingConnection--type" href="libnm-util/NMSettingConnection.html#NMSettingConnection--type">
 <ANCHOR id="NMSettingConnection--uuid" href="libnm-util/NMSettingConnection.html#NMSettingConnection--uuid">
 <ANCHOR id="NMSettingWired" href="libnm-util/NMSettingWired.html">
 <ANCHOR id="NMSettingWired.synopsis" href="libnm-util/NMSettingWired.html#NMSettingWired.synopsis">
+<ANCHOR id="NMSettingWiredError" href="libnm-util/NMSettingWired.html#NMSettingWiredError">
 <ANCHOR id="NMSettingWired.object-hierarchy" href="libnm-util/NMSettingWired.html#NMSettingWired.object-hierarchy">
 <ANCHOR id="NMSettingWired.properties" href="libnm-util/NMSettingWired.html#NMSettingWired.properties">
 <ANCHOR id="NMSettingWired.description" href="libnm-util/NMSettingWired.html#NMSettingWired.description">
@@ -186,6 +156,7 @@
 <ANCHOR id="NMSettingWired--speed" href="libnm-util/NMSettingWired.html#NMSettingWired--speed">
 <ANCHOR id="NMSettingWireless" href="libnm-util/NMSettingWireless.html">
 <ANCHOR id="NMSettingWireless.synopsis" href="libnm-util/NMSettingWireless.html#NMSettingWireless.synopsis">
+<ANCHOR id="NMSettingWirelessError" href="libnm-util/NMSettingWireless.html#NMSettingWirelessError">
 <ANCHOR id="NMSettingWireless.object-hierarchy" href="libnm-util/NMSettingWireless.html#NMSettingWireless.object-hierarchy">
 <ANCHOR id="NMSettingWireless.properties" href="libnm-util/NMSettingWireless.html#NMSettingWireless.properties">
 <ANCHOR id="NMSettingWireless.description" href="libnm-util/NMSettingWireless.html#NMSettingWireless.description">
@@ -207,6 +178,8 @@
 <ANCHOR id="NM-SETTING-WIRELESS-MTU:CAPS" href="libnm-util/NMSettingWireless.html#NM-SETTING-WIRELESS-MTU:CAPS">
 <ANCHOR id="NM-SETTING-WIRELESS-SEEN-BSSIDS:CAPS" href="libnm-util/NMSettingWireless.html#NM-SETTING-WIRELESS-SEEN-BSSIDS:CAPS">
 <ANCHOR id="NM-SETTING-WIRELESS-SEC:CAPS" href="libnm-util/NMSettingWireless.html#NM-SETTING-WIRELESS-SEC:CAPS">
+<ANCHOR id="NM-SETTING-WIRELESS-MODE-ADHOC:CAPS" href="libnm-util/NMSettingWireless.html#NM-SETTING-WIRELESS-MODE-ADHOC:CAPS">
+<ANCHOR id="NM-SETTING-WIRELESS-MODE-INFRA:CAPS" href="libnm-util/NMSettingWireless.html#NM-SETTING-WIRELESS-MODE-INFRA:CAPS">
 <ANCHOR id="NMSettingWireless-struct" href="libnm-util/NMSettingWireless.html#NMSettingWireless-struct">
 <ANCHOR id="NMSettingWirelessClass" href="libnm-util/NMSettingWireless.html#NMSettingWirelessClass">
 <ANCHOR id="nm-setting-wireless-get-type" href="libnm-util/NMSettingWireless.html#nm-setting-wireless-get-type">
@@ -241,6 +214,7 @@
 <ANCHOR id="NMSettingWireless--tx-power" href="libnm-util/NMSettingWireless.html#NMSettingWireless--tx-power">
 <ANCHOR id="NMSettingWirelessSecurity" href="libnm-util/NMSettingWirelessSecurity.html">
 <ANCHOR id="NMSettingWirelessSecurity.synopsis" href="libnm-util/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity.synopsis">
+<ANCHOR id="NMSettingWirelessSecurityError" href="libnm-util/NMSettingWirelessSecurity.html#NMSettingWirelessSecurityError">
 <ANCHOR id="NMSettingWirelessSecurity.object-hierarchy" href="libnm-util/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity.object-hierarchy">
 <ANCHOR id="NMSettingWirelessSecurity.properties" href="libnm-util/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity.properties">
 <ANCHOR id="NMSettingWirelessSecurity.description" href="libnm-util/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity.description">
@@ -262,9 +236,12 @@
 <ANCHOR id="NM-SETTING-WIRELESS-SECURITY-WEP-KEY1:CAPS" href="libnm-util/NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-WEP-KEY1:CAPS">
 <ANCHOR id="NM-SETTING-WIRELESS-SECURITY-WEP-KEY2:CAPS" href="libnm-util/NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-WEP-KEY2:CAPS">
 <ANCHOR id="NM-SETTING-WIRELESS-SECURITY-WEP-KEY3:CAPS" href="libnm-util/NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-WEP-KEY3:CAPS">
+<ANCHOR id="NM-SETTING-WIRELESS-SECURITY-WEP-KEY-FLAGS:CAPS" href="libnm-util/NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-WEP-KEY-FLAGS:CAPS">
+<ANCHOR id="NM-SETTING-WIRELESS-SECURITY-WEP-KEY-TYPE:CAPS" href="libnm-util/NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-WEP-KEY-TYPE:CAPS">
 <ANCHOR id="NM-SETTING-WIRELESS-SECURITY-PSK:CAPS" href="libnm-util/NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-PSK:CAPS">
+<ANCHOR id="NM-SETTING-WIRELESS-SECURITY-PSK-FLAGS:CAPS" href="libnm-util/NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-PSK-FLAGS:CAPS">
 <ANCHOR id="NM-SETTING-WIRELESS-SECURITY-LEAP-PASSWORD:CAPS" href="libnm-util/NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-LEAP-PASSWORD:CAPS">
-<ANCHOR id="NM-SETTING-WIRELESS-SECURITY-WEP-KEY-TYPE:CAPS" href="libnm-util/NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-WEP-KEY-TYPE:CAPS">
+<ANCHOR id="NM-SETTING-WIRELESS-SECURITY-LEAP-PASSWORD-FLAGS:CAPS" href="libnm-util/NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-LEAP-PASSWORD-FLAGS:CAPS">
 <ANCHOR id="NMSettingWirelessSecurity-struct" href="libnm-util/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity-struct">
 <ANCHOR id="NMSettingWirelessSecurityClass" href="libnm-util/NMSettingWirelessSecurity.html#NMSettingWirelessSecurityClass">
 <ANCHOR id="nm-setting-wireless-security-get-type" href="libnm-util/NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-type">
@@ -286,22 +263,28 @@
 <ANCHOR id="nm-setting-wireless-security-remove-group" href="libnm-util/NMSettingWirelessSecurity.html#nm-setting-wireless-security-remove-group">
 <ANCHOR id="nm-setting-wireless-security-clear-groups" href="libnm-util/NMSettingWirelessSecurity.html#nm-setting-wireless-security-clear-groups">
 <ANCHOR id="nm-setting-wireless-security-get-psk" href="libnm-util/NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-psk">
+<ANCHOR id="nm-setting-wireless-security-get-psk-flags" href="libnm-util/NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-psk-flags">
 <ANCHOR id="nm-setting-wireless-security-get-leap-username" href="libnm-util/NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-leap-username">
 <ANCHOR id="nm-setting-wireless-security-get-leap-password" href="libnm-util/NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-leap-password">
+<ANCHOR id="nm-setting-wireless-security-get-leap-password-flags" href="libnm-util/NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-leap-password-flags">
 <ANCHOR id="nm-setting-wireless-security-get-wep-key" href="libnm-util/NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-wep-key">
 <ANCHOR id="nm-setting-wireless-security-set-wep-key" href="libnm-util/NMSettingWirelessSecurity.html#nm-setting-wireless-security-set-wep-key">
 <ANCHOR id="nm-setting-wireless-security-get-wep-tx-keyidx" href="libnm-util/NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-wep-tx-keyidx">
 <ANCHOR id="nm-setting-wireless-security-get-auth-alg" href="libnm-util/NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-auth-alg">
+<ANCHOR id="nm-setting-wireless-security-get-wep-key-flags" href="libnm-util/NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-wep-key-flags">
 <ANCHOR id="nm-setting-wireless-security-get-wep-key-type" href="libnm-util/NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-wep-key-type">
 <ANCHOR id="NMSettingWirelessSecurity.property-details" href="libnm-util/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity.property-details">
 <ANCHOR id="NMSettingWirelessSecurity--auth-alg" href="libnm-util/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--auth-alg">
 <ANCHOR id="NMSettingWirelessSecurity--group" href="libnm-util/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--group">
 <ANCHOR id="NMSettingWirelessSecurity--key-mgmt" href="libnm-util/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--key-mgmt">
 <ANCHOR id="NMSettingWirelessSecurity--leap-password" href="libnm-util/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--leap-password">
+<ANCHOR id="NMSettingWirelessSecurity--leap-password-flags" href="libnm-util/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--leap-password-flags">
 <ANCHOR id="NMSettingWirelessSecurity--leap-username" href="libnm-util/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--leap-username">
 <ANCHOR id="NMSettingWirelessSecurity--pairwise" href="libnm-util/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--pairwise">
 <ANCHOR id="NMSettingWirelessSecurity--proto" href="libnm-util/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--proto">
 <ANCHOR id="NMSettingWirelessSecurity--psk" href="libnm-util/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--psk">
+<ANCHOR id="NMSettingWirelessSecurity--psk-flags" href="libnm-util/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--psk-flags">
+<ANCHOR id="NMSettingWirelessSecurity--wep-key-flags" href="libnm-util/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--wep-key-flags">
 <ANCHOR id="NMSettingWirelessSecurity--wep-key-type" href="libnm-util/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--wep-key-type">
 <ANCHOR id="NMSettingWirelessSecurity--wep-key0" href="libnm-util/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--wep-key0">
 <ANCHOR id="NMSettingWirelessSecurity--wep-key1" href="libnm-util/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--wep-key1">
@@ -310,6 +293,7 @@
 <ANCHOR id="NMSettingWirelessSecurity--wep-tx-keyidx" href="libnm-util/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--wep-tx-keyidx">
 <ANCHOR id="NMSettingBluetooth" href="libnm-util/NMSettingBluetooth.html">
 <ANCHOR id="NMSettingBluetooth.synopsis" href="libnm-util/NMSettingBluetooth.html#NMSettingBluetooth.synopsis">
+<ANCHOR id="NMSettingBluetoothError" href="libnm-util/NMSettingBluetooth.html#NMSettingBluetoothError">
 <ANCHOR id="NMSettingBluetooth.object-hierarchy" href="libnm-util/NMSettingBluetooth.html#NMSettingBluetooth.object-hierarchy">
 <ANCHOR id="NMSettingBluetooth.properties" href="libnm-util/NMSettingBluetooth.html#NMSettingBluetooth.properties">
 <ANCHOR id="NMSettingBluetooth.description" href="libnm-util/NMSettingBluetooth.html#NMSettingBluetooth.description">
@@ -334,6 +318,7 @@
 <ANCHOR id="NMSettingBluetooth--type" href="libnm-util/NMSettingBluetooth.html#NMSettingBluetooth--type">
 <ANCHOR id="NMSettingSerial" href="libnm-util/NMSettingSerial.html">
 <ANCHOR id="NMSettingSerial.synopsis" href="libnm-util/NMSettingSerial.html#NMSettingSerial.synopsis">
+<ANCHOR id="NMSettingSerialError" href="libnm-util/NMSettingSerial.html#NMSettingSerialError">
 <ANCHOR id="NMSettingSerial.object-hierarchy" href="libnm-util/NMSettingSerial.html#NMSettingSerial.object-hierarchy">
 <ANCHOR id="NMSettingSerial.properties" href="libnm-util/NMSettingSerial.html#NMSettingSerial.properties">
 <ANCHOR id="NMSettingSerial.description" href="libnm-util/NMSettingSerial.html#NMSettingSerial.description">
@@ -365,6 +350,7 @@
 <ANCHOR id="NMSettingSerial--stopbits" href="libnm-util/NMSettingSerial.html#NMSettingSerial--stopbits">
 <ANCHOR id="NMSettingCdma" href="libnm-util/NMSettingCdma.html">
 <ANCHOR id="NMSettingCdma.synopsis" href="libnm-util/NMSettingCdma.html#NMSettingCdma.synopsis">
+<ANCHOR id="NMSettingCdmaError" href="libnm-util/NMSettingCdma.html#NMSettingCdmaError">
 <ANCHOR id="NMSettingCdma.object-hierarchy" href="libnm-util/NMSettingCdma.html#NMSettingCdma.object-hierarchy">
 <ANCHOR id="NMSettingCdma.properties" href="libnm-util/NMSettingCdma.html#NMSettingCdma.properties">
 <ANCHOR id="NMSettingCdma.description" href="libnm-util/NMSettingCdma.html#NMSettingCdma.description">
@@ -377,6 +363,7 @@
 <ANCHOR id="NM-SETTING-CDMA-NUMBER:CAPS" href="libnm-util/NMSettingCdma.html#NM-SETTING-CDMA-NUMBER:CAPS">
 <ANCHOR id="NM-SETTING-CDMA-USERNAME:CAPS" href="libnm-util/NMSettingCdma.html#NM-SETTING-CDMA-USERNAME:CAPS">
 <ANCHOR id="NM-SETTING-CDMA-PASSWORD:CAPS" href="libnm-util/NMSettingCdma.html#NM-SETTING-CDMA-PASSWORD:CAPS">
+<ANCHOR id="NM-SETTING-CDMA-PASSWORD-FLAGS:CAPS" href="libnm-util/NMSettingCdma.html#NM-SETTING-CDMA-PASSWORD-FLAGS:CAPS">
 <ANCHOR id="NMSettingCdma-struct" href="libnm-util/NMSettingCdma.html#NMSettingCdma-struct">
 <ANCHOR id="NMSettingCdmaClass" href="libnm-util/NMSettingCdma.html#NMSettingCdmaClass">
 <ANCHOR id="nm-setting-cdma-get-type" href="libnm-util/NMSettingCdma.html#nm-setting-cdma-get-type">
@@ -384,12 +371,15 @@
 <ANCHOR id="nm-setting-cdma-get-number" href="libnm-util/NMSettingCdma.html#nm-setting-cdma-get-number">
 <ANCHOR id="nm-setting-cdma-get-username" href="libnm-util/NMSettingCdma.html#nm-setting-cdma-get-username">
 <ANCHOR id="nm-setting-cdma-get-password" href="libnm-util/NMSettingCdma.html#nm-setting-cdma-get-password">
+<ANCHOR id="nm-setting-cdma-get-password-flags" href="libnm-util/NMSettingCdma.html#nm-setting-cdma-get-password-flags">
 <ANCHOR id="NMSettingCdma.property-details" href="libnm-util/NMSettingCdma.html#NMSettingCdma.property-details">
 <ANCHOR id="NMSettingCdma--number" href="libnm-util/NMSettingCdma.html#NMSettingCdma--number">
 <ANCHOR id="NMSettingCdma--password" href="libnm-util/NMSettingCdma.html#NMSettingCdma--password">
+<ANCHOR id="NMSettingCdma--password-flags" href="libnm-util/NMSettingCdma.html#NMSettingCdma--password-flags">
 <ANCHOR id="NMSettingCdma--username" href="libnm-util/NMSettingCdma.html#NMSettingCdma--username">
 <ANCHOR id="NMSettingGsm" href="libnm-util/NMSettingGsm.html">
 <ANCHOR id="NMSettingGsm.synopsis" href="libnm-util/NMSettingGsm.html#NMSettingGsm.synopsis">
+<ANCHOR id="NMSettingGsmError" href="libnm-util/NMSettingGsm.html#NMSettingGsmError">
 <ANCHOR id="NMSettingGsm.object-hierarchy" href="libnm-util/NMSettingGsm.html#NMSettingGsm.object-hierarchy">
 <ANCHOR id="NMSettingGsm.properties" href="libnm-util/NMSettingGsm.html#NMSettingGsm.properties">
 <ANCHOR id="NMSettingGsm.description" href="libnm-util/NMSettingGsm.html#NMSettingGsm.description">
@@ -402,19 +392,14 @@
 <ANCHOR id="NM-SETTING-GSM-NUMBER:CAPS" href="libnm-util/NMSettingGsm.html#NM-SETTING-GSM-NUMBER:CAPS">
 <ANCHOR id="NM-SETTING-GSM-USERNAME:CAPS" href="libnm-util/NMSettingGsm.html#NM-SETTING-GSM-USERNAME:CAPS">
 <ANCHOR id="NM-SETTING-GSM-PASSWORD:CAPS" href="libnm-util/NMSettingGsm.html#NM-SETTING-GSM-PASSWORD:CAPS">
+<ANCHOR id="NM-SETTING-GSM-PASSWORD-FLAGS:CAPS" href="libnm-util/NMSettingGsm.html#NM-SETTING-GSM-PASSWORD-FLAGS:CAPS">
 <ANCHOR id="NM-SETTING-GSM-APN:CAPS" href="libnm-util/NMSettingGsm.html#NM-SETTING-GSM-APN:CAPS">
 <ANCHOR id="NM-SETTING-GSM-NETWORK-ID:CAPS" href="libnm-util/NMSettingGsm.html#NM-SETTING-GSM-NETWORK-ID:CAPS">
 <ANCHOR id="NM-SETTING-GSM-NETWORK-TYPE:CAPS" href="libnm-util/NMSettingGsm.html#NM-SETTING-GSM-NETWORK-TYPE:CAPS">
 <ANCHOR id="NM-SETTING-GSM-ALLOWED-BANDS:CAPS" href="libnm-util/NMSettingGsm.html#NM-SETTING-GSM-ALLOWED-BANDS:CAPS">
 <ANCHOR id="NM-SETTING-GSM-PIN:CAPS" href="libnm-util/NMSettingGsm.html#NM-SETTING-GSM-PIN:CAPS">
+<ANCHOR id="NM-SETTING-GSM-PIN-FLAGS:CAPS" href="libnm-util/NMSettingGsm.html#NM-SETTING-GSM-PIN-FLAGS:CAPS">
 <ANCHOR id="NM-SETTING-GSM-HOME-ONLY:CAPS" href="libnm-util/NMSettingGsm.html#NM-SETTING-GSM-HOME-ONLY:CAPS">
-<ANCHOR id="NM-SETTING-GSM-PUK:CAPS" href="libnm-util/NMSettingGsm.html#NM-SETTING-GSM-PUK:CAPS">
-<ANCHOR id="NM-SETTING-GSM-BAND:CAPS" href="libnm-util/NMSettingGsm.html#NM-SETTING-GSM-BAND:CAPS">
-<ANCHOR id="NM-GSM-NETWORK-ANY:CAPS" href="libnm-util/NMSettingGsm.html#NM-GSM-NETWORK-ANY:CAPS">
-<ANCHOR id="NM-GSM-NETWORK-UMTS-HSPA:CAPS" href="libnm-util/NMSettingGsm.html#NM-GSM-NETWORK-UMTS-HSPA:CAPS">
-<ANCHOR id="NM-GSM-NETWORK-GPRS-EDGE:CAPS" href="libnm-util/NMSettingGsm.html#NM-GSM-NETWORK-GPRS-EDGE:CAPS">
-<ANCHOR id="NM-GSM-NETWORK-PREFER-UMTS-HSPA:CAPS" href="libnm-util/NMSettingGsm.html#NM-GSM-NETWORK-PREFER-UMTS-HSPA:CAPS">
-<ANCHOR id="NM-GSM-NETWORK-PREFER-GPRS-EDGE:CAPS" href="libnm-util/NMSettingGsm.html#NM-GSM-NETWORK-PREFER-GPRS-EDGE:CAPS">
 <ANCHOR id="NMSettingGsmNetworkType" href="libnm-util/NMSettingGsm.html#NMSettingGsmNetworkType">
 <ANCHOR id="NMSettingGsmNetworkBand" href="libnm-util/NMSettingGsm.html#NMSettingGsmNetworkBand">
 <ANCHOR id="NMSettingGsm-struct" href="libnm-util/NMSettingGsm.html#NMSettingGsm-struct">
@@ -430,22 +415,23 @@
 <ANCHOR id="nm-setting-gsm-get-allowed-bands" href="libnm-util/NMSettingGsm.html#nm-setting-gsm-get-allowed-bands">
 <ANCHOR id="nm-setting-gsm-get-pin" href="libnm-util/NMSettingGsm.html#nm-setting-gsm-get-pin">
 <ANCHOR id="nm-setting-gsm-get-home-only" href="libnm-util/NMSettingGsm.html#nm-setting-gsm-get-home-only">
-<ANCHOR id="nm-setting-gsm-get-puk" href="libnm-util/NMSettingGsm.html#nm-setting-gsm-get-puk">
-<ANCHOR id="nm-setting-gsm-get-band" href="libnm-util/NMSettingGsm.html#nm-setting-gsm-get-band">
+<ANCHOR id="nm-setting-gsm-get-pin-flags" href="libnm-util/NMSettingGsm.html#nm-setting-gsm-get-pin-flags">
+<ANCHOR id="nm-setting-gsm-get-password-flags" href="libnm-util/NMSettingGsm.html#nm-setting-gsm-get-password-flags">
 <ANCHOR id="NMSettingGsm.property-details" href="libnm-util/NMSettingGsm.html#NMSettingGsm.property-details">
 <ANCHOR id="NMSettingGsm--allowed-bands" href="libnm-util/NMSettingGsm.html#NMSettingGsm--allowed-bands">
 <ANCHOR id="NMSettingGsm--apn" href="libnm-util/NMSettingGsm.html#NMSettingGsm--apn">
-<ANCHOR id="NMSettingGsm--band" href="libnm-util/NMSettingGsm.html#NMSettingGsm--band">
 <ANCHOR id="NMSettingGsm--home-only" href="libnm-util/NMSettingGsm.html#NMSettingGsm--home-only">
 <ANCHOR id="NMSettingGsm--network-id" href="libnm-util/NMSettingGsm.html#NMSettingGsm--network-id">
 <ANCHOR id="NMSettingGsm--network-type" href="libnm-util/NMSettingGsm.html#NMSettingGsm--network-type">
 <ANCHOR id="NMSettingGsm--number" href="libnm-util/NMSettingGsm.html#NMSettingGsm--number">
 <ANCHOR id="NMSettingGsm--password" href="libnm-util/NMSettingGsm.html#NMSettingGsm--password">
+<ANCHOR id="NMSettingGsm--password-flags" href="libnm-util/NMSettingGsm.html#NMSettingGsm--password-flags">
 <ANCHOR id="NMSettingGsm--pin" href="libnm-util/NMSettingGsm.html#NMSettingGsm--pin">
-<ANCHOR id="NMSettingGsm--puk" href="libnm-util/NMSettingGsm.html#NMSettingGsm--puk">
+<ANCHOR id="NMSettingGsm--pin-flags" href="libnm-util/NMSettingGsm.html#NMSettingGsm--pin-flags">
 <ANCHOR id="NMSettingGsm--username" href="libnm-util/NMSettingGsm.html#NMSettingGsm--username">
 <ANCHOR id="NMSettingOlpcMesh" href="libnm-util/NMSettingOlpcMesh.html">
 <ANCHOR id="NMSettingOlpcMesh.synopsis" href="libnm-util/NMSettingOlpcMesh.html#NMSettingOlpcMesh.synopsis">
+<ANCHOR id="NMSettingOlpcMeshError" href="libnm-util/NMSettingOlpcMesh.html#NMSettingOlpcMeshError">
 <ANCHOR id="NMSettingOlpcMesh.object-hierarchy" href="libnm-util/NMSettingOlpcMesh.html#NMSettingOlpcMesh.object-hierarchy">
 <ANCHOR id="NMSettingOlpcMesh.properties" href="libnm-util/NMSettingOlpcMesh.html#NMSettingOlpcMesh.properties">
 <ANCHOR id="NMSettingOlpcMesh.description" href="libnm-util/NMSettingOlpcMesh.html#NMSettingOlpcMesh.description">
@@ -471,12 +457,20 @@
 <ANCHOR id="NMSettingOlpcMesh--ssid" href="libnm-util/NMSettingOlpcMesh.html#NMSettingOlpcMesh--ssid">
 <ANCHOR id="NMSetting8021x" href="libnm-util/NMSetting8021x.html">
 <ANCHOR id="NMSetting8021x.synopsis" href="libnm-util/NMSetting8021x.html#NMSetting8021x.synopsis">
+<ANCHOR id="NMSetting8021xError" href="libnm-util/NMSetting8021x.html#NMSetting8021xError">
 <ANCHOR id="NMSetting8021x.object-hierarchy" href="libnm-util/NMSetting8021x.html#NMSetting8021x.object-hierarchy">
 <ANCHOR id="NMSetting8021x.properties" href="libnm-util/NMSetting8021x.html#NMSetting8021x.properties">
 <ANCHOR id="NMSetting8021x.description" href="libnm-util/NMSetting8021x.html#NMSetting8021x.description">
 <ANCHOR id="NMSetting8021x.details" href="libnm-util/NMSetting8021x.html#NMSetting8021x.details">
 <ANCHOR id="NMSetting8021xCKFormat" href="libnm-util/NMSetting8021x.html#NMSetting8021xCKFormat">
+<ANCHOR id="NM-SETTING-802-1X-CK-FORMAT-UNKNOWN:CAPS" href="libnm-util/NMSetting8021x.html#NM-SETTING-802-1X-CK-FORMAT-UNKNOWN:CAPS">
+<ANCHOR id="NM-SETTING-802-1X-CK-FORMAT-X509:CAPS" href="libnm-util/NMSetting8021x.html#NM-SETTING-802-1X-CK-FORMAT-X509:CAPS">
+<ANCHOR id="NM-SETTING-802-1X-CK-FORMAT-RAW-KEY:CAPS" href="libnm-util/NMSetting8021x.html#NM-SETTING-802-1X-CK-FORMAT-RAW-KEY:CAPS">
+<ANCHOR id="NM-SETTING-802-1X-CK-FORMAT-PKCS12:CAPS" href="libnm-util/NMSetting8021x.html#NM-SETTING-802-1X-CK-FORMAT-PKCS12:CAPS">
 <ANCHOR id="NMSetting8021xCKScheme" href="libnm-util/NMSetting8021x.html#NMSetting8021xCKScheme">
+<ANCHOR id="NM-SETTING-802-1X-CK-SCHEME-UNKNOWN:CAPS" href="libnm-util/NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-UNKNOWN:CAPS">
+<ANCHOR id="NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS" href="libnm-util/NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS">
+<ANCHOR id="NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS" href="libnm-util/NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS">
 <ANCHOR id="NM-SETTING-802-1X-SETTING-NAME:CAPS" href="libnm-util/NMSetting8021x.html#NM-SETTING-802-1X-SETTING-NAME:CAPS">
 <ANCHOR id="NMSetting8021xError" href="libnm-util/NMSetting8021x.html#NMSetting8021xError">
 <ANCHOR id="NM-TYPE-SETTING-802-1X-ERROR:CAPS" href="libnm-util/NMSetting8021x.html#NM-TYPE-SETTING-802-1X-ERROR:CAPS">
@@ -497,12 +491,15 @@
 <ANCHOR id="NM-SETTING-802-1X-PHASE2-CA-PATH:CAPS" href="libnm-util/NMSetting8021x.html#NM-SETTING-802-1X-PHASE2-CA-PATH:CAPS">
 <ANCHOR id="NM-SETTING-802-1X-PHASE2-CLIENT-CERT:CAPS" href="libnm-util/NMSetting8021x.html#NM-SETTING-802-1X-PHASE2-CLIENT-CERT:CAPS">
 <ANCHOR id="NM-SETTING-802-1X-PASSWORD:CAPS" href="libnm-util/NMSetting8021x.html#NM-SETTING-802-1X-PASSWORD:CAPS">
+<ANCHOR id="NM-SETTING-802-1X-PASSWORD-FLAGS:CAPS" href="libnm-util/NMSetting8021x.html#NM-SETTING-802-1X-PASSWORD-FLAGS:CAPS">
 <ANCHOR id="NM-SETTING-802-1X-PRIVATE-KEY:CAPS" href="libnm-util/NMSetting8021x.html#NM-SETTING-802-1X-PRIVATE-KEY:CAPS">
 <ANCHOR id="NM-SETTING-802-1X-PRIVATE-KEY-PASSWORD:CAPS" href="libnm-util/NMSetting8021x.html#NM-SETTING-802-1X-PRIVATE-KEY-PASSWORD:CAPS">
+<ANCHOR id="NM-SETTING-802-1X-PRIVATE-KEY-PASSWORD-FLAGS:CAPS" href="libnm-util/NMSetting8021x.html#NM-SETTING-802-1X-PRIVATE-KEY-PASSWORD-FLAGS:CAPS">
 <ANCHOR id="NM-SETTING-802-1X-PHASE2-PRIVATE-KEY:CAPS" href="libnm-util/NMSetting8021x.html#NM-SETTING-802-1X-PHASE2-PRIVATE-KEY:CAPS">
 <ANCHOR id="NM-SETTING-802-1X-PHASE2-PRIVATE-KEY-PASSWORD:CAPS" href="libnm-util/NMSetting8021x.html#NM-SETTING-802-1X-PHASE2-PRIVATE-KEY-PASSWORD:CAPS">
+<ANCHOR id="NM-SETTING-802-1X-PHASE2-PRIVATE-KEY-PASSWORD-FLAGS:CAPS" href="libnm-util/NMSetting8021x.html#NM-SETTING-802-1X-PHASE2-PRIVATE-KEY-PASSWORD-FLAGS:CAPS">
 <ANCHOR id="NM-SETTING-802-1X-PIN:CAPS" href="libnm-util/NMSetting8021x.html#NM-SETTING-802-1X-PIN:CAPS">
-<ANCHOR id="NM-SETTING-802-1X-PSK:CAPS" href="libnm-util/NMSetting8021x.html#NM-SETTING-802-1X-PSK:CAPS">
+<ANCHOR id="NM-SETTING-802-1X-PIN-FLAGS:CAPS" href="libnm-util/NMSetting8021x.html#NM-SETTING-802-1X-PIN-FLAGS:CAPS">
 <ANCHOR id="NM-SETTING-802-1X-SYSTEM-CA-CERTS:CAPS" href="libnm-util/NMSetting8021x.html#NM-SETTING-802-1X-SYSTEM-CA-CERTS:CAPS">
 <ANCHOR id="NMSetting8021x-struct" href="libnm-util/NMSetting8021x.html#NMSetting8021x-struct">
 <ANCHOR id="NMSetting8021xClass" href="libnm-util/NMSetting8021x.html#NMSetting8021xClass">
@@ -540,35 +537,23 @@
 <ANCHOR id="nm-setting-802-1x-get-phase2-client-cert-path" href="libnm-util/NMSetting8021x.html#nm-setting-802-1x-get-phase2-client-cert-path">
 <ANCHOR id="nm-setting-802-1x-set-phase2-client-cert" href="libnm-util/NMSetting8021x.html#nm-setting-802-1x-set-phase2-client-cert">
 <ANCHOR id="nm-setting-802-1x-get-password" href="libnm-util/NMSetting8021x.html#nm-setting-802-1x-get-password">
+<ANCHOR id="nm-setting-802-1x-get-password-flags" href="libnm-util/NMSetting8021x.html#nm-setting-802-1x-get-password-flags">
 <ANCHOR id="nm-setting-802-1x-get-pin" href="libnm-util/NMSetting8021x.html#nm-setting-802-1x-get-pin">
-<ANCHOR id="nm-setting-802-1x-get-psk" href="libnm-util/NMSetting8021x.html#nm-setting-802-1x-get-psk">
+<ANCHOR id="nm-setting-802-1x-get-pin-flags" href="libnm-util/NMSetting8021x.html#nm-setting-802-1x-get-pin-flags">
 <ANCHOR id="nm-setting-802-1x-get-private-key-scheme" href="libnm-util/NMSetting8021x.html#nm-setting-802-1x-get-private-key-scheme">
 <ANCHOR id="nm-setting-802-1x-get-private-key-blob" href="libnm-util/NMSetting8021x.html#nm-setting-802-1x-get-private-key-blob">
 <ANCHOR id="nm-setting-802-1x-get-private-key-path" href="libnm-util/NMSetting8021x.html#nm-setting-802-1x-get-private-key-path">
 <ANCHOR id="nm-setting-802-1x-set-private-key" href="libnm-util/NMSetting8021x.html#nm-setting-802-1x-set-private-key">
 <ANCHOR id="nm-setting-802-1x-get-private-key-password" href="libnm-util/NMSetting8021x.html#nm-setting-802-1x-get-private-key-password">
+<ANCHOR id="nm-setting-802-1x-get-private-key-password-flags" href="libnm-util/NMSetting8021x.html#nm-setting-802-1x-get-private-key-password-flags">
 <ANCHOR id="nm-setting-802-1x-get-private-key-format" href="libnm-util/NMSetting8021x.html#nm-setting-802-1x-get-private-key-format">
 <ANCHOR id="nm-setting-802-1x-get-phase2-private-key-scheme" href="libnm-util/NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-scheme">
 <ANCHOR id="nm-setting-802-1x-get-phase2-private-key-blob" href="libnm-util/NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-blob">
 <ANCHOR id="nm-setting-802-1x-get-phase2-private-key-path" href="libnm-util/NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-path">
 <ANCHOR id="nm-setting-802-1x-set-phase2-private-key" href="libnm-util/NMSetting8021x.html#nm-setting-802-1x-set-phase2-private-key">
 <ANCHOR id="nm-setting-802-1x-get-phase2-private-key-password" href="libnm-util/NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-password">
+<ANCHOR id="nm-setting-802-1x-get-phase2-private-key-password-flags" href="libnm-util/NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-password-flags">
 <ANCHOR id="nm-setting-802-1x-get-phase2-private-key-format" href="libnm-util/NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-format">
-<ANCHOR id="NMSetting8021xCKType" href="libnm-util/NMSetting8021x.html#NMSetting8021xCKType">
-<ANCHOR id="nm-setting-802-1x-get-ca-cert" href="libnm-util/NMSetting8021x.html#nm-setting-802-1x-get-ca-cert">
-<ANCHOR id="nm-setting-802-1x-set-ca-cert-from-file" href="libnm-util/NMSetting8021x.html#nm-setting-802-1x-set-ca-cert-from-file">
-<ANCHOR id="nm-setting-802-1x-get-client-cert" href="libnm-util/NMSetting8021x.html#nm-setting-802-1x-get-client-cert">
-<ANCHOR id="nm-setting-802-1x-set-client-cert-from-file" href="libnm-util/NMSetting8021x.html#nm-setting-802-1x-set-client-cert-from-file">
-<ANCHOR id="nm-setting-802-1x-get-phase2-ca-cert" href="libnm-util/NMSetting8021x.html#nm-setting-802-1x-get-phase2-ca-cert">
-<ANCHOR id="nm-setting-802-1x-set-phase2-ca-cert-from-file" href="libnm-util/NMSetting8021x.html#nm-setting-802-1x-set-phase2-ca-cert-from-file">
-<ANCHOR id="nm-setting-802-1x-get-phase2-client-cert" href="libnm-util/NMSetting8021x.html#nm-setting-802-1x-get-phase2-client-cert">
-<ANCHOR id="nm-setting-802-1x-set-phase2-client-cert-from-file" href="libnm-util/NMSetting8021x.html#nm-setting-802-1x-set-phase2-client-cert-from-file">
-<ANCHOR id="nm-setting-802-1x-get-private-key" href="libnm-util/NMSetting8021x.html#nm-setting-802-1x-get-private-key">
-<ANCHOR id="nm-setting-802-1x-set-private-key-from-file" href="libnm-util/NMSetting8021x.html#nm-setting-802-1x-set-private-key-from-file">
-<ANCHOR id="nm-setting-802-1x-get-private-key-type" href="libnm-util/NMSetting8021x.html#nm-setting-802-1x-get-private-key-type">
-<ANCHOR id="nm-setting-802-1x-get-phase2-private-key" href="libnm-util/NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key">
-<ANCHOR id="nm-setting-802-1x-set-phase2-private-key-from-file" href="libnm-util/NMSetting8021x.html#nm-setting-802-1x-set-phase2-private-key-from-file">
-<ANCHOR id="nm-setting-802-1x-get-phase2-private-key-type" href="libnm-util/NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-type">
 <ANCHOR id="NMSetting8021x.property-details" href="libnm-util/NMSetting8021x.html#NMSetting8021x.property-details">
 <ANCHOR id="NMSetting8021x--anonymous-identity" href="libnm-util/NMSetting8021x.html#NMSetting8021x--anonymous-identity">
 <ANCHOR id="NMSetting8021x--ca-cert" href="libnm-util/NMSetting8021x.html#NMSetting8021x--ca-cert">
@@ -577,6 +562,7 @@
 <ANCHOR id="NMSetting8021x--eap" href="libnm-util/NMSetting8021x.html#NMSetting8021x--eap">
 <ANCHOR id="NMSetting8021x--identity" href="libnm-util/NMSetting8021x.html#NMSetting8021x--identity">
 <ANCHOR id="NMSetting8021x--password" href="libnm-util/NMSetting8021x.html#NMSetting8021x--password">
+<ANCHOR id="NMSetting8021x--password-flags" href="libnm-util/NMSetting8021x.html#NMSetting8021x--password-flags">
 <ANCHOR id="NMSetting8021x--phase1-fast-provisioning" href="libnm-util/NMSetting8021x.html#NMSetting8021x--phase1-fast-provisioning">
 <ANCHOR id="NMSetting8021x--phase1-peaplabel" href="libnm-util/NMSetting8021x.html#NMSetting8021x--phase1-peaplabel">
 <ANCHOR id="NMSetting8021x--phase1-peapver" href="libnm-util/NMSetting8021x.html#NMSetting8021x--phase1-peapver">
@@ -587,11 +573,16 @@
 <ANCHOR id="NMSetting8021x--phase2-client-cert" href="libnm-util/NMSetting8021x.html#NMSetting8021x--phase2-client-cert">
 <ANCHOR id="NMSetting8021x--phase2-private-key" href="libnm-util/NMSetting8021x.html#NMSetting8021x--phase2-private-key">
 <ANCHOR id="NMSetting8021x--phase2-private-key-password" href="libnm-util/NMSetting8021x.html#NMSetting8021x--phase2-private-key-password">
+<ANCHOR id="NMSetting8021x--phase2-private-key-password-flags" href="libnm-util/NMSetting8021x.html#NMSetting8021x--phase2-private-key-password-flags">
 <ANCHOR id="NMSetting8021x--private-key" href="libnm-util/NMSetting8021x.html#NMSetting8021x--private-key">
 <ANCHOR id="NMSetting8021x--private-key-password" href="libnm-util/NMSetting8021x.html#NMSetting8021x--private-key-password">
+<ANCHOR id="NMSetting8021x--private-key-password-flags" href="libnm-util/NMSetting8021x.html#NMSetting8021x--private-key-password-flags">
 <ANCHOR id="NMSetting8021x--system-ca-certs" href="libnm-util/NMSetting8021x.html#NMSetting8021x--system-ca-certs">
 <ANCHOR id="NMSettingIP4Config" href="libnm-util/NMSettingIP4Config.html">
 <ANCHOR id="NMSettingIP4Config.synopsis" href="libnm-util/NMSettingIP4Config.html#NMSettingIP4Config.synopsis">
+<ANCHOR id="NMSettingIP4ConfigError" href="libnm-util/NMSettingIP4Config.html#NMSettingIP4ConfigError">
+<ANCHOR id="NMIP4Address" href="libnm-util/NMSettingIP4Config.html#NMIP4Address">
+<ANCHOR id="NMIP4Route" href="libnm-util/NMSettingIP4Config.html#NMIP4Route">
 <ANCHOR id="NMSettingIP4Config.object-hierarchy" href="libnm-util/NMSettingIP4Config.html#NMSettingIP4Config.object-hierarchy">
 <ANCHOR id="NMSettingIP4Config.properties" href="libnm-util/NMSettingIP4Config.html#NMSettingIP4Config.properties">
 <ANCHOR id="NMSettingIP4Config.description" href="libnm-util/NMSettingIP4Config.html#NMSettingIP4Config.description">
@@ -619,6 +610,7 @@
 <ANCHOR id="NM-SETTING-IP4-CONFIG-METHOD-SHARED:CAPS" href="libnm-util/NMSettingIP4Config.html#NM-SETTING-IP4-CONFIG-METHOD-SHARED:CAPS">
 <ANCHOR id="NM-SETTING-IP4-CONFIG-METHOD-DISABLED:CAPS" href="libnm-util/NMSettingIP4Config.html#NM-SETTING-IP4-CONFIG-METHOD-DISABLED:CAPS">
 <ANCHOR id="NMIP4Address" href="libnm-util/NMSettingIP4Config.html#NMIP4Address">
+<ANCHOR id="nm-ip4-address-get-type" href="libnm-util/NMSettingIP4Config.html#nm-ip4-address-get-type">
 <ANCHOR id="nm-ip4-address-new" href="libnm-util/NMSettingIP4Config.html#nm-ip4-address-new">
 <ANCHOR id="nm-ip4-address-dup" href="libnm-util/NMSettingIP4Config.html#nm-ip4-address-dup">
 <ANCHOR id="nm-ip4-address-ref" href="libnm-util/NMSettingIP4Config.html#nm-ip4-address-ref">
@@ -631,6 +623,7 @@
 <ANCHOR id="nm-ip4-address-get-gateway" href="libnm-util/NMSettingIP4Config.html#nm-ip4-address-get-gateway">
 <ANCHOR id="nm-ip4-address-set-gateway" href="libnm-util/NMSettingIP4Config.html#nm-ip4-address-set-gateway">
 <ANCHOR id="NMIP4Route" href="libnm-util/NMSettingIP4Config.html#NMIP4Route">
+<ANCHOR id="nm-ip4-route-get-type" href="libnm-util/NMSettingIP4Config.html#nm-ip4-route-get-type">
 <ANCHOR id="nm-ip4-route-new" href="libnm-util/NMSettingIP4Config.html#nm-ip4-route-new">
 <ANCHOR id="nm-ip4-route-dup" href="libnm-util/NMSettingIP4Config.html#nm-ip4-route-dup">
 <ANCHOR id="nm-ip4-route-ref" href="libnm-util/NMSettingIP4Config.html#nm-ip4-route-ref">
@@ -691,6 +684,9 @@
 <ANCHOR id="NMSettingIP4Config--routes" href="libnm-util/NMSettingIP4Config.html#NMSettingIP4Config--routes">
 <ANCHOR id="NMSettingIP6Config" href="libnm-util/NMSettingIP6Config.html">
 <ANCHOR id="NMSettingIP6Config.synopsis" href="libnm-util/NMSettingIP6Config.html#NMSettingIP6Config.synopsis">
+<ANCHOR id="NMSettingIP6ConfigError" href="libnm-util/NMSettingIP6Config.html#NMSettingIP6ConfigError">
+<ANCHOR id="NMIP6Address" href="libnm-util/NMSettingIP6Config.html#NMIP6Address">
+<ANCHOR id="NMIP6Route" href="libnm-util/NMSettingIP6Config.html#NMIP6Route">
 <ANCHOR id="NMSettingIP6Config.object-hierarchy" href="libnm-util/NMSettingIP6Config.html#NMSettingIP6Config.object-hierarchy">
 <ANCHOR id="NMSettingIP6Config.properties" href="libnm-util/NMSettingIP6Config.html#NMSettingIP6Config.properties">
 <ANCHOR id="NMSettingIP6Config.description" href="libnm-util/NMSettingIP6Config.html#NMSettingIP6Config.description">
@@ -716,6 +712,7 @@
 <ANCHOR id="NM-SETTING-IP6-CONFIG-METHOD-MANUAL:CAPS" href="libnm-util/NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-METHOD-MANUAL:CAPS">
 <ANCHOR id="NM-SETTING-IP6-CONFIG-METHOD-SHARED:CAPS" href="libnm-util/NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-METHOD-SHARED:CAPS">
 <ANCHOR id="NMIP6Address" href="libnm-util/NMSettingIP6Config.html#NMIP6Address">
+<ANCHOR id="nm-ip6-address-get-type" href="libnm-util/NMSettingIP6Config.html#nm-ip6-address-get-type">
 <ANCHOR id="nm-ip6-address-new" href="libnm-util/NMSettingIP6Config.html#nm-ip6-address-new">
 <ANCHOR id="nm-ip6-address-dup" href="libnm-util/NMSettingIP6Config.html#nm-ip6-address-dup">
 <ANCHOR id="nm-ip6-address-ref" href="libnm-util/NMSettingIP6Config.html#nm-ip6-address-ref">
@@ -728,6 +725,7 @@
 <ANCHOR id="nm-ip6-address-get-gateway" href="libnm-util/NMSettingIP6Config.html#nm-ip6-address-get-gateway">
 <ANCHOR id="nm-ip6-address-set-gateway" href="libnm-util/NMSettingIP6Config.html#nm-ip6-address-set-gateway">
 <ANCHOR id="NMIP6Route" href="libnm-util/NMSettingIP6Config.html#NMIP6Route">
+<ANCHOR id="nm-ip6-route-get-type" href="libnm-util/NMSettingIP6Config.html#nm-ip6-route-get-type">
 <ANCHOR id="nm-ip6-route-new" href="libnm-util/NMSettingIP6Config.html#nm-ip6-route-new">
 <ANCHOR id="nm-ip6-route-dup" href="libnm-util/NMSettingIP6Config.html#nm-ip6-route-dup">
 <ANCHOR id="nm-ip6-route-ref" href="libnm-util/NMSettingIP6Config.html#nm-ip6-route-ref">
@@ -782,6 +780,7 @@
 <ANCHOR id="NMSettingIP6Config--routes" href="libnm-util/NMSettingIP6Config.html#NMSettingIP6Config--routes">
 <ANCHOR id="NMSettingPPP" href="libnm-util/NMSettingPPP.html">
 <ANCHOR id="NMSettingPPP.synopsis" href="libnm-util/NMSettingPPP.html#NMSettingPPP.synopsis">
+<ANCHOR id="NMSettingPPPError" href="libnm-util/NMSettingPPP.html#NMSettingPPPError">
 <ANCHOR id="NMSettingPPP.object-hierarchy" href="libnm-util/NMSettingPPP.html#NMSettingPPP.object-hierarchy">
 <ANCHOR id="NMSettingPPP.properties" href="libnm-util/NMSettingPPP.html#NMSettingPPP.properties">
 <ANCHOR id="NMSettingPPP.description" href="libnm-util/NMSettingPPP.html#NMSettingPPP.description">
@@ -852,6 +851,7 @@
 <ANCHOR id="NMSettingPPP--require-mppe-128" href="libnm-util/NMSettingPPP.html#NMSettingPPP--require-mppe-128">
 <ANCHOR id="NMSettingPPPOE" href="libnm-util/NMSettingPPPOE.html">
 <ANCHOR id="NMSettingPPPOE.synopsis" href="libnm-util/NMSettingPPPOE.html#NMSettingPPPOE.synopsis">
+<ANCHOR id="NMSettingPPPOEError" href="libnm-util/NMSettingPPPOE.html#NMSettingPPPOEError">
 <ANCHOR id="NMSettingPPPOE.object-hierarchy" href="libnm-util/NMSettingPPPOE.html#NMSettingPPPOE.object-hierarchy">
 <ANCHOR id="NMSettingPPPOE.properties" href="libnm-util/NMSettingPPPOE.html#NMSettingPPPOE.properties">
 <ANCHOR id="NMSettingPPPOE.description" href="libnm-util/NMSettingPPPOE.html#NMSettingPPPOE.description">
@@ -864,6 +864,7 @@
 <ANCHOR id="NM-SETTING-PPPOE-SERVICE:CAPS" href="libnm-util/NMSettingPPPOE.html#NM-SETTING-PPPOE-SERVICE:CAPS">
 <ANCHOR id="NM-SETTING-PPPOE-USERNAME:CAPS" href="libnm-util/NMSettingPPPOE.html#NM-SETTING-PPPOE-USERNAME:CAPS">
 <ANCHOR id="NM-SETTING-PPPOE-PASSWORD:CAPS" href="libnm-util/NMSettingPPPOE.html#NM-SETTING-PPPOE-PASSWORD:CAPS">
+<ANCHOR id="NM-SETTING-PPPOE-PASSWORD-FLAGS:CAPS" href="libnm-util/NMSettingPPPOE.html#NM-SETTING-PPPOE-PASSWORD-FLAGS:CAPS">
 <ANCHOR id="NMSettingPPPOE-struct" href="libnm-util/NMSettingPPPOE.html#NMSettingPPPOE-struct">
 <ANCHOR id="NMSettingPPPOEClass" href="libnm-util/NMSettingPPPOE.html#NMSettingPPPOEClass">
 <ANCHOR id="nm-setting-pppoe-get-type" href="libnm-util/NMSettingPPPOE.html#nm-setting-pppoe-get-type">
@@ -871,12 +872,15 @@
 <ANCHOR id="nm-setting-pppoe-get-service" href="libnm-util/NMSettingPPPOE.html#nm-setting-pppoe-get-service">
 <ANCHOR id="nm-setting-pppoe-get-username" href="libnm-util/NMSettingPPPOE.html#nm-setting-pppoe-get-username">
 <ANCHOR id="nm-setting-pppoe-get-password" href="libnm-util/NMSettingPPPOE.html#nm-setting-pppoe-get-password">
+<ANCHOR id="nm-setting-pppoe-get-password-flags" href="libnm-util/NMSettingPPPOE.html#nm-setting-pppoe-get-password-flags">
 <ANCHOR id="NMSettingPPPOE.property-details" href="libnm-util/NMSettingPPPOE.html#NMSettingPPPOE.property-details">
 <ANCHOR id="NMSettingPPPOE--password" href="libnm-util/NMSettingPPPOE.html#NMSettingPPPOE--password">
+<ANCHOR id="NMSettingPPPOE--password-flags" href="libnm-util/NMSettingPPPOE.html#NMSettingPPPOE--password-flags">
 <ANCHOR id="NMSettingPPPOE--service" href="libnm-util/NMSettingPPPOE.html#NMSettingPPPOE--service">
 <ANCHOR id="NMSettingPPPOE--username" href="libnm-util/NMSettingPPPOE.html#NMSettingPPPOE--username">
 <ANCHOR id="NMSettingVPN" href="libnm-util/NMSettingVPN.html">
 <ANCHOR id="NMSettingVPN.synopsis" href="libnm-util/NMSettingVPN.html#NMSettingVPN.synopsis">
+<ANCHOR id="NMSettingVpnError" href="libnm-util/NMSettingVPN.html#NMSettingVpnError">
 <ANCHOR id="NMSettingVPN.object-hierarchy" href="libnm-util/NMSettingVPN.html#NMSettingVPN.object-hierarchy">
 <ANCHOR id="NMSettingVPN.properties" href="libnm-util/NMSettingVPN.html#NMSettingVPN.properties">
 <ANCHOR id="NMSettingVPN.description" href="libnm-util/NMSettingVPN.html#NMSettingVPN.description">
@@ -892,7 +896,7 @@
 <ANCHOR id="NM-SETTING-VPN-SECRETS:CAPS" href="libnm-util/NMSettingVPN.html#NM-SETTING-VPN-SECRETS:CAPS">
 <ANCHOR id="NMSettingVPN-struct" href="libnm-util/NMSettingVPN.html#NMSettingVPN-struct">
 <ANCHOR id="NMSettingVPNClass" href="libnm-util/NMSettingVPN.html#NMSettingVPNClass">
-<ANCHOR id="VPNIterFunc" href="libnm-util/NMSettingVPN.html#VPNIterFunc">
+<ANCHOR id="NMVPNIterFunc" href="libnm-util/NMSettingVPN.html#NMVPNIterFunc">
 <ANCHOR id="nm-setting-vpn-get-type" href="libnm-util/NMSettingVPN.html#nm-setting-vpn-get-type">
 <ANCHOR id="nm-setting-vpn-new" href="libnm-util/NMSettingVPN.html#nm-setting-vpn-new">
 <ANCHOR id="nm-setting-vpn-get-service-type" href="libnm-util/NMSettingVPN.html#nm-setting-vpn-get-service-type">
@@ -914,16 +918,6 @@
 <ANCHOR id="libnm-util-nm-utils.synopsis" href="libnm-util/libnm-util-nm-utils.html#libnm-util-nm-utils.synopsis">
 <ANCHOR id="libnm-util-nm-utils.description" href="libnm-util/libnm-util-nm-utils.html#libnm-util-nm-utils.description">
 <ANCHOR id="libnm-util-nm-utils.details" href="libnm-util/libnm-util-nm-utils.html#libnm-util-nm-utils.details">
-<ANCHOR id="nm-print-backtrace" href="libnm-util/libnm-util-nm-utils.html#nm-print-backtrace">
-<ANCHOR id="nm-get-timestamp" href="libnm-util/libnm-util-nm-utils.html#nm-get-timestamp">
-<ANCHOR id="nm-info" href="libnm-util/libnm-util-nm-utils.html#nm-info">
-<ANCHOR id="nm-info-str" href="libnm-util/libnm-util-nm-utils.html#nm-info-str">
-<ANCHOR id="nm-debug" href="libnm-util/libnm-util-nm-utils.html#nm-debug">
-<ANCHOR id="nm-debug-str" href="libnm-util/libnm-util-nm-utils.html#nm-debug-str">
-<ANCHOR id="nm-warning" href="libnm-util/libnm-util-nm-utils.html#nm-warning">
-<ANCHOR id="nm-warning-str" href="libnm-util/libnm-util-nm-utils.html#nm-warning-str">
-<ANCHOR id="nm-error" href="libnm-util/libnm-util-nm-utils.html#nm-error">
-<ANCHOR id="nm-error-str" href="libnm-util/libnm-util-nm-utils.html#nm-error-str">
 <ANCHOR id="nm-utils-init" href="libnm-util/libnm-util-nm-utils.html#nm-utils-init">
 <ANCHOR id="nm-utils-deinit" href="libnm-util/libnm-util-nm-utils.html#nm-utils-deinit">
 <ANCHOR id="nm-utils-is-empty-ssid" href="libnm-util/libnm-util-nm-utils.html#nm-utils-is-empty-ssid">
@@ -954,4 +948,10 @@
 <ANCHOR id="nm-utils-wifi-channel-to-freq" href="libnm-util/libnm-util-nm-utils.html#nm-utils-wifi-channel-to-freq">
 <ANCHOR id="nm-utils-wifi-find-next-channel" href="libnm-util/libnm-util-nm-utils.html#nm-utils-wifi-find-next-channel">
 <ANCHOR id="nm-utils-wifi-is-channel-valid" href="libnm-util/libnm-util-nm-utils.html#nm-utils-wifi-is-channel-valid">
+<ANCHOR id="annotation-glossterm-out" href="libnm-util/annotation-glossary.html#annotation-glossterm-out">
+<ANCHOR id="annotation-glossterm-allow-none" href="libnm-util/annotation-glossary.html#annotation-glossterm-allow-none">
 <ANCHOR id="annotation-glossterm-element-type" href="libnm-util/annotation-glossary.html#annotation-glossterm-element-type">
+<ANCHOR id="annotation-glossterm-transfer container" href="libnm-util/annotation-glossary.html#annotation-glossterm-transfer container">
+<ANCHOR id="annotation-glossterm-scope call" href="libnm-util/annotation-glossary.html#annotation-glossterm-scope call">
+<ANCHOR id="annotation-glossterm-transfer full" href="libnm-util/annotation-glossary.html#annotation-glossterm-transfer full">
+<ANCHOR id="annotation-glossterm-transfer none" href="libnm-util/annotation-glossary.html#annotation-glossterm-transfer none">
diff --git a/docs/libnm-util/html/libnm-util-nm-utils.html b/docs/libnm-util/html/libnm-util-nm-utils.html
index 7226a31c2..f26503392 100644
--- a/docs/libnm-util/html/libnm-util-nm-utils.html
+++ b/docs/libnm-util/html/libnm-util-nm-utils.html
@@ -3,12 +3,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>nm-utils</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="libnm-util Reference Manual">
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingVPN.html" title="NMSettingVPN">
 <link rel="next" href="object-tree.html" title="Object Hierarchy">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,7 +26,7 @@
                   <a href="#libnm-util-nm-utils.description" class="shortcut">Description</a>
 </td></tr>
 </table>
-<div class="refentry" title="nm-utils">
+<div class="refentry">
 <a name="libnm-util-nm-utils"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
@@ -35,29 +35,11 @@
 </td>
 <td valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv" title="Synopsis">
+<div class="refsynopsisdiv">
 <a name="libnm-util-nm-utils.synopsis"></a><h2>Synopsis</h2>
 <pre class="synopsis">
 #include &lt;nm-utils.h&gt;
 
-#define             <a class="link" href="libnm-util-nm-utils.html#nm-print-backtrace" title="nm_print_backtrace">nm_print_backtrace</a>
-#define             <a class="link" href="libnm-util-nm-utils.html#nm-get-timestamp" title="nm_get_timestamp()">nm_get_timestamp</a>                    (timestamp)
-#define             <a class="link" href="libnm-util-nm-utils.html#nm-info" title="nm_info()">nm_info</a>                             (fmt,
-                                                         args...)
-#define             <a class="link" href="libnm-util-nm-utils.html#nm-info-str" title="nm_info_str()">nm_info_str</a>                         (fmt_str,
-                                                         args...)
-#define             <a class="link" href="libnm-util-nm-utils.html#nm-debug" title="nm_debug()">nm_debug</a>                            (fmt,
-                                                         args...)
-#define             <a class="link" href="libnm-util-nm-utils.html#nm-debug-str" title="nm_debug_str()">nm_debug_str</a>                        (fmt_str,
-                                                         args...)
-#define             <a class="link" href="libnm-util-nm-utils.html#nm-warning" title="nm_warning()">nm_warning</a>                          (fmt,
-                                                         args...)
-#define             <a class="link" href="libnm-util-nm-utils.html#nm-warning-str" title="nm_warning_str()">nm_warning_str</a>                      (fmt_str,
-                                                         args...)
-#define             <a class="link" href="libnm-util-nm-utils.html#nm-error" title="nm_error()">nm_error</a>                            (fmt,
-                                                         args...)
-#define             <a class="link" href="libnm-util-nm-utils.html#nm-error-str" title="nm_error_str()">nm_error_str</a>                        (fmt_str,
-                                                         args...)
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="libnm-util-nm-utils.html#nm-utils-init" title="nm_utils_init ()">nm_utils_init</a>                       (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="libnm-util-nm-utils.html#nm-utils-deinit" title="nm_utils_deinit ()">nm_utils_deinit</a>                     (<em class="parameter"><code><span class="type">void</span></code></em>);
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="libnm-util-nm-utils.html#nm-utils-is-empty-ssid" title="nm_utils_is_empty_ssid ()">nm_utils_is_empty_ssid</a>              (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint8"><span class="type">guint8</span></a> *ssid</code></em>,
@@ -67,8 +49,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="libnm
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="libnm-util-nm-utils.html#nm-utils-same-ssid" title="nm_utils_same_ssid ()">nm_utils_same_ssid</a>                  (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="type">GByteArray</span></a> *ssid1</code></em>,
                                                          <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="type">GByteArray</span></a> *ssid2</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> ignore_trailing_null</code></em>);
-<span class="returnvalue">char</span> *              <a class="link" href="libnm-util-nm-utils.html#nm-utils-ssid-to-utf8" title="nm_utils_ssid_to_utf8 ()">nm_utils_ssid_to_utf8</a>               (<em class="parameter"><code>const <span class="type">char</span> *ssid</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> len</code></em>);
+<span class="returnvalue">char</span> *              <a class="link" href="libnm-util-nm-utils.html#nm-utils-ssid-to-utf8" title="nm_utils_ssid_to_utf8 ()">nm_utils_ssid_to_utf8</a>               (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="type">GByteArray</span></a> *ssid</code></em>);
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="returnvalue">GHashTable</span></a> *        <a class="link" href="libnm-util-nm-utils.html#nm-utils-gvalue-hash-dup" title="nm_utils_gvalue_hash_dup ()">nm_utils_gvalue_hash_dup</a>            (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *hash</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="libnm-util-nm-utils.html#nm-utils-slist-free" title="nm_utils_slist_free ()">nm_utils_slist_free</a>                 (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> *list</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Datasets.html#GDestroyNotify"><span class="type">GDestroyNotify</span></a> elem_destroy_fn</code></em>);
@@ -114,216 +95,16 @@ enum                <a class="link" href="libnm-util-nm-utils.html#NMUtilsSecuri
                                                          <em class="parameter"><code>const <span class="type">char</span> *band</code></em>);
 </pre>
 </div>
-<div class="refsect1" title="Description">
+<div class="refsect1">
 <a name="libnm-util-nm-utils.description"></a><h2>Description</h2>
 <p>
 A collection of utility functions for working SSIDs, IP addresses, WiFi
 access points and devices, among other things.
 </p>
 </div>
-<div class="refsect1" title="Details">
+<div class="refsect1">
 <a name="libnm-util-nm-utils.details"></a><h2>Details</h2>
-<div class="refsect2" title="nm_print_backtrace">
-<a name="nm-print-backtrace"></a><h3>nm_print_backtrace</h3>
-<pre class="programlisting">#define             nm_print_backtrace()</pre>
-<p>
-Prints a backtrace of the calling process to the logging location.
-</p>
-</div>
-<hr>
-<div class="refsect2" title="nm_get_timestamp()">
-<a name="nm-get-timestamp"></a><h3>nm_get_timestamp()</h3>
-<pre class="programlisting">#define             nm_get_timestamp(timestamp)</pre>
-<p>
-For debugging only.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>timestamp</code></em> :</span></p></td>
-<td>location in which to place the current timestamp
-</td>
-</tr></tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_info()">
-<a name="nm-info"></a><h3>nm_info()</h3>
-<pre class="programlisting">#define             nm_info(fmt, args...)</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>fmt</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>args...</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_info_str()">
-<a name="nm-info-str"></a><h3>nm_info_str()</h3>
-<pre class="programlisting">#define             nm_info_str(fmt_str, args...)</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>fmt_str</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>args...</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_debug()">
-<a name="nm-debug"></a><h3>nm_debug()</h3>
-<pre class="programlisting">#define             nm_debug(fmt, args...)</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>fmt</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>args...</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_debug_str()">
-<a name="nm-debug-str"></a><h3>nm_debug_str()</h3>
-<pre class="programlisting">#define             nm_debug_str(fmt_str, args...)</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>fmt_str</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>args...</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_warning()">
-<a name="nm-warning"></a><h3>nm_warning()</h3>
-<pre class="programlisting">#define             nm_warning(fmt, args...)</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>fmt</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>args...</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_warning_str()">
-<a name="nm-warning-str"></a><h3>nm_warning_str()</h3>
-<pre class="programlisting">#define             nm_warning_str(fmt_str, args...)</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>fmt_str</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>args...</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_error()">
-<a name="nm-error"></a><h3>nm_error()</h3>
-<pre class="programlisting">#define             nm_error(fmt, args...)</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>fmt</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>args...</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_error_str()">
-<a name="nm-error-str"></a><h3>nm_error_str()</h3>
-<pre class="programlisting">#define             nm_error_str(fmt_str, args...)</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>fmt_str</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>args...</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_utils_init ()">
+<div class="refsect2">
 <a name="nm-utils-init"></a><h3>nm_utils_init ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_utils_init                       (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
 <p>
@@ -342,14 +123,13 @@ libnm-util can also be done.  This function can be called more than once.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> TRUE if the initialization was successful, FALSE on failure.
-</td>
+<td>TRUE if the initialization was successful, FALSE on failure.</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_utils_deinit ()">
+<div class="refsect2">
 <a name="nm-utils-deinit"></a><h3>nm_utils_deinit ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_utils_deinit                     (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
@@ -360,7 +140,7 @@ called again.
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_utils_is_empty_ssid ()">
+<div class="refsect2">
 <a name="nm-utils-is-empty-ssid"></a><h3>nm_utils_is_empty_ssid ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_utils_is_empty_ssid              (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint8"><span class="type">guint8</span></a> *ssid</code></em>,
                                                          <em class="parameter"><code><span class="type">int</span> len</code></em>);</pre>
@@ -374,8 +154,7 @@ number of known SSID-cloaking methods.
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>ssid</code></em> :</span></p></td>
-<td>pointer to a buffer containing the SSID data
-</td>
+<td>pointer to a buffer containing the SSID data</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>len</code></em> :</span></p></td>
@@ -384,14 +163,13 @@ number of known SSID-cloaking methods.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> TRUE if the SSID is "empty", FALSE if it is not
-</td>
+<td>TRUE if the SSID is "empty", FALSE if it is not</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_utils_escape_ssid ()">
+<div class="refsect2">
 <a name="nm-utils-escape-ssid"></a><h3>nm_utils_escape_ssid ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_utils_escape_ssid                (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint8"><span class="type">guint8</span></a> *ssid</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> len</code></em>);</pre>
@@ -406,8 +184,7 @@ be used for display of SSIDs.
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>ssid</code></em> :</span></p></td>
-<td>pointer to a buffer containing the SSID data
-</td>
+<td>pointer to a buffer containing the SSID data</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>len</code></em> :</span></p></td>
@@ -416,15 +193,14 @@ be used for display of SSIDs.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> pointer to the escaped SSID, which uses an internal static buffer
-and will be overwritten by subsequent calls to this function
-</td>
+<td>pointer to the escaped SSID, which uses an internal static buffer
+and will be overwritten by subsequent calls to this function</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_utils_same_ssid ()">
+<div class="refsect2">
 <a name="nm-utils-same-ssid"></a><h3>nm_utils_same_ssid ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_utils_same_ssid                  (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="type">GByteArray</span></a> *ssid1</code></em>,
                                                          <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="type">GByteArray</span></a> *ssid2</code></em>,
@@ -442,32 +218,27 @@ NULLs, even though that is functionally pointless.
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>ssid1</code></em> :</span></p></td>
-<td>first SSID data to compare
-</td>
+<td>first SSID data to compare</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>ssid2</code></em> :</span></p></td>
-<td>second SSID data to compare
-</td>
+<td>second SSID data to compare</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>ignore_trailing_null</code></em> :</span></p></td>
-<td>TRUE to ignore one trailing NULL byte
-</td>
+<td>TRUE to ignore one trailing NULL byte</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> TRUE if the SSIDs are the same, FALSE if they are not
-</td>
+<td>TRUE if the SSIDs are the same, FALSE if they are not</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_utils_ssid_to_utf8 ()">
+<div class="refsect2">
 <a name="nm-utils-ssid-to-utf8"></a><h3>nm_utils_ssid_to_utf8 ()</h3>
-<pre class="programlisting"><span class="returnvalue">char</span> *              nm_utils_ssid_to_utf8               (<em class="parameter"><code>const <span class="type">char</span> *ssid</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> len</code></em>);</pre>
+<pre class="programlisting"><span class="returnvalue">char</span> *              nm_utils_ssid_to_utf8               (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="type">GByteArray</span></a> *ssid</code></em>);</pre>
 <p>
 WiFi SSIDs are byte arrays, they are _not_ strings.  Thus, an SSID may
 contain embedded NULLs and other unprintable characters.  Often it is
@@ -500,26 +271,20 @@ _only_.
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>ssid</code></em> :</span></p></td>
-<td>pointer to a buffer containing the SSID data
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>len</code></em> :</span></p></td>
-<td>length of the SSID data in <em class="parameter"><code>ssid</code></em>
-</td>
+<td>a byte array containing the SSID data</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> an allocated string containing a UTF-8 representation of the
-SSID, which must be freed by the caller using <a href="http://library.gnome.org/devel/glib/unstable/glib-Memory-Allocation.html#g-free"><code class="function">g_free()</code></a>.  Returns NULL
-on errors.
+<td>an allocated string containing a UTF-8
+representation of the SSID, which must be freed by the caller using <a href="http://library.gnome.org/devel/glib/unstable/glib-Memory-Allocation.html#g-free"><code class="function">g_free()</code></a>.
+Returns NULL on errors. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_utils_gvalue_hash_dup ()">
+<div class="refsect2">
 <a name="nm-utils-gvalue-hash-dup"></a><h3>nm_utils_gvalue_hash_dup ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="returnvalue">GHashTable</span></a> *        nm_utils_gvalue_hash_dup            (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *hash</code></em>);</pre>
 <p>
@@ -530,20 +295,19 @@ Utility function to duplicate a hash table of GValues.
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>hash</code></em> :</span></p></td>
-<td>a <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> mapping string:GValue
-</td>
+<td>a <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> mapping string:GValue</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a newly allocated duplicated <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a>, caller must free the
-returned hash with <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#g-hash-table-unref"><code class="function">g_hash_table_unref()</code></a> or <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#g-hash-table-destroy"><code class="function">g_hash_table_destroy()</code></a>
+<td>a newly allocated duplicated <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a>, caller must free the
+returned hash with <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#g-hash-table-unref"><code class="function">g_hash_table_unref()</code></a> or <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#g-hash-table-destroy"><code class="function">g_hash_table_destroy()</code></a>. <span class="annotation">[<acronym title="Free data container after the code is done."><span class="acronym">transfer container</span></acronym>][<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> utf8 GObject.Value]</span>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_utils_slist_free ()">
+<div class="refsect2">
 <a name="nm-utils-slist-free"></a><h3>nm_utils_slist_free ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_utils_slist_free                 (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> *list</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Datasets.html#GDestroyNotify"><span class="type">GDestroyNotify</span></a> elem_destroy_fn</code></em>);</pre>
@@ -567,7 +331,7 @@ Utility function to free a <a href="http://library.gnome.org/devel/glib/unstable
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="enum NMUtilsSecurityType">
+<div class="refsect2">
 <a name="NMUtilsSecurityType"></a><h3>enum NMUtilsSecurityType</h3>
 <pre class="programlisting">typedef enum {
 	NMU_SEC_INVALID = 0,
@@ -585,7 +349,7 @@ Utility function to free a <a href="http://library.gnome.org/devel/glib/unstable
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_utils_security_valid ()">
+<div class="refsect2">
 <a name="nm-utils-security-valid"></a><h3>nm_utils_security_valid ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_utils_security_valid             (<em class="parameter"><code><a class="link" href="libnm-util-nm-utils.html#NMUtilsSecurityType" title="enum NMUtilsSecurityType"><span class="type">NMUtilsSecurityType</span></a> type</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> wifi_caps</code></em>,
@@ -616,13 +380,11 @@ e.g. <span class="type">NMU_SEC_STATIC_WEP</span>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>have_ap</code></em> :</span></p></td>
-<td>whether the <em class="parameter"><code>ap_flags</code></em>, <em class="parameter"><code>ap_wpa</code></em>, and <em class="parameter"><code>ap_rsn</code></em> arguments are valid
-</td>
+<td>whether the <em class="parameter"><code>ap_flags</code></em>, <em class="parameter"><code>ap_wpa</code></em>, and <em class="parameter"><code>ap_rsn</code></em> arguments are valid</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>adhoc</code></em> :</span></p></td>
-<td>whether the capabilities being tested are from an Ad-Hoc AP (IBSS)
-</td>
+<td>whether the capabilities being tested are from an Ad-Hoc AP (IBSS)</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>ap_flags</code></em> :</span></p></td>
@@ -632,32 +394,29 @@ e.g. <span class="type">NMU_SEC_STATIC_WEP</span>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>ap_wpa</code></em> :</span></p></td>
 <td>bitfield of AP capabilties derived from the AP's WPA beacon,
-e.g. (<span class="type">NM_802_11_AP_SEC_PAIR_TKIP</span> | <span class="type">NM_802_11_AP_SEC_KEY_MGMT_PSK</span>)
-</td>
+e.g. (<span class="type">NM_802_11_AP_SEC_PAIR_TKIP</span> | <span class="type">NM_802_11_AP_SEC_KEY_MGMT_PSK</span>)</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>ap_rsn</code></em> :</span></p></td>
 <td>bitfield of AP capabilties derived from the AP's RSN/WPA2 beacon,
-e.g. (<span class="type">NM_802_11_AP_SEC_PAIR_CCMP</span> | <span class="type">NM_802_11_AP_SEC_PAIR_TKIP</span>)
-</td>
+e.g. (<span class="type">NM_802_11_AP_SEC_PAIR_CCMP</span> | <span class="type">NM_802_11_AP_SEC_PAIR_TKIP</span>)</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> TRUE if the device capabilities and AP capabilties intersect and are
-compatible with the desired <em class="parameter"><code>type</code></em>, FALSE if they are not
-</td>
+<td>TRUE if the device capabilities and AP capabilties intersect and are
+compatible with the desired <em class="parameter"><code>type</code></em>, FALSE if they are not</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_utils_ip4_addresses_from_gvalue ()">
+<div class="refsect2">
 <a name="nm-utils-ip4-addresses-from-gvalue"></a><h3>nm_utils_ip4_addresses_from_gvalue ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="returnvalue">GSList</span></a> *            nm_utils_ip4_addresses_from_gvalue  (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>);</pre>
 <p>
 Utility function to convert a <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> of <a href="http://library.gnome.org/devel/glib/unstable/glib-Arrays.html#GArray"><span class="type">GArrays</span></a> of guint32s representing
 a list of NetworkManager IPv4 addresses (which is a tuple of address, gateway,
-and prefix) into a GSList of <a class="link" href="NMSettingIP4Config.html#NMIP4Address" title="NMIP4Address"><span class="type">NMIP4Address</span></a> objects.  The specific format of
+and prefix) into a GSList of <a class="link" href="NMSettingIP4Config.html#NMIP4Address"><span class="type">NMIP4Address</span></a> objects.  The specific format of
 this serialization is not guaranteed to be stable and the <a href="http://library.gnome.org/devel/glib/unstable/glib-Arrays.html#GArray"><span class="type">GArray</span></a> may be
 extended in the future.
 </p>
@@ -666,24 +425,23 @@ extended in the future.
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
-<td>gvalue containing a GPtrArray of GArrays of guint32s
-</td>
+<td>gvalue containing a GPtrArray of GArrays of guint32s</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a newly allocated <a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> of <a class="link" href="NMSettingIP4Config.html#NMIP4Address" title="NMIP4Address"><span class="type">NMIP4Address</span></a> objects
+<td>a newly allocated <a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> of <a class="link" href="NMSettingIP4Config.html#NMIP4Address"><span class="type">NMIP4Address</span></a> objects. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>][<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NetworkManager.IP4Address]</span>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_utils_ip4_addresses_to_gvalue ()">
+<div class="refsect2">
 <a name="nm-utils-ip4-addresses-to-gvalue"></a><h3>nm_utils_ip4_addresses_to_gvalue ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_utils_ip4_addresses_to_gvalue    (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> *list</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>);</pre>
 <p>
-Utility function to convert a <a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> of <a class="link" href="NMSettingIP4Config.html#NMIP4Address" title="NMIP4Address"><span class="type">NMIP4Address</span></a> objects into a
+Utility function to convert a <a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> of <a class="link" href="NMSettingIP4Config.html#NMIP4Address"><span class="type">NMIP4Address</span></a> objects into a
 GPtrArray of GArrays of guint32s representing a list of NetworkManager IPv4
 addresses (which is a tuple of address, gateway, and prefix).   The specific
 format of this serialization is not guaranteed to be stable and may be
@@ -694,27 +452,25 @@ extended in the future.
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>list</code></em> :</span></p></td>
-<td>a list of <a class="link" href="NMSettingIP4Config.html#NMIP4Address" title="NMIP4Address"><span class="type">NMIP4Address</span></a> objects
-</td>
+<td>a list of <a class="link" href="NMSettingIP4Config.html#NMIP4Address"><span class="type">NMIP4Address</span></a> objects</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
 <td>a pointer to a <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> into which to place the converted addresses,
 which should be unset by the caller (when no longer needed) with
-<a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#g-value-unset"><code class="function">g_value_unset()</code></a>.
-</td>
+<a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#g-value-unset"><code class="function">g_value_unset()</code></a>.</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_utils_ip4_routes_from_gvalue ()">
+<div class="refsect2">
 <a name="nm-utils-ip4-routes-from-gvalue"></a><h3>nm_utils_ip4_routes_from_gvalue ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="returnvalue">GSList</span></a> *            nm_utils_ip4_routes_from_gvalue     (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>);</pre>
 <p>
 Utility function to convert a GPtrArray of GArrays of guint32s representing
 a list of NetworkManager IPv4 routes (which is a tuple of route, next hop,
-prefix, and metric) into a GSList of <a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route"><span class="type">NMIP4Route</span></a> objects.  The specific
+prefix, and metric) into a GSList of <a class="link" href="NMSettingIP4Config.html#NMIP4Route"><span class="type">NMIP4Route</span></a> objects.  The specific
 format of this serialization is not guaranteed to be stable and may be
 extended in the future.
 </p>
@@ -723,24 +479,23 @@ extended in the future.
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
-<td>gvalue containing a GPtrArray of GArrays of guint32s
-</td>
+<td>gvalue containing a GPtrArray of GArrays of guint32s</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a newly allocated <a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> of <a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route"><span class="type">NMIP4Route</span></a> objects
+<td>a newly allocated <a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> of <a class="link" href="NMSettingIP4Config.html#NMIP4Route"><span class="type">NMIP4Route</span></a> objects. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>][<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NetworkManager.IP4Route]</span>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_utils_ip4_routes_to_gvalue ()">
+<div class="refsect2">
 <a name="nm-utils-ip4-routes-to-gvalue"></a><h3>nm_utils_ip4_routes_to_gvalue ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_utils_ip4_routes_to_gvalue       (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> *list</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>);</pre>
 <p>
-Utility function to convert a <a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> of <a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route"><span class="type">NMIP4Route</span></a> objects into a
+Utility function to convert a <a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> of <a class="link" href="NMSettingIP4Config.html#NMIP4Route"><span class="type">NMIP4Route</span></a> objects into a
 GPtrArray of GArrays of guint32s representing a list of NetworkManager IPv4
 routes (which is a tuple of route, next hop, prefix, and metric).   The
 specific format of this serialization is not guaranteed to be stable and may
@@ -751,21 +506,19 @@ be extended in the future.
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>list</code></em> :</span></p></td>
-<td>a list of <a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route"><span class="type">NMIP4Route</span></a> objects
-</td>
+<td>a list of <a class="link" href="NMSettingIP4Config.html#NMIP4Route"><span class="type">NMIP4Route</span></a> objects</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
 <td>a pointer to a <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> into which to place the converted routes,
 which should be unset by the caller (when no longer needed) with
-<a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#g-value-unset"><code class="function">g_value_unset()</code></a>.
-</td>
+<a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#g-value-unset"><code class="function">g_value_unset()</code></a>.</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_utils_ip4_netmask_to_prefix ()">
+<div class="refsect2">
 <a name="nm-utils-ip4-netmask-to-prefix"></a><h3>nm_utils_ip4_netmask_to_prefix ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_utils_ip4_netmask_to_prefix      (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> netmask</code></em>);</pre>
 <div class="variablelist"><table border="0">
@@ -773,19 +526,17 @@ which should be unset by the caller (when no longer needed) with
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>netmask</code></em> :</span></p></td>
-<td>an IPv4 netmask in network byte order
-</td>
+<td>an IPv4 netmask in network byte order</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the CIDR prefix represented by the netmask
-</td>
+<td>the CIDR prefix represented by the netmask</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_utils_ip4_prefix_to_netmask ()">
+<div class="refsect2">
 <a name="nm-utils-ip4-prefix-to-netmask"></a><h3>nm_utils_ip4_prefix_to_netmask ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_utils_ip4_prefix_to_netmask      (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> prefix</code></em>);</pre>
 <div class="variablelist"><table border="0">
@@ -793,19 +544,17 @@ which should be unset by the caller (when no longer needed) with
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>prefix</code></em> :</span></p></td>
-<td>a CIDR prefix
-</td>
+<td>a CIDR prefix</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the netmask represented by the prefix
-</td>
+<td>the netmask represented by the prefix</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_utils_ip4_get_default_prefix ()">
+<div class="refsect2">
 <a name="nm-utils-ip4-get-default-prefix"></a><h3>nm_utils_ip4_get_default_prefix ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_utils_ip4_get_default_prefix     (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> ip</code></em>);</pre>
 <p>
@@ -819,25 +568,23 @@ falls in the predefined classes.
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>ip</code></em> :</span></p></td>
-<td>an IPv4 address (in network byte order)
-</td>
+<td>an IPv4 address (in network byte order)</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the default class prefix for the given IP
-</td>
+<td>the default class prefix for the given IP</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_utils_ip6_addresses_from_gvalue ()">
+<div class="refsect2">
 <a name="nm-utils-ip6-addresses-from-gvalue"></a><h3>nm_utils_ip6_addresses_from_gvalue ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="returnvalue">GSList</span></a> *            nm_utils_ip6_addresses_from_gvalue  (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>);</pre>
 <p>
 Utility function to convert a <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> of <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Value-arrays.html#GValueArray"><span class="type">GValueArrays</span></a> of (<a href="http://library.gnome.org/devel/glib/unstable/glib-Arrays.html#GArray"><span class="type">GArray</span></a> of guchars) and guint32
 representing a list of NetworkManager IPv6 addresses (which is a tuple of address,
-prefix, and gateway), into a GSList of <a class="link" href="NMSettingIP6Config.html#NMIP6Address" title="NMIP6Address"><span class="type">NMIP6Address</span></a> objects.  The specific format of
+prefix, and gateway), into a GSList of <a class="link" href="NMSettingIP6Config.html#NMIP6Address"><span class="type">NMIP6Address</span></a> objects.  The specific format of
 this serialization is not guaranteed to be stable and the <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Value-arrays.html#GValueArray"><span class="type">GValueArray</span></a> may be
 extended in the future.
 </p>
@@ -846,24 +593,23 @@ extended in the future.
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
-<td>gvalue containing a GPtrArray of GValueArrays of (GArray of guchars) and guint32
-</td>
+<td>gvalue containing a GPtrArray of GValueArrays of (GArray of guchars) and guint32</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a newly allocated <a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> of <a class="link" href="NMSettingIP6Config.html#NMIP6Address" title="NMIP6Address"><span class="type">NMIP6Address</span></a> objects
+<td>a newly allocated <a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> of <a class="link" href="NMSettingIP6Config.html#NMIP6Address"><span class="type">NMIP6Address</span></a> objects. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>][<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NetworkManager.IP6Address]</span>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_utils_ip6_addresses_to_gvalue ()">
+<div class="refsect2">
 <a name="nm-utils-ip6-addresses-to-gvalue"></a><h3>nm_utils_ip6_addresses_to_gvalue ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_utils_ip6_addresses_to_gvalue    (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> *list</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>);</pre>
 <p>
-Utility function to convert a <a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> of <a class="link" href="NMSettingIP6Config.html#NMIP6Address" title="NMIP6Address"><span class="type">NMIP6Address</span></a> objects into a
+Utility function to convert a <a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> of <a class="link" href="NMSettingIP6Config.html#NMIP6Address"><span class="type">NMIP6Address</span></a> objects into a
 GPtrArray of GValueArrays representing a list of NetworkManager IPv6 addresses
 (which is a tuple of address, prefix, and gateway). The specific format of
 this serialization is not guaranteed to be stable and may be extended in the
@@ -874,28 +620,26 @@ future.
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>list</code></em> :</span></p></td>
-<td>a list of <a class="link" href="NMSettingIP6Config.html#NMIP6Address" title="NMIP6Address"><span class="type">NMIP6Address</span></a> objects
-</td>
+<td>a list of <a class="link" href="NMSettingIP6Config.html#NMIP6Address"><span class="type">NMIP6Address</span></a> objects</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
 <td>a pointer to a <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> into which to place the converted addresses,
 which should be unset by the caller (when no longer needed) with
-<a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#g-value-unset"><code class="function">g_value_unset()</code></a>.
-</td>
+<a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#g-value-unset"><code class="function">g_value_unset()</code></a>.</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_utils_ip6_routes_from_gvalue ()">
+<div class="refsect2">
 <a name="nm-utils-ip6-routes-from-gvalue"></a><h3>nm_utils_ip6_routes_from_gvalue ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="returnvalue">GSList</span></a> *            nm_utils_ip6_routes_from_gvalue     (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>);</pre>
 <p>
 Utility function GPtrArray of GValueArrays of (GArray or guchars), guint32,
 (GArray of guchars), and guint32 representing a list of NetworkManager IPv6
 routes (which is a tuple of destination, prefix, next hop, and metric)
-into a GSList of <a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route"><span class="type">NMIP6Route</span></a> objects.  The specific format of this serialization
+into a GSList of <a class="link" href="NMSettingIP6Config.html#NMIP6Route"><span class="type">NMIP6Route</span></a> objects.  The specific format of this serialization
 is not guaranteed to be stable and may be extended in the future.
 </p>
 <div class="variablelist"><table border="0">
@@ -904,24 +648,23 @@ is not guaranteed to be stable and may be extended in the future.
 <tr>
 <td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
 <td>gvalue containing a GPtrArray of GValueArrays of (GArray or guchars), guint32,
-(GArray of guchars), and guint32
-</td>
+(GArray of guchars), and guint32</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a newly allocated <a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> of <a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route"><span class="type">NMIP6Route</span></a> objects
+<td>a newly allocated <a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> of <a class="link" href="NMSettingIP6Config.html#NMIP6Route"><span class="type">NMIP6Route</span></a> objects. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>][<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NetworkManager.IP6Route]</span>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_utils_ip6_routes_to_gvalue ()">
+<div class="refsect2">
 <a name="nm-utils-ip6-routes-to-gvalue"></a><h3>nm_utils_ip6_routes_to_gvalue ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_utils_ip6_routes_to_gvalue       (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> *list</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>);</pre>
 <p>
-Utility function to convert a <a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> of <a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route"><span class="type">NMIP6Route</span></a> objects into a GPtrArray of
+Utility function to convert a <a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> of <a class="link" href="NMSettingIP6Config.html#NMIP6Route"><span class="type">NMIP6Route</span></a> objects into a GPtrArray of
 GValueArrays of (GArray or guchars), guint32, (GArray of guchars), and guint32
 representing a list of NetworkManager IPv6 routes (which is a tuple of destination,
 prefix, next hop, and metric).  The specific format of this serialization is not 
@@ -932,80 +675,48 @@ guaranteed to be stable and may be extended in the future.
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>list</code></em> :</span></p></td>
-<td>a list of <a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route"><span class="type">NMIP6Route</span></a> objects
-</td>
+<td>a list of <a class="link" href="NMSettingIP6Config.html#NMIP6Route"><span class="type">NMIP6Route</span></a> objects</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
 <td>a pointer to a <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> into which to place the converted routes,
 which should be unset by the caller (when no longer needed) with
-<a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#g-value-unset"><code class="function">g_value_unset()</code></a>.
-</td>
+<a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#g-value-unset"><code class="function">g_value_unset()</code></a>.</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_utils_ip6_dns_from_gvalue ()">
+<div class="refsect2">
 <a name="nm-utils-ip6-dns-from-gvalue"></a><h3>nm_utils_ip6_dns_from_gvalue ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="returnvalue">GSList</span></a> *            nm_utils_ip6_dns_from_gvalue        (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_utils_ip6_dns_to_gvalue ()">
+<div class="refsect2">
 <a name="nm-utils-ip6-dns-to-gvalue"></a><h3>nm_utils_ip6_dns_to_gvalue ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_utils_ip6_dns_to_gvalue          (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> *list</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>list</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_utils_uuid_generate ()">
+<div class="refsect2">
 <a name="nm-utils-uuid-generate"></a><h3>nm_utils_uuid_generate ()</h3>
 <pre class="programlisting"><span class="returnvalue">char</span> *              nm_utils_uuid_generate              (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
 <tbody><tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a newly allocated UUID suitable for use as the <a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a>
+<td>a newly allocated UUID suitable for use as the <a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a>
 object's <a class="link" href="NMSettingConnection.html#NMSettingConnection--id" title='The "id" property'><span class="type">"id"</span></a>: property.  Should be freed with <a href="http://library.gnome.org/devel/glib/unstable/glib-Memory-Allocation.html#g-free"><code class="function">g_free()</code></a>
 </td>
 </tr></tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_utils_uuid_generate_from_string ()">
+<div class="refsect2">
 <a name="nm-utils-uuid-generate-from-string"></a><h3>nm_utils_uuid_generate_from_string ()</h3>
 <pre class="programlisting"><span class="returnvalue">char</span> *              nm_utils_uuid_generate_from_string  (<em class="parameter"><code>const <span class="type">char</span> *s</code></em>);</pre>
 <p>
@@ -1016,20 +727,18 @@ For a given <em class="parameter"><code>s</code></em>, this function will always
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>s</code></em> :</span></p></td>
-<td>a string to use as the seed for the UUID
-</td>
+<td>a string to use as the seed for the UUID</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a newly allocated UUID suitable for use as the <a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a>
-object's <a class="link" href="NMSettingConnection.html#NMSettingConnection--id" title='The "id" property'><span class="type">"id"</span></a>: property
-</td>
+<td>a newly allocated UUID suitable for use as the <a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a>
+object's <a class="link" href="NMSettingConnection.html#NMSettingConnection--id" title='The "id" property'><span class="type">"id"</span></a>: property</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_utils_rsa_key_encrypt ()">
+<div class="refsect2">
 <a name="nm-utils-rsa-key-encrypt"></a><h3>nm_utils_rsa_key_encrypt ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *        nm_utils_rsa_key_encrypt            (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="type">GByteArray</span></a> *data</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *in_password</code></em>,
@@ -1045,36 +754,34 @@ suitable for writing to a file.
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>data</code></em> :</span></p></td>
-<td>RSA private key data to be encrypted
-</td>
+<td>RSA private key data to be encrypted</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>in_password</code></em> :</span></p></td>
-<td>existing password to use, if any
+<td>existing password to use, if any. <span class="annotation">[<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>out_password</code></em> :</span></p></td>
 <td>if <em class="parameter"><code>in_password</code></em> was NULL, a random password will be generated
- and returned in this argument
+and returned in this argument. <span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>][<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>detailed error information on return, if an error occurred
-</td>
+<td>detailed error information on return, if an error occurred</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> on success, PEM-formatted data suitable for writing to a PEM-formatted
-certificate/private key file.
+<td>on success, PEM-formatted data suitable for writing to a PEM-formatted
+certificate/private key file. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_utils_wifi_freq_to_channel ()">
+<div class="refsect2">
 <a name="nm-utils-wifi-freq-to-channel"></a><h3>nm_utils_wifi_freq_to_channel ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_utils_wifi_freq_to_channel       (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> freq</code></em>);</pre>
 <p>
@@ -1085,19 +792,17 @@ Utility function to translate a WiFi frequency to its corresponding channel.
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>freq</code></em> :</span></p></td>
-<td>frequency
-</td>
+<td>frequency</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the channel represented by the frequency or 0
-</td>
+<td>the channel represented by the frequency or 0</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_utils_wifi_channel_to_freq ()">
+<div class="refsect2">
 <a name="nm-utils-wifi-channel-to-freq"></a><h3>nm_utils_wifi_channel_to_freq ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_utils_wifi_channel_to_freq       (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> channel</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *band</code></em>);</pre>
@@ -1109,26 +814,23 @@ Utility function to translate a WiFi channel to its corresponding frequency.
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>channel</code></em> :</span></p></td>
-<td>channel
-</td>
+<td>channel</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>band</code></em> :</span></p></td>
-<td>frequency band for wireless ("a" or "bg")
-</td>
+<td>frequency band for wireless ("a" or "bg")</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the frequency represented by the channel of the band,
-         or -1 when the freq is invalid, or 0 when the band
-         is invalid
-</td>
+<td>the frequency represented by the channel of the band,
+or -1 when the freq is invalid, or 0 when the band
+is invalid</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_utils_wifi_find_next_channel ()">
+<div class="refsect2">
 <a name="nm-utils-wifi-find-next-channel"></a><h3>nm_utils_wifi_find_next_channel ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_utils_wifi_find_next_channel     (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> channel</code></em>,
                                                          <em class="parameter"><code><span class="type">int</span> direction</code></em>,
@@ -1141,29 +843,25 @@ Utility function to find out next/previous WiFi channel for a channel.
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>channel</code></em> :</span></p></td>
-<td>current channel
-</td>
+<td>current channel</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>direction</code></em> :</span></p></td>
-<td>whether going downward (0 or less) or upward (1 or more)
-</td>
+<td>whether going downward (0 or less) or upward (1 or more)</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>band</code></em> :</span></p></td>
-<td>frequency band for wireless ("a" or "bg")
-</td>
+<td>frequency band for wireless ("a" or "bg")</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the next channel in the specified direction or 0
-</td>
+<td>the next channel in the specified direction or 0</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_utils_wifi_is_channel_valid ()">
+<div class="refsect2">
 <a name="nm-utils-wifi-is-channel-valid"></a><h3>nm_utils_wifi_is_channel_valid ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_utils_wifi_is_channel_valid      (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> channel</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *band</code></em>);</pre>
@@ -1175,18 +873,15 @@ Utility function to verify WiFi channel validity.
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>channel</code></em> :</span></p></td>
-<td>channel
-</td>
+<td>channel</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>band</code></em> :</span></p></td>
-<td>frequency band for wireless ("a" or "bg")
-</td>
+<td>frequency band for wireless ("a" or "bg")</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> TRUE or FALSE
-</td>
+<td>TRUE or FALSE</td>
 </tr>
 </tbody>
 </table></div>
@@ -1195,6 +890,6 @@ Utility function to verify WiFi channel validity.
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.15</div>
+          Generated by GTK-Doc V1.17</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/libnm-util.devhelp b/docs/libnm-util/html/libnm-util.devhelp
index 91d080b90..3fa339f1d 100644
--- a/docs/libnm-util/html/libnm-util.devhelp
+++ b/docs/libnm-util/html/libnm-util.devhelp
@@ -3,7 +3,6 @@
 <book xmlns="http://www.devhelp.net/book" title="libnm-util Reference Manual" link="index.html" author="" name="libnm-util">
   <chapters>
     <sub name="libnm-util API Reference" link="ch01.html">
-      <sub name="NMConnection" link="NMConnection.html"/>
       <sub name="NMSetting" link="NMSetting.html"/>
       <sub name="NMSettingConnection" link="NMSettingConnection.html"/>
       <sub name="NMSettingWired" link="NMSettingWired.html"/>
@@ -27,43 +26,6 @@
     <sub name="Annotation Glossary" link="annotation-glossary.html"/>
   </chapters>
   <functions>
-    <function name="enum NMConnectionScope" link="NMConnection.html#NMConnectionScope"/>
-    <function name="enum NMConnectionError" link="NMConnection.html#NMConnectionError"/>
-    <function name="NM_TYPE_CONNECTION_ERROR" link="NMConnection.html#NM-TYPE-CONNECTION-ERROR:CAPS"/>
-    <function name="NM_CONNECTION_ERROR" link="NMConnection.html#NM-CONNECTION-ERROR:CAPS"/>
-    <function name="nm_connection_error_quark ()" link="NMConnection.html#nm-connection-error-quark"/>
-    <function name="NM_CONNECTION_SCOPE" link="NMConnection.html#NM-CONNECTION-SCOPE:CAPS"/>
-    <function name="NM_CONNECTION_PATH" link="NMConnection.html#NM-CONNECTION-PATH:CAPS"/>
-    <function name="NMConnection" link="NMConnection.html#NMConnection-struct"/>
-    <function name="NMConnectionClass" link="NMConnection.html#NMConnectionClass"/>
-    <function name="nm_connection_get_type ()" link="NMConnection.html#nm-connection-get-type"/>
-    <function name="nm_connection_new ()" link="NMConnection.html#nm-connection-new"/>
-    <function name="nm_connection_new_from_hash ()" link="NMConnection.html#nm-connection-new-from-hash"/>
-    <function name="nm_connection_duplicate ()" link="NMConnection.html#nm-connection-duplicate"/>
-    <function name="nm_connection_add_setting ()" link="NMConnection.html#nm-connection-add-setting"/>
-    <function name="nm_connection_remove_setting ()" link="NMConnection.html#nm-connection-remove-setting"/>
-    <function name="nm_connection_get_setting ()" link="NMConnection.html#nm-connection-get-setting"/>
-    <function name="nm_connection_get_setting_by_name ()" link="NMConnection.html#nm-connection-get-setting-by-name"/>
-    <function name="nm_connection_replace_settings ()" link="NMConnection.html#nm-connection-replace-settings"/>
-    <function name="nm_connection_compare ()" link="NMConnection.html#nm-connection-compare"/>
-    <function name="nm_connection_diff ()" link="NMConnection.html#nm-connection-diff"/>
-    <function name="nm_connection_verify ()" link="NMConnection.html#nm-connection-verify"/>
-    <function name="nm_connection_need_secrets ()" link="NMConnection.html#nm-connection-need-secrets"/>
-    <function name="nm_connection_clear_secrets ()" link="NMConnection.html#nm-connection-clear-secrets"/>
-    <function name="nm_connection_update_secrets ()" link="NMConnection.html#nm-connection-update-secrets"/>
-    <function name="nm_connection_set_scope ()" link="NMConnection.html#nm-connection-set-scope"/>
-    <function name="nm_connection_get_scope ()" link="NMConnection.html#nm-connection-get-scope"/>
-    <function name="nm_connection_set_path ()" link="NMConnection.html#nm-connection-set-path"/>
-    <function name="nm_connection_get_path ()" link="NMConnection.html#nm-connection-get-path"/>
-    <function name="nm_connection_for_each_setting_value ()" link="NMConnection.html#nm-connection-for-each-setting-value"/>
-    <function name="nm_connection_to_hash ()" link="NMConnection.html#nm-connection-to-hash"/>
-    <function name="nm_connection_dump ()" link="NMConnection.html#nm-connection-dump"/>
-    <function name="nm_connection_create_setting ()" link="NMConnection.html#nm-connection-create-setting"/>
-    <function name="nm_connection_lookup_setting_type ()" link="NMConnection.html#nm-connection-lookup-setting-type"/>
-    <function name="nm_connection_lookup_setting_type_by_quark ()" link="NMConnection.html#nm-connection-lookup-setting-type-by-quark"/>
-    <function name="The &quot;path&quot; property" link="NMConnection.html#NMConnection--path"/>
-    <function name="The &quot;scope&quot; property" link="NMConnection.html#NMConnection--scope"/>
-    <function name="The &quot;secrets-updated&quot; signal" link="NMConnection.html#NMConnection-secrets-updated"/>
     <function name="enum NMSettingError" link="NMSetting.html#NMSettingError"/>
     <function name="NM_TYPE_SETTING_ERROR" link="NMSetting.html#NM-TYPE-SETTING-ERROR:CAPS"/>
     <function name="NM_SETTING_ERROR" link="NMSetting.html#NM-SETTING-ERROR:CAPS"/>
@@ -73,10 +35,12 @@
     <function name="NM_SETTING_PARAM_SECRET" link="NMSetting.html#NM-SETTING-PARAM-SECRET:CAPS"/>
     <function name="NM_SETTING_PARAM_FUZZY_IGNORE" link="NMSetting.html#NM-SETTING-PARAM-FUZZY-IGNORE:CAPS"/>
     <function name="NM_SETTING_NAME" link="NMSetting.html#NM-SETTING-NAME:CAPS"/>
+    <function name="enum NMSettingSecretFlags" link="NMSetting.html#NMSettingSecretFlags"/>
     <function name="NMSetting" link="NMSetting.html#NMSetting-struct"/>
     <function name="NMSettingClass" link="NMSetting.html#NMSettingClass"/>
     <function name="NMSettingValueIterFn ()" link="NMSetting.html#NMSettingValueIterFn"/>
     <function name="nm_setting_get_type ()" link="NMSetting.html#nm-setting-get-type"/>
+    <function name="enum NMSettingHashFlags" link="NMSetting.html#NMSettingHashFlags"/>
     <function name="nm_setting_to_hash ()" link="NMSetting.html#nm-setting-to-hash"/>
     <function name="nm_setting_new_from_hash ()" link="NMSetting.html#nm-setting-new-from-hash"/>
     <function name="nm_setting_duplicate ()" link="NMSetting.html#nm-setting-duplicate"/>
@@ -91,6 +55,8 @@
     <function name="nm_setting_clear_secrets ()" link="NMSetting.html#nm-setting-clear-secrets"/>
     <function name="nm_setting_need_secrets ()" link="NMSetting.html#nm-setting-need-secrets"/>
     <function name="nm_setting_update_secrets ()" link="NMSetting.html#nm-setting-update-secrets"/>
+    <function name="nm_setting_get_secret_flags ()" link="NMSetting.html#nm-setting-get-secret-flags"/>
+    <function name="nm_setting_set_secret_flags ()" link="NMSetting.html#nm-setting-set-secret-flags"/>
     <function name="The &quot;name&quot; property" link="NMSetting.html#NMSetting--name"/>
     <function name="NM_SETTING_CONNECTION_SETTING_NAME" link="NMSettingConnection.html#NM-SETTING-CONNECTION-SETTING-NAME:CAPS"/>
     <function name="enum NMSettingConnectionError" link="NMSettingConnection.html#NMSettingConnectionError"/>
@@ -103,6 +69,7 @@
     <function name="NM_SETTING_CONNECTION_AUTOCONNECT" link="NMSettingConnection.html#NM-SETTING-CONNECTION-AUTOCONNECT:CAPS"/>
     <function name="NM_SETTING_CONNECTION_TIMESTAMP" link="NMSettingConnection.html#NM-SETTING-CONNECTION-TIMESTAMP:CAPS"/>
     <function name="NM_SETTING_CONNECTION_READ_ONLY" link="NMSettingConnection.html#NM-SETTING-CONNECTION-READ-ONLY:CAPS"/>
+    <function name="NM_SETTING_CONNECTION_PERMISSIONS" link="NMSettingConnection.html#NM-SETTING-CONNECTION-PERMISSIONS:CAPS"/>
     <function name="NMSettingConnection" link="NMSettingConnection.html#NMSettingConnection-struct"/>
     <function name="NMSettingConnectionClass" link="NMSettingConnection.html#NMSettingConnectionClass"/>
     <function name="nm_setting_connection_get_type ()" link="NMSettingConnection.html#nm-setting-connection-get-type"/>
@@ -113,8 +80,14 @@
     <function name="nm_setting_connection_get_autoconnect ()" link="NMSettingConnection.html#nm-setting-connection-get-autoconnect"/>
     <function name="nm_setting_connection_get_timestamp ()" link="NMSettingConnection.html#nm-setting-connection-get-timestamp"/>
     <function name="nm_setting_connection_get_read_only ()" link="NMSettingConnection.html#nm-setting-connection-get-read-only"/>
+    <function name="nm_setting_connection_get_num_permissions ()" link="NMSettingConnection.html#nm-setting-connection-get-num-permissions"/>
+    <function name="nm_setting_connection_get_permission ()" link="NMSettingConnection.html#nm-setting-connection-get-permission"/>
+    <function name="nm_setting_connection_permissions_user_allowed ()" link="NMSettingConnection.html#nm-setting-connection-permissions-user-allowed"/>
+    <function name="nm_setting_connection_add_permission ()" link="NMSettingConnection.html#nm-setting-connection-add-permission"/>
+    <function name="nm_setting_connection_remove_permission ()" link="NMSettingConnection.html#nm-setting-connection-remove-permission"/>
     <function name="The &quot;autoconnect&quot; property" link="NMSettingConnection.html#NMSettingConnection--autoconnect"/>
     <function name="The &quot;id&quot; property" link="NMSettingConnection.html#NMSettingConnection--id"/>
+    <function name="The &quot;permissions&quot; property" link="NMSettingConnection.html#NMSettingConnection--permissions"/>
     <function name="The &quot;read-only&quot; property" link="NMSettingConnection.html#NMSettingConnection--read-only"/>
     <function name="The &quot;timestamp&quot; property" link="NMSettingConnection.html#NMSettingConnection--timestamp"/>
     <function name="The &quot;type&quot; property" link="NMSettingConnection.html#NMSettingConnection--type"/>
@@ -179,6 +152,8 @@
     <function name="NM_SETTING_WIRELESS_MTU" link="NMSettingWireless.html#NM-SETTING-WIRELESS-MTU:CAPS"/>
     <function name="NM_SETTING_WIRELESS_SEEN_BSSIDS" link="NMSettingWireless.html#NM-SETTING-WIRELESS-SEEN-BSSIDS:CAPS"/>
     <function name="NM_SETTING_WIRELESS_SEC" link="NMSettingWireless.html#NM-SETTING-WIRELESS-SEC:CAPS"/>
+    <function name="NM_SETTING_WIRELESS_MODE_ADHOC" link="NMSettingWireless.html#NM-SETTING-WIRELESS-MODE-ADHOC:CAPS"/>
+    <function name="NM_SETTING_WIRELESS_MODE_INFRA" link="NMSettingWireless.html#NM-SETTING-WIRELESS-MODE-INFRA:CAPS"/>
     <function name="NMSettingWireless" link="NMSettingWireless.html#NMSettingWireless-struct"/>
     <function name="NMSettingWirelessClass" link="NMSettingWireless.html#NMSettingWirelessClass"/>
     <function name="nm_setting_wireless_get_type ()" link="NMSettingWireless.html#nm-setting-wireless-get-type"/>
@@ -227,9 +202,12 @@
     <function name="NM_SETTING_WIRELESS_SECURITY_WEP_KEY1" link="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-WEP-KEY1:CAPS"/>
     <function name="NM_SETTING_WIRELESS_SECURITY_WEP_KEY2" link="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-WEP-KEY2:CAPS"/>
     <function name="NM_SETTING_WIRELESS_SECURITY_WEP_KEY3" link="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-WEP-KEY3:CAPS"/>
+    <function name="NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS" link="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-WEP-KEY-FLAGS:CAPS"/>
+    <function name="NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE" link="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-WEP-KEY-TYPE:CAPS"/>
     <function name="NM_SETTING_WIRELESS_SECURITY_PSK" link="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-PSK:CAPS"/>
+    <function name="NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS" link="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-PSK-FLAGS:CAPS"/>
     <function name="NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD" link="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-LEAP-PASSWORD:CAPS"/>
-    <function name="NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE" link="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-WEP-KEY-TYPE:CAPS"/>
+    <function name="NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS" link="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-LEAP-PASSWORD-FLAGS:CAPS"/>
     <function name="NMSettingWirelessSecurity" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity-struct"/>
     <function name="NMSettingWirelessSecurityClass" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurityClass"/>
     <function name="nm_setting_wireless_security_get_type ()" link="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-type"/>
@@ -251,21 +229,27 @@
     <function name="nm_setting_wireless_security_remove_group ()" link="NMSettingWirelessSecurity.html#nm-setting-wireless-security-remove-group"/>
     <function name="nm_setting_wireless_security_clear_groups ()" link="NMSettingWirelessSecurity.html#nm-setting-wireless-security-clear-groups"/>
     <function name="nm_setting_wireless_security_get_psk ()" link="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-psk"/>
+    <function name="nm_setting_wireless_security_get_psk_flags ()" link="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-psk-flags"/>
     <function name="nm_setting_wireless_security_get_leap_username ()" link="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-leap-username"/>
     <function name="nm_setting_wireless_security_get_leap_password ()" link="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-leap-password"/>
+    <function name="nm_setting_wireless_security_get_leap_password_flags ()" link="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-leap-password-flags"/>
     <function name="nm_setting_wireless_security_get_wep_key ()" link="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-wep-key"/>
     <function name="nm_setting_wireless_security_set_wep_key ()" link="NMSettingWirelessSecurity.html#nm-setting-wireless-security-set-wep-key"/>
     <function name="nm_setting_wireless_security_get_wep_tx_keyidx ()" link="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-wep-tx-keyidx"/>
     <function name="nm_setting_wireless_security_get_auth_alg ()" link="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-auth-alg"/>
+    <function name="nm_setting_wireless_security_get_wep_key_flags ()" link="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-wep-key-flags"/>
     <function name="nm_setting_wireless_security_get_wep_key_type ()" link="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-wep-key-type"/>
     <function name="The &quot;auth-alg&quot; property" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--auth-alg"/>
     <function name="The &quot;group&quot; property" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--group"/>
     <function name="The &quot;key-mgmt&quot; property" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--key-mgmt"/>
     <function name="The &quot;leap-password&quot; property" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--leap-password"/>
+    <function name="The &quot;leap-password-flags&quot; property" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--leap-password-flags"/>
     <function name="The &quot;leap-username&quot; property" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--leap-username"/>
     <function name="The &quot;pairwise&quot; property" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--pairwise"/>
     <function name="The &quot;proto&quot; property" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--proto"/>
     <function name="The &quot;psk&quot; property" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--psk"/>
+    <function name="The &quot;psk-flags&quot; property" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--psk-flags"/>
+    <function name="The &quot;wep-key-flags&quot; property" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--wep-key-flags"/>
     <function name="The &quot;wep-key-type&quot; property" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--wep-key-type"/>
     <function name="The &quot;wep-key0&quot; property" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--wep-key0"/>
     <function name="The &quot;wep-key1&quot; property" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--wep-key1"/>
@@ -321,6 +305,7 @@
     <function name="NM_SETTING_CDMA_NUMBER" link="NMSettingCdma.html#NM-SETTING-CDMA-NUMBER:CAPS"/>
     <function name="NM_SETTING_CDMA_USERNAME" link="NMSettingCdma.html#NM-SETTING-CDMA-USERNAME:CAPS"/>
     <function name="NM_SETTING_CDMA_PASSWORD" link="NMSettingCdma.html#NM-SETTING-CDMA-PASSWORD:CAPS"/>
+    <function name="NM_SETTING_CDMA_PASSWORD_FLAGS" link="NMSettingCdma.html#NM-SETTING-CDMA-PASSWORD-FLAGS:CAPS"/>
     <function name="NMSettingCdma" link="NMSettingCdma.html#NMSettingCdma-struct"/>
     <function name="NMSettingCdmaClass" link="NMSettingCdma.html#NMSettingCdmaClass"/>
     <function name="nm_setting_cdma_get_type ()" link="NMSettingCdma.html#nm-setting-cdma-get-type"/>
@@ -328,8 +313,10 @@
     <function name="nm_setting_cdma_get_number ()" link="NMSettingCdma.html#nm-setting-cdma-get-number"/>
     <function name="nm_setting_cdma_get_username ()" link="NMSettingCdma.html#nm-setting-cdma-get-username"/>
     <function name="nm_setting_cdma_get_password ()" link="NMSettingCdma.html#nm-setting-cdma-get-password"/>
+    <function name="nm_setting_cdma_get_password_flags ()" link="NMSettingCdma.html#nm-setting-cdma-get-password-flags"/>
     <function name="The &quot;number&quot; property" link="NMSettingCdma.html#NMSettingCdma--number"/>
     <function name="The &quot;password&quot; property" link="NMSettingCdma.html#NMSettingCdma--password"/>
+    <function name="The &quot;password-flags&quot; property" link="NMSettingCdma.html#NMSettingCdma--password-flags"/>
     <function name="The &quot;username&quot; property" link="NMSettingCdma.html#NMSettingCdma--username"/>
     <function name="NM_SETTING_GSM_SETTING_NAME" link="NMSettingGsm.html#NM-SETTING-GSM-SETTING-NAME:CAPS"/>
     <function name="enum NMSettingGsmError" link="NMSettingGsm.html#NMSettingGsmError"/>
@@ -339,19 +326,14 @@
     <function name="NM_SETTING_GSM_NUMBER" link="NMSettingGsm.html#NM-SETTING-GSM-NUMBER:CAPS"/>
     <function name="NM_SETTING_GSM_USERNAME" link="NMSettingGsm.html#NM-SETTING-GSM-USERNAME:CAPS"/>
     <function name="NM_SETTING_GSM_PASSWORD" link="NMSettingGsm.html#NM-SETTING-GSM-PASSWORD:CAPS"/>
+    <function name="NM_SETTING_GSM_PASSWORD_FLAGS" link="NMSettingGsm.html#NM-SETTING-GSM-PASSWORD-FLAGS:CAPS"/>
     <function name="NM_SETTING_GSM_APN" link="NMSettingGsm.html#NM-SETTING-GSM-APN:CAPS"/>
     <function name="NM_SETTING_GSM_NETWORK_ID" link="NMSettingGsm.html#NM-SETTING-GSM-NETWORK-ID:CAPS"/>
     <function name="NM_SETTING_GSM_NETWORK_TYPE" link="NMSettingGsm.html#NM-SETTING-GSM-NETWORK-TYPE:CAPS"/>
     <function name="NM_SETTING_GSM_ALLOWED_BANDS" link="NMSettingGsm.html#NM-SETTING-GSM-ALLOWED-BANDS:CAPS"/>
     <function name="NM_SETTING_GSM_PIN" link="NMSettingGsm.html#NM-SETTING-GSM-PIN:CAPS"/>
+    <function name="NM_SETTING_GSM_PIN_FLAGS" link="NMSettingGsm.html#NM-SETTING-GSM-PIN-FLAGS:CAPS"/>
     <function name="NM_SETTING_GSM_HOME_ONLY" link="NMSettingGsm.html#NM-SETTING-GSM-HOME-ONLY:CAPS"/>
-    <function name="NM_SETTING_GSM_PUK" link="NMSettingGsm.html#NM-SETTING-GSM-PUK:CAPS"/>
-    <function name="NM_SETTING_GSM_BAND" link="NMSettingGsm.html#NM-SETTING-GSM-BAND:CAPS"/>
-    <function name="NM_GSM_NETWORK_ANY" link="NMSettingGsm.html#NM-GSM-NETWORK-ANY:CAPS"/>
-    <function name="NM_GSM_NETWORK_UMTS_HSPA" link="NMSettingGsm.html#NM-GSM-NETWORK-UMTS-HSPA:CAPS"/>
-    <function name="NM_GSM_NETWORK_GPRS_EDGE" link="NMSettingGsm.html#NM-GSM-NETWORK-GPRS-EDGE:CAPS"/>
-    <function name="NM_GSM_NETWORK_PREFER_UMTS_HSPA" link="NMSettingGsm.html#NM-GSM-NETWORK-PREFER-UMTS-HSPA:CAPS"/>
-    <function name="NM_GSM_NETWORK_PREFER_GPRS_EDGE" link="NMSettingGsm.html#NM-GSM-NETWORK-PREFER-GPRS-EDGE:CAPS"/>
     <function name="enum NMSettingGsmNetworkType" link="NMSettingGsm.html#NMSettingGsmNetworkType"/>
     <function name="enum NMSettingGsmNetworkBand" link="NMSettingGsm.html#NMSettingGsmNetworkBand"/>
     <function name="NMSettingGsm" link="NMSettingGsm.html#NMSettingGsm-struct"/>
@@ -367,18 +349,18 @@
     <function name="nm_setting_gsm_get_allowed_bands ()" link="NMSettingGsm.html#nm-setting-gsm-get-allowed-bands"/>
     <function name="nm_setting_gsm_get_pin ()" link="NMSettingGsm.html#nm-setting-gsm-get-pin"/>
     <function name="nm_setting_gsm_get_home_only ()" link="NMSettingGsm.html#nm-setting-gsm-get-home-only"/>
-    <function name="nm_setting_gsm_get_puk ()" link="NMSettingGsm.html#nm-setting-gsm-get-puk"/>
-    <function name="nm_setting_gsm_get_band ()" link="NMSettingGsm.html#nm-setting-gsm-get-band"/>
+    <function name="nm_setting_gsm_get_pin_flags ()" link="NMSettingGsm.html#nm-setting-gsm-get-pin-flags"/>
+    <function name="nm_setting_gsm_get_password_flags ()" link="NMSettingGsm.html#nm-setting-gsm-get-password-flags"/>
     <function name="The &quot;allowed-bands&quot; property" link="NMSettingGsm.html#NMSettingGsm--allowed-bands"/>
     <function name="The &quot;apn&quot; property" link="NMSettingGsm.html#NMSettingGsm--apn"/>
-    <function name="The &quot;band&quot; property" link="NMSettingGsm.html#NMSettingGsm--band"/>
     <function name="The &quot;home-only&quot; property" link="NMSettingGsm.html#NMSettingGsm--home-only"/>
     <function name="The &quot;network-id&quot; property" link="NMSettingGsm.html#NMSettingGsm--network-id"/>
     <function name="The &quot;network-type&quot; property" link="NMSettingGsm.html#NMSettingGsm--network-type"/>
     <function name="The &quot;number&quot; property" link="NMSettingGsm.html#NMSettingGsm--number"/>
     <function name="The &quot;password&quot; property" link="NMSettingGsm.html#NMSettingGsm--password"/>
+    <function name="The &quot;password-flags&quot; property" link="NMSettingGsm.html#NMSettingGsm--password-flags"/>
     <function name="The &quot;pin&quot; property" link="NMSettingGsm.html#NMSettingGsm--pin"/>
-    <function name="The &quot;puk&quot; property" link="NMSettingGsm.html#NMSettingGsm--puk"/>
+    <function name="The &quot;pin-flags&quot; property" link="NMSettingGsm.html#NMSettingGsm--pin-flags"/>
     <function name="The &quot;username&quot; property" link="NMSettingGsm.html#NMSettingGsm--username"/>
     <function name="NM_SETTING_OLPC_MESH_SETTING_NAME" link="NMSettingOlpcMesh.html#NM-SETTING-OLPC-MESH-SETTING-NAME:CAPS"/>
     <function name="enum NMSettingOlpcMeshError" link="NMSettingOlpcMesh.html#NMSettingOlpcMeshError"/>
@@ -420,12 +402,15 @@
     <function name="NM_SETTING_802_1X_PHASE2_CA_PATH" link="NMSetting8021x.html#NM-SETTING-802-1X-PHASE2-CA-PATH:CAPS"/>
     <function name="NM_SETTING_802_1X_PHASE2_CLIENT_CERT" link="NMSetting8021x.html#NM-SETTING-802-1X-PHASE2-CLIENT-CERT:CAPS"/>
     <function name="NM_SETTING_802_1X_PASSWORD" link="NMSetting8021x.html#NM-SETTING-802-1X-PASSWORD:CAPS"/>
+    <function name="NM_SETTING_802_1X_PASSWORD_FLAGS" link="NMSetting8021x.html#NM-SETTING-802-1X-PASSWORD-FLAGS:CAPS"/>
     <function name="NM_SETTING_802_1X_PRIVATE_KEY" link="NMSetting8021x.html#NM-SETTING-802-1X-PRIVATE-KEY:CAPS"/>
     <function name="NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD" link="NMSetting8021x.html#NM-SETTING-802-1X-PRIVATE-KEY-PASSWORD:CAPS"/>
+    <function name="NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS" link="NMSetting8021x.html#NM-SETTING-802-1X-PRIVATE-KEY-PASSWORD-FLAGS:CAPS"/>
     <function name="NM_SETTING_802_1X_PHASE2_PRIVATE_KEY" link="NMSetting8021x.html#NM-SETTING-802-1X-PHASE2-PRIVATE-KEY:CAPS"/>
     <function name="NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD" link="NMSetting8021x.html#NM-SETTING-802-1X-PHASE2-PRIVATE-KEY-PASSWORD:CAPS"/>
+    <function name="NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS" link="NMSetting8021x.html#NM-SETTING-802-1X-PHASE2-PRIVATE-KEY-PASSWORD-FLAGS:CAPS"/>
     <function name="NM_SETTING_802_1X_PIN" link="NMSetting8021x.html#NM-SETTING-802-1X-PIN:CAPS"/>
-    <function name="NM_SETTING_802_1X_PSK" link="NMSetting8021x.html#NM-SETTING-802-1X-PSK:CAPS"/>
+    <function name="NM_SETTING_802_1X_PIN_FLAGS" link="NMSetting8021x.html#NM-SETTING-802-1X-PIN-FLAGS:CAPS"/>
     <function name="NM_SETTING_802_1X_SYSTEM_CA_CERTS" link="NMSetting8021x.html#NM-SETTING-802-1X-SYSTEM-CA-CERTS:CAPS"/>
     <function name="NMSetting8021x" link="NMSetting8021x.html#NMSetting8021x-struct"/>
     <function name="NMSetting8021xClass" link="NMSetting8021x.html#NMSetting8021xClass"/>
@@ -463,35 +448,23 @@
     <function name="nm_setting_802_1x_get_phase2_client_cert_path ()" link="NMSetting8021x.html#nm-setting-802-1x-get-phase2-client-cert-path"/>
     <function name="nm_setting_802_1x_set_phase2_client_cert ()" link="NMSetting8021x.html#nm-setting-802-1x-set-phase2-client-cert"/>
     <function name="nm_setting_802_1x_get_password ()" link="NMSetting8021x.html#nm-setting-802-1x-get-password"/>
+    <function name="nm_setting_802_1x_get_password_flags ()" link="NMSetting8021x.html#nm-setting-802-1x-get-password-flags"/>
     <function name="nm_setting_802_1x_get_pin ()" link="NMSetting8021x.html#nm-setting-802-1x-get-pin"/>
-    <function name="nm_setting_802_1x_get_psk ()" link="NMSetting8021x.html#nm-setting-802-1x-get-psk"/>
+    <function name="nm_setting_802_1x_get_pin_flags ()" link="NMSetting8021x.html#nm-setting-802-1x-get-pin-flags"/>
     <function name="nm_setting_802_1x_get_private_key_scheme ()" link="NMSetting8021x.html#nm-setting-802-1x-get-private-key-scheme"/>
     <function name="nm_setting_802_1x_get_private_key_blob ()" link="NMSetting8021x.html#nm-setting-802-1x-get-private-key-blob"/>
     <function name="nm_setting_802_1x_get_private_key_path ()" link="NMSetting8021x.html#nm-setting-802-1x-get-private-key-path"/>
     <function name="nm_setting_802_1x_set_private_key ()" link="NMSetting8021x.html#nm-setting-802-1x-set-private-key"/>
     <function name="nm_setting_802_1x_get_private_key_password ()" link="NMSetting8021x.html#nm-setting-802-1x-get-private-key-password"/>
+    <function name="nm_setting_802_1x_get_private_key_password_flags ()" link="NMSetting8021x.html#nm-setting-802-1x-get-private-key-password-flags"/>
     <function name="nm_setting_802_1x_get_private_key_format ()" link="NMSetting8021x.html#nm-setting-802-1x-get-private-key-format"/>
     <function name="nm_setting_802_1x_get_phase2_private_key_scheme ()" link="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-scheme"/>
     <function name="nm_setting_802_1x_get_phase2_private_key_blob ()" link="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-blob"/>
     <function name="nm_setting_802_1x_get_phase2_private_key_path ()" link="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-path"/>
     <function name="nm_setting_802_1x_set_phase2_private_key ()" link="NMSetting8021x.html#nm-setting-802-1x-set-phase2-private-key"/>
     <function name="nm_setting_802_1x_get_phase2_private_key_password ()" link="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-password"/>
+    <function name="nm_setting_802_1x_get_phase2_private_key_password_flags ()" link="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-password-flags"/>
     <function name="nm_setting_802_1x_get_phase2_private_key_format ()" link="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-format"/>
-    <function name="enum NMSetting8021xCKType" link="NMSetting8021x.html#NMSetting8021xCKType"/>
-    <function name="nm_setting_802_1x_get_ca_cert ()" link="NMSetting8021x.html#nm-setting-802-1x-get-ca-cert"/>
-    <function name="nm_setting_802_1x_set_ca_cert_from_file ()" link="NMSetting8021x.html#nm-setting-802-1x-set-ca-cert-from-file"/>
-    <function name="nm_setting_802_1x_get_client_cert ()" link="NMSetting8021x.html#nm-setting-802-1x-get-client-cert"/>
-    <function name="nm_setting_802_1x_set_client_cert_from_file ()" link="NMSetting8021x.html#nm-setting-802-1x-set-client-cert-from-file"/>
-    <function name="nm_setting_802_1x_get_phase2_ca_cert ()" link="NMSetting8021x.html#nm-setting-802-1x-get-phase2-ca-cert"/>
-    <function name="nm_setting_802_1x_set_phase2_ca_cert_from_file ()" link="NMSetting8021x.html#nm-setting-802-1x-set-phase2-ca-cert-from-file"/>
-    <function name="nm_setting_802_1x_get_phase2_client_cert ()" link="NMSetting8021x.html#nm-setting-802-1x-get-phase2-client-cert"/>
-    <function name="nm_setting_802_1x_set_phase2_client_cert_from_file ()" link="NMSetting8021x.html#nm-setting-802-1x-set-phase2-client-cert-from-file"/>
-    <function name="nm_setting_802_1x_get_private_key ()" link="NMSetting8021x.html#nm-setting-802-1x-get-private-key"/>
-    <function name="nm_setting_802_1x_set_private_key_from_file ()" link="NMSetting8021x.html#nm-setting-802-1x-set-private-key-from-file"/>
-    <function name="nm_setting_802_1x_get_private_key_type ()" link="NMSetting8021x.html#nm-setting-802-1x-get-private-key-type"/>
-    <function name="nm_setting_802_1x_get_phase2_private_key ()" link="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key"/>
-    <function name="nm_setting_802_1x_set_phase2_private_key_from_file ()" link="NMSetting8021x.html#nm-setting-802-1x-set-phase2-private-key-from-file"/>
-    <function name="nm_setting_802_1x_get_phase2_private_key_type ()" link="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-type"/>
     <function name="The &quot;anonymous-identity&quot; property" link="NMSetting8021x.html#NMSetting8021x--anonymous-identity"/>
     <function name="The &quot;ca-cert&quot; property" link="NMSetting8021x.html#NMSetting8021x--ca-cert"/>
     <function name="The &quot;ca-path&quot; property" link="NMSetting8021x.html#NMSetting8021x--ca-path"/>
@@ -499,6 +472,7 @@
     <function name="The &quot;eap&quot; property" link="NMSetting8021x.html#NMSetting8021x--eap"/>
     <function name="The &quot;identity&quot; property" link="NMSetting8021x.html#NMSetting8021x--identity"/>
     <function name="The &quot;password&quot; property" link="NMSetting8021x.html#NMSetting8021x--password"/>
+    <function name="The &quot;password-flags&quot; property" link="NMSetting8021x.html#NMSetting8021x--password-flags"/>
     <function name="The &quot;phase1-fast-provisioning&quot; property" link="NMSetting8021x.html#NMSetting8021x--phase1-fast-provisioning"/>
     <function name="The &quot;phase1-peaplabel&quot; property" link="NMSetting8021x.html#NMSetting8021x--phase1-peaplabel"/>
     <function name="The &quot;phase1-peapver&quot; property" link="NMSetting8021x.html#NMSetting8021x--phase1-peapver"/>
@@ -509,8 +483,10 @@
     <function name="The &quot;phase2-client-cert&quot; property" link="NMSetting8021x.html#NMSetting8021x--phase2-client-cert"/>
     <function name="The &quot;phase2-private-key&quot; property" link="NMSetting8021x.html#NMSetting8021x--phase2-private-key"/>
     <function name="The &quot;phase2-private-key-password&quot; property" link="NMSetting8021x.html#NMSetting8021x--phase2-private-key-password"/>
+    <function name="The &quot;phase2-private-key-password-flags&quot; property" link="NMSetting8021x.html#NMSetting8021x--phase2-private-key-password-flags"/>
     <function name="The &quot;private-key&quot; property" link="NMSetting8021x.html#NMSetting8021x--private-key"/>
     <function name="The &quot;private-key-password&quot; property" link="NMSetting8021x.html#NMSetting8021x--private-key-password"/>
+    <function name="The &quot;private-key-password-flags&quot; property" link="NMSetting8021x.html#NMSetting8021x--private-key-password-flags"/>
     <function name="The &quot;system-ca-certs&quot; property" link="NMSetting8021x.html#NMSetting8021x--system-ca-certs"/>
     <function name="NM_SETTING_IP4_CONFIG_SETTING_NAME" link="NMSettingIP4Config.html#NM-SETTING-IP4-CONFIG-SETTING-NAME:CAPS"/>
     <function name="enum NMSettingIP4ConfigError" link="NMSettingIP4Config.html#NMSettingIP4ConfigError"/>
@@ -535,6 +511,7 @@
     <function name="NM_SETTING_IP4_CONFIG_METHOD_SHARED" link="NMSettingIP4Config.html#NM-SETTING-IP4-CONFIG-METHOD-SHARED:CAPS"/>
     <function name="NM_SETTING_IP4_CONFIG_METHOD_DISABLED" link="NMSettingIP4Config.html#NM-SETTING-IP4-CONFIG-METHOD-DISABLED:CAPS"/>
     <function name="NMIP4Address" link="NMSettingIP4Config.html#NMIP4Address"/>
+    <function name="nm_ip4_address_get_type ()" link="NMSettingIP4Config.html#nm-ip4-address-get-type"/>
     <function name="nm_ip4_address_new ()" link="NMSettingIP4Config.html#nm-ip4-address-new"/>
     <function name="nm_ip4_address_dup ()" link="NMSettingIP4Config.html#nm-ip4-address-dup"/>
     <function name="nm_ip4_address_ref ()" link="NMSettingIP4Config.html#nm-ip4-address-ref"/>
@@ -547,6 +524,7 @@
     <function name="nm_ip4_address_get_gateway ()" link="NMSettingIP4Config.html#nm-ip4-address-get-gateway"/>
     <function name="nm_ip4_address_set_gateway ()" link="NMSettingIP4Config.html#nm-ip4-address-set-gateway"/>
     <function name="NMIP4Route" link="NMSettingIP4Config.html#NMIP4Route"/>
+    <function name="nm_ip4_route_get_type ()" link="NMSettingIP4Config.html#nm-ip4-route-get-type"/>
     <function name="nm_ip4_route_new ()" link="NMSettingIP4Config.html#nm-ip4-route-new"/>
     <function name="nm_ip4_route_dup ()" link="NMSettingIP4Config.html#nm-ip4-route-dup"/>
     <function name="nm_ip4_route_ref ()" link="NMSettingIP4Config.html#nm-ip4-route-ref"/>
@@ -625,6 +603,7 @@
     <function name="NM_SETTING_IP6_CONFIG_METHOD_MANUAL" link="NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-METHOD-MANUAL:CAPS"/>
     <function name="NM_SETTING_IP6_CONFIG_METHOD_SHARED" link="NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-METHOD-SHARED:CAPS"/>
     <function name="NMIP6Address" link="NMSettingIP6Config.html#NMIP6Address"/>
+    <function name="nm_ip6_address_get_type ()" link="NMSettingIP6Config.html#nm-ip6-address-get-type"/>
     <function name="nm_ip6_address_new ()" link="NMSettingIP6Config.html#nm-ip6-address-new"/>
     <function name="nm_ip6_address_dup ()" link="NMSettingIP6Config.html#nm-ip6-address-dup"/>
     <function name="nm_ip6_address_ref ()" link="NMSettingIP6Config.html#nm-ip6-address-ref"/>
@@ -637,6 +616,7 @@
     <function name="nm_ip6_address_get_gateway ()" link="NMSettingIP6Config.html#nm-ip6-address-get-gateway"/>
     <function name="nm_ip6_address_set_gateway ()" link="NMSettingIP6Config.html#nm-ip6-address-set-gateway"/>
     <function name="NMIP6Route" link="NMSettingIP6Config.html#NMIP6Route"/>
+    <function name="nm_ip6_route_get_type ()" link="NMSettingIP6Config.html#nm-ip6-route-get-type"/>
     <function name="nm_ip6_route_new ()" link="NMSettingIP6Config.html#nm-ip6-route-new"/>
     <function name="nm_ip6_route_dup ()" link="NMSettingIP6Config.html#nm-ip6-route-dup"/>
     <function name="nm_ip6_route_ref ()" link="NMSettingIP6Config.html#nm-ip6-route-ref"/>
@@ -759,6 +739,7 @@
     <function name="NM_SETTING_PPPOE_SERVICE" link="NMSettingPPPOE.html#NM-SETTING-PPPOE-SERVICE:CAPS"/>
     <function name="NM_SETTING_PPPOE_USERNAME" link="NMSettingPPPOE.html#NM-SETTING-PPPOE-USERNAME:CAPS"/>
     <function name="NM_SETTING_PPPOE_PASSWORD" link="NMSettingPPPOE.html#NM-SETTING-PPPOE-PASSWORD:CAPS"/>
+    <function name="NM_SETTING_PPPOE_PASSWORD_FLAGS" link="NMSettingPPPOE.html#NM-SETTING-PPPOE-PASSWORD-FLAGS:CAPS"/>
     <function name="NMSettingPPPOE" link="NMSettingPPPOE.html#NMSettingPPPOE-struct"/>
     <function name="NMSettingPPPOEClass" link="NMSettingPPPOE.html#NMSettingPPPOEClass"/>
     <function name="nm_setting_pppoe_get_type ()" link="NMSettingPPPOE.html#nm-setting-pppoe-get-type"/>
@@ -766,7 +747,9 @@
     <function name="nm_setting_pppoe_get_service ()" link="NMSettingPPPOE.html#nm-setting-pppoe-get-service"/>
     <function name="nm_setting_pppoe_get_username ()" link="NMSettingPPPOE.html#nm-setting-pppoe-get-username"/>
     <function name="nm_setting_pppoe_get_password ()" link="NMSettingPPPOE.html#nm-setting-pppoe-get-password"/>
+    <function name="nm_setting_pppoe_get_password_flags ()" link="NMSettingPPPOE.html#nm-setting-pppoe-get-password-flags"/>
     <function name="The &quot;password&quot; property" link="NMSettingPPPOE.html#NMSettingPPPOE--password"/>
+    <function name="The &quot;password-flags&quot; property" link="NMSettingPPPOE.html#NMSettingPPPOE--password-flags"/>
     <function name="The &quot;service&quot; property" link="NMSettingPPPOE.html#NMSettingPPPOE--service"/>
     <function name="The &quot;username&quot; property" link="NMSettingPPPOE.html#NMSettingPPPOE--username"/>
     <function name="NM_SETTING_VPN_SETTING_NAME" link="NMSettingVPN.html#NM-SETTING-VPN-SETTING-NAME:CAPS"/>
@@ -780,7 +763,7 @@
     <function name="NM_SETTING_VPN_SECRETS" link="NMSettingVPN.html#NM-SETTING-VPN-SECRETS:CAPS"/>
     <function name="NMSettingVPN" link="NMSettingVPN.html#NMSettingVPN-struct"/>
     <function name="NMSettingVPNClass" link="NMSettingVPN.html#NMSettingVPNClass"/>
-    <function name="VPNIterFunc ()" link="NMSettingVPN.html#VPNIterFunc"/>
+    <function name="NMVPNIterFunc ()" link="NMSettingVPN.html#NMVPNIterFunc"/>
     <function name="nm_setting_vpn_get_type ()" link="NMSettingVPN.html#nm-setting-vpn-get-type"/>
     <function name="nm_setting_vpn_new ()" link="NMSettingVPN.html#nm-setting-vpn-new"/>
     <function name="nm_setting_vpn_get_service_type ()" link="NMSettingVPN.html#nm-setting-vpn-get-service-type"/>
@@ -797,16 +780,6 @@
     <function name="The &quot;secrets&quot; property" link="NMSettingVPN.html#NMSettingVPN--secrets"/>
     <function name="The &quot;service-type&quot; property" link="NMSettingVPN.html#NMSettingVPN--service-type"/>
     <function name="The &quot;user-name&quot; property" link="NMSettingVPN.html#NMSettingVPN--user-name"/>
-    <function name="nm_print_backtrace" link="libnm-util-nm-utils.html#nm-print-backtrace"/>
-    <function name="nm_get_timestamp()" link="libnm-util-nm-utils.html#nm-get-timestamp"/>
-    <function name="nm_info()" link="libnm-util-nm-utils.html#nm-info"/>
-    <function name="nm_info_str()" link="libnm-util-nm-utils.html#nm-info-str"/>
-    <function name="nm_debug()" link="libnm-util-nm-utils.html#nm-debug"/>
-    <function name="nm_debug_str()" link="libnm-util-nm-utils.html#nm-debug-str"/>
-    <function name="nm_warning()" link="libnm-util-nm-utils.html#nm-warning"/>
-    <function name="nm_warning_str()" link="libnm-util-nm-utils.html#nm-warning-str"/>
-    <function name="nm_error()" link="libnm-util-nm-utils.html#nm-error"/>
-    <function name="nm_error_str()" link="libnm-util-nm-utils.html#nm-error-str"/>
     <function name="nm_utils_init ()" link="libnm-util-nm-utils.html#nm-utils-init"/>
     <function name="nm_utils_deinit ()" link="libnm-util-nm-utils.html#nm-utils-deinit"/>
     <function name="nm_utils_is_empty_ssid ()" link="libnm-util-nm-utils.html#nm-utils-is-empty-ssid"/>
diff --git a/docs/libnm-util/html/libnm-util.devhelp2 b/docs/libnm-util/html/libnm-util.devhelp2
index 3f68f0ecc..9cb466dd2 100644
--- a/docs/libnm-util/html/libnm-util.devhelp2
+++ b/docs/libnm-util/html/libnm-util.devhelp2
@@ -3,7 +3,6 @@
 <book xmlns="http://www.devhelp.net/book" title="libnm-util Reference Manual" link="index.html" author="" name="libnm-util" version="2" language="c">
   <chapters>
     <sub name="libnm-util API Reference" link="ch01.html">
-      <sub name="NMConnection" link="NMConnection.html"/>
       <sub name="NMSetting" link="NMSetting.html"/>
       <sub name="NMSettingConnection" link="NMSettingConnection.html"/>
       <sub name="NMSettingWired" link="NMSettingWired.html"/>
@@ -27,43 +26,6 @@
     <sub name="Annotation Glossary" link="annotation-glossary.html"/>
   </chapters>
   <functions>
-    <keyword type="enum" name="enum NMConnectionScope" link="NMConnection.html#NMConnectionScope"/>
-    <keyword type="enum" name="enum NMConnectionError" link="NMConnection.html#NMConnectionError"/>
-    <keyword type="macro" name="NM_TYPE_CONNECTION_ERROR" link="NMConnection.html#NM-TYPE-CONNECTION-ERROR:CAPS"/>
-    <keyword type="macro" name="NM_CONNECTION_ERROR" link="NMConnection.html#NM-CONNECTION-ERROR:CAPS"/>
-    <keyword type="function" name="nm_connection_error_quark ()" link="NMConnection.html#nm-connection-error-quark"/>
-    <keyword type="macro" name="NM_CONNECTION_SCOPE" link="NMConnection.html#NM-CONNECTION-SCOPE:CAPS"/>
-    <keyword type="macro" name="NM_CONNECTION_PATH" link="NMConnection.html#NM-CONNECTION-PATH:CAPS"/>
-    <keyword type="struct" name="NMConnection" link="NMConnection.html#NMConnection-struct"/>
-    <keyword type="struct" name="NMConnectionClass" link="NMConnection.html#NMConnectionClass"/>
-    <keyword type="function" name="nm_connection_get_type ()" link="NMConnection.html#nm-connection-get-type"/>
-    <keyword type="function" name="nm_connection_new ()" link="NMConnection.html#nm-connection-new"/>
-    <keyword type="function" name="nm_connection_new_from_hash ()" link="NMConnection.html#nm-connection-new-from-hash"/>
-    <keyword type="function" name="nm_connection_duplicate ()" link="NMConnection.html#nm-connection-duplicate"/>
-    <keyword type="function" name="nm_connection_add_setting ()" link="NMConnection.html#nm-connection-add-setting"/>
-    <keyword type="function" name="nm_connection_remove_setting ()" link="NMConnection.html#nm-connection-remove-setting"/>
-    <keyword type="function" name="nm_connection_get_setting ()" link="NMConnection.html#nm-connection-get-setting"/>
-    <keyword type="function" name="nm_connection_get_setting_by_name ()" link="NMConnection.html#nm-connection-get-setting-by-name"/>
-    <keyword type="function" name="nm_connection_replace_settings ()" link="NMConnection.html#nm-connection-replace-settings"/>
-    <keyword type="function" name="nm_connection_compare ()" link="NMConnection.html#nm-connection-compare"/>
-    <keyword type="function" name="nm_connection_diff ()" link="NMConnection.html#nm-connection-diff"/>
-    <keyword type="function" name="nm_connection_verify ()" link="NMConnection.html#nm-connection-verify"/>
-    <keyword type="function" name="nm_connection_need_secrets ()" link="NMConnection.html#nm-connection-need-secrets"/>
-    <keyword type="function" name="nm_connection_clear_secrets ()" link="NMConnection.html#nm-connection-clear-secrets"/>
-    <keyword type="function" name="nm_connection_update_secrets ()" link="NMConnection.html#nm-connection-update-secrets"/>
-    <keyword type="function" name="nm_connection_set_scope ()" link="NMConnection.html#nm-connection-set-scope"/>
-    <keyword type="function" name="nm_connection_get_scope ()" link="NMConnection.html#nm-connection-get-scope"/>
-    <keyword type="function" name="nm_connection_set_path ()" link="NMConnection.html#nm-connection-set-path"/>
-    <keyword type="function" name="nm_connection_get_path ()" link="NMConnection.html#nm-connection-get-path"/>
-    <keyword type="function" name="nm_connection_for_each_setting_value ()" link="NMConnection.html#nm-connection-for-each-setting-value"/>
-    <keyword type="function" name="nm_connection_to_hash ()" link="NMConnection.html#nm-connection-to-hash"/>
-    <keyword type="function" name="nm_connection_dump ()" link="NMConnection.html#nm-connection-dump"/>
-    <keyword type="function" name="nm_connection_create_setting ()" link="NMConnection.html#nm-connection-create-setting"/>
-    <keyword type="function" name="nm_connection_lookup_setting_type ()" link="NMConnection.html#nm-connection-lookup-setting-type"/>
-    <keyword type="function" name="nm_connection_lookup_setting_type_by_quark ()" link="NMConnection.html#nm-connection-lookup-setting-type-by-quark"/>
-    <keyword type="property" name="The &quot;path&quot; property" link="NMConnection.html#NMConnection--path"/>
-    <keyword type="property" name="The &quot;scope&quot; property" link="NMConnection.html#NMConnection--scope"/>
-    <keyword type="signal" name="The &quot;secrets-updated&quot; signal" link="NMConnection.html#NMConnection-secrets-updated"/>
     <keyword type="enum" name="enum NMSettingError" link="NMSetting.html#NMSettingError"/>
     <keyword type="macro" name="NM_TYPE_SETTING_ERROR" link="NMSetting.html#NM-TYPE-SETTING-ERROR:CAPS"/>
     <keyword type="macro" name="NM_SETTING_ERROR" link="NMSetting.html#NM-SETTING-ERROR:CAPS"/>
@@ -73,10 +35,12 @@
     <keyword type="macro" name="NM_SETTING_PARAM_SECRET" link="NMSetting.html#NM-SETTING-PARAM-SECRET:CAPS"/>
     <keyword type="macro" name="NM_SETTING_PARAM_FUZZY_IGNORE" link="NMSetting.html#NM-SETTING-PARAM-FUZZY-IGNORE:CAPS"/>
     <keyword type="macro" name="NM_SETTING_NAME" link="NMSetting.html#NM-SETTING-NAME:CAPS"/>
+    <keyword type="enum" name="enum NMSettingSecretFlags" link="NMSetting.html#NMSettingSecretFlags"/>
     <keyword type="struct" name="NMSetting" link="NMSetting.html#NMSetting-struct"/>
     <keyword type="struct" name="NMSettingClass" link="NMSetting.html#NMSettingClass"/>
     <keyword type="function" name="NMSettingValueIterFn ()" link="NMSetting.html#NMSettingValueIterFn"/>
     <keyword type="function" name="nm_setting_get_type ()" link="NMSetting.html#nm-setting-get-type"/>
+    <keyword type="enum" name="enum NMSettingHashFlags" link="NMSetting.html#NMSettingHashFlags"/>
     <keyword type="function" name="nm_setting_to_hash ()" link="NMSetting.html#nm-setting-to-hash"/>
     <keyword type="function" name="nm_setting_new_from_hash ()" link="NMSetting.html#nm-setting-new-from-hash"/>
     <keyword type="function" name="nm_setting_duplicate ()" link="NMSetting.html#nm-setting-duplicate"/>
@@ -91,6 +55,8 @@
     <keyword type="function" name="nm_setting_clear_secrets ()" link="NMSetting.html#nm-setting-clear-secrets"/>
     <keyword type="function" name="nm_setting_need_secrets ()" link="NMSetting.html#nm-setting-need-secrets"/>
     <keyword type="function" name="nm_setting_update_secrets ()" link="NMSetting.html#nm-setting-update-secrets"/>
+    <keyword type="function" name="nm_setting_get_secret_flags ()" link="NMSetting.html#nm-setting-get-secret-flags"/>
+    <keyword type="function" name="nm_setting_set_secret_flags ()" link="NMSetting.html#nm-setting-set-secret-flags"/>
     <keyword type="property" name="The &quot;name&quot; property" link="NMSetting.html#NMSetting--name"/>
     <keyword type="macro" name="NM_SETTING_CONNECTION_SETTING_NAME" link="NMSettingConnection.html#NM-SETTING-CONNECTION-SETTING-NAME:CAPS"/>
     <keyword type="enum" name="enum NMSettingConnectionError" link="NMSettingConnection.html#NMSettingConnectionError"/>
@@ -103,6 +69,7 @@
     <keyword type="macro" name="NM_SETTING_CONNECTION_AUTOCONNECT" link="NMSettingConnection.html#NM-SETTING-CONNECTION-AUTOCONNECT:CAPS"/>
     <keyword type="macro" name="NM_SETTING_CONNECTION_TIMESTAMP" link="NMSettingConnection.html#NM-SETTING-CONNECTION-TIMESTAMP:CAPS"/>
     <keyword type="macro" name="NM_SETTING_CONNECTION_READ_ONLY" link="NMSettingConnection.html#NM-SETTING-CONNECTION-READ-ONLY:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_CONNECTION_PERMISSIONS" link="NMSettingConnection.html#NM-SETTING-CONNECTION-PERMISSIONS:CAPS"/>
     <keyword type="struct" name="NMSettingConnection" link="NMSettingConnection.html#NMSettingConnection-struct"/>
     <keyword type="struct" name="NMSettingConnectionClass" link="NMSettingConnection.html#NMSettingConnectionClass"/>
     <keyword type="function" name="nm_setting_connection_get_type ()" link="NMSettingConnection.html#nm-setting-connection-get-type"/>
@@ -113,8 +80,14 @@
     <keyword type="function" name="nm_setting_connection_get_autoconnect ()" link="NMSettingConnection.html#nm-setting-connection-get-autoconnect"/>
     <keyword type="function" name="nm_setting_connection_get_timestamp ()" link="NMSettingConnection.html#nm-setting-connection-get-timestamp"/>
     <keyword type="function" name="nm_setting_connection_get_read_only ()" link="NMSettingConnection.html#nm-setting-connection-get-read-only"/>
+    <keyword type="function" name="nm_setting_connection_get_num_permissions ()" link="NMSettingConnection.html#nm-setting-connection-get-num-permissions"/>
+    <keyword type="function" name="nm_setting_connection_get_permission ()" link="NMSettingConnection.html#nm-setting-connection-get-permission"/>
+    <keyword type="function" name="nm_setting_connection_permissions_user_allowed ()" link="NMSettingConnection.html#nm-setting-connection-permissions-user-allowed"/>
+    <keyword type="function" name="nm_setting_connection_add_permission ()" link="NMSettingConnection.html#nm-setting-connection-add-permission"/>
+    <keyword type="function" name="nm_setting_connection_remove_permission ()" link="NMSettingConnection.html#nm-setting-connection-remove-permission"/>
     <keyword type="property" name="The &quot;autoconnect&quot; property" link="NMSettingConnection.html#NMSettingConnection--autoconnect"/>
     <keyword type="property" name="The &quot;id&quot; property" link="NMSettingConnection.html#NMSettingConnection--id"/>
+    <keyword type="property" name="The &quot;permissions&quot; property" link="NMSettingConnection.html#NMSettingConnection--permissions"/>
     <keyword type="property" name="The &quot;read-only&quot; property" link="NMSettingConnection.html#NMSettingConnection--read-only"/>
     <keyword type="property" name="The &quot;timestamp&quot; property" link="NMSettingConnection.html#NMSettingConnection--timestamp"/>
     <keyword type="property" name="The &quot;type&quot; property" link="NMSettingConnection.html#NMSettingConnection--type"/>
@@ -179,6 +152,8 @@
     <keyword type="macro" name="NM_SETTING_WIRELESS_MTU" link="NMSettingWireless.html#NM-SETTING-WIRELESS-MTU:CAPS"/>
     <keyword type="macro" name="NM_SETTING_WIRELESS_SEEN_BSSIDS" link="NMSettingWireless.html#NM-SETTING-WIRELESS-SEEN-BSSIDS:CAPS"/>
     <keyword type="macro" name="NM_SETTING_WIRELESS_SEC" link="NMSettingWireless.html#NM-SETTING-WIRELESS-SEC:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_WIRELESS_MODE_ADHOC" link="NMSettingWireless.html#NM-SETTING-WIRELESS-MODE-ADHOC:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_WIRELESS_MODE_INFRA" link="NMSettingWireless.html#NM-SETTING-WIRELESS-MODE-INFRA:CAPS"/>
     <keyword type="struct" name="NMSettingWireless" link="NMSettingWireless.html#NMSettingWireless-struct"/>
     <keyword type="struct" name="NMSettingWirelessClass" link="NMSettingWireless.html#NMSettingWirelessClass"/>
     <keyword type="function" name="nm_setting_wireless_get_type ()" link="NMSettingWireless.html#nm-setting-wireless-get-type"/>
@@ -227,9 +202,12 @@
     <keyword type="macro" name="NM_SETTING_WIRELESS_SECURITY_WEP_KEY1" link="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-WEP-KEY1:CAPS"/>
     <keyword type="macro" name="NM_SETTING_WIRELESS_SECURITY_WEP_KEY2" link="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-WEP-KEY2:CAPS"/>
     <keyword type="macro" name="NM_SETTING_WIRELESS_SECURITY_WEP_KEY3" link="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-WEP-KEY3:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS" link="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-WEP-KEY-FLAGS:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE" link="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-WEP-KEY-TYPE:CAPS"/>
     <keyword type="macro" name="NM_SETTING_WIRELESS_SECURITY_PSK" link="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-PSK:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS" link="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-PSK-FLAGS:CAPS"/>
     <keyword type="macro" name="NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD" link="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-LEAP-PASSWORD:CAPS"/>
-    <keyword type="macro" name="NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE" link="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-WEP-KEY-TYPE:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS" link="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-LEAP-PASSWORD-FLAGS:CAPS"/>
     <keyword type="struct" name="NMSettingWirelessSecurity" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity-struct"/>
     <keyword type="struct" name="NMSettingWirelessSecurityClass" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurityClass"/>
     <keyword type="function" name="nm_setting_wireless_security_get_type ()" link="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-type"/>
@@ -251,21 +229,27 @@
     <keyword type="function" name="nm_setting_wireless_security_remove_group ()" link="NMSettingWirelessSecurity.html#nm-setting-wireless-security-remove-group"/>
     <keyword type="function" name="nm_setting_wireless_security_clear_groups ()" link="NMSettingWirelessSecurity.html#nm-setting-wireless-security-clear-groups"/>
     <keyword type="function" name="nm_setting_wireless_security_get_psk ()" link="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-psk"/>
+    <keyword type="function" name="nm_setting_wireless_security_get_psk_flags ()" link="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-psk-flags"/>
     <keyword type="function" name="nm_setting_wireless_security_get_leap_username ()" link="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-leap-username"/>
     <keyword type="function" name="nm_setting_wireless_security_get_leap_password ()" link="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-leap-password"/>
+    <keyword type="function" name="nm_setting_wireless_security_get_leap_password_flags ()" link="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-leap-password-flags"/>
     <keyword type="function" name="nm_setting_wireless_security_get_wep_key ()" link="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-wep-key"/>
     <keyword type="function" name="nm_setting_wireless_security_set_wep_key ()" link="NMSettingWirelessSecurity.html#nm-setting-wireless-security-set-wep-key"/>
     <keyword type="function" name="nm_setting_wireless_security_get_wep_tx_keyidx ()" link="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-wep-tx-keyidx"/>
     <keyword type="function" name="nm_setting_wireless_security_get_auth_alg ()" link="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-auth-alg"/>
+    <keyword type="function" name="nm_setting_wireless_security_get_wep_key_flags ()" link="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-wep-key-flags"/>
     <keyword type="function" name="nm_setting_wireless_security_get_wep_key_type ()" link="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-wep-key-type"/>
     <keyword type="property" name="The &quot;auth-alg&quot; property" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--auth-alg"/>
     <keyword type="property" name="The &quot;group&quot; property" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--group"/>
     <keyword type="property" name="The &quot;key-mgmt&quot; property" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--key-mgmt"/>
     <keyword type="property" name="The &quot;leap-password&quot; property" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--leap-password"/>
+    <keyword type="property" name="The &quot;leap-password-flags&quot; property" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--leap-password-flags"/>
     <keyword type="property" name="The &quot;leap-username&quot; property" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--leap-username"/>
     <keyword type="property" name="The &quot;pairwise&quot; property" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--pairwise"/>
     <keyword type="property" name="The &quot;proto&quot; property" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--proto"/>
     <keyword type="property" name="The &quot;psk&quot; property" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--psk"/>
+    <keyword type="property" name="The &quot;psk-flags&quot; property" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--psk-flags"/>
+    <keyword type="property" name="The &quot;wep-key-flags&quot; property" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--wep-key-flags"/>
     <keyword type="property" name="The &quot;wep-key-type&quot; property" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--wep-key-type"/>
     <keyword type="property" name="The &quot;wep-key0&quot; property" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--wep-key0"/>
     <keyword type="property" name="The &quot;wep-key1&quot; property" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--wep-key1"/>
@@ -321,6 +305,7 @@
     <keyword type="macro" name="NM_SETTING_CDMA_NUMBER" link="NMSettingCdma.html#NM-SETTING-CDMA-NUMBER:CAPS"/>
     <keyword type="macro" name="NM_SETTING_CDMA_USERNAME" link="NMSettingCdma.html#NM-SETTING-CDMA-USERNAME:CAPS"/>
     <keyword type="macro" name="NM_SETTING_CDMA_PASSWORD" link="NMSettingCdma.html#NM-SETTING-CDMA-PASSWORD:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_CDMA_PASSWORD_FLAGS" link="NMSettingCdma.html#NM-SETTING-CDMA-PASSWORD-FLAGS:CAPS"/>
     <keyword type="struct" name="NMSettingCdma" link="NMSettingCdma.html#NMSettingCdma-struct"/>
     <keyword type="struct" name="NMSettingCdmaClass" link="NMSettingCdma.html#NMSettingCdmaClass"/>
     <keyword type="function" name="nm_setting_cdma_get_type ()" link="NMSettingCdma.html#nm-setting-cdma-get-type"/>
@@ -328,8 +313,10 @@
     <keyword type="function" name="nm_setting_cdma_get_number ()" link="NMSettingCdma.html#nm-setting-cdma-get-number"/>
     <keyword type="function" name="nm_setting_cdma_get_username ()" link="NMSettingCdma.html#nm-setting-cdma-get-username"/>
     <keyword type="function" name="nm_setting_cdma_get_password ()" link="NMSettingCdma.html#nm-setting-cdma-get-password"/>
+    <keyword type="function" name="nm_setting_cdma_get_password_flags ()" link="NMSettingCdma.html#nm-setting-cdma-get-password-flags"/>
     <keyword type="property" name="The &quot;number&quot; property" link="NMSettingCdma.html#NMSettingCdma--number"/>
     <keyword type="property" name="The &quot;password&quot; property" link="NMSettingCdma.html#NMSettingCdma--password"/>
+    <keyword type="property" name="The &quot;password-flags&quot; property" link="NMSettingCdma.html#NMSettingCdma--password-flags"/>
     <keyword type="property" name="The &quot;username&quot; property" link="NMSettingCdma.html#NMSettingCdma--username"/>
     <keyword type="macro" name="NM_SETTING_GSM_SETTING_NAME" link="NMSettingGsm.html#NM-SETTING-GSM-SETTING-NAME:CAPS"/>
     <keyword type="enum" name="enum NMSettingGsmError" link="NMSettingGsm.html#NMSettingGsmError"/>
@@ -339,19 +326,14 @@
     <keyword type="macro" name="NM_SETTING_GSM_NUMBER" link="NMSettingGsm.html#NM-SETTING-GSM-NUMBER:CAPS"/>
     <keyword type="macro" name="NM_SETTING_GSM_USERNAME" link="NMSettingGsm.html#NM-SETTING-GSM-USERNAME:CAPS"/>
     <keyword type="macro" name="NM_SETTING_GSM_PASSWORD" link="NMSettingGsm.html#NM-SETTING-GSM-PASSWORD:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_GSM_PASSWORD_FLAGS" link="NMSettingGsm.html#NM-SETTING-GSM-PASSWORD-FLAGS:CAPS"/>
     <keyword type="macro" name="NM_SETTING_GSM_APN" link="NMSettingGsm.html#NM-SETTING-GSM-APN:CAPS"/>
     <keyword type="macro" name="NM_SETTING_GSM_NETWORK_ID" link="NMSettingGsm.html#NM-SETTING-GSM-NETWORK-ID:CAPS"/>
     <keyword type="macro" name="NM_SETTING_GSM_NETWORK_TYPE" link="NMSettingGsm.html#NM-SETTING-GSM-NETWORK-TYPE:CAPS"/>
     <keyword type="macro" name="NM_SETTING_GSM_ALLOWED_BANDS" link="NMSettingGsm.html#NM-SETTING-GSM-ALLOWED-BANDS:CAPS"/>
     <keyword type="macro" name="NM_SETTING_GSM_PIN" link="NMSettingGsm.html#NM-SETTING-GSM-PIN:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_GSM_PIN_FLAGS" link="NMSettingGsm.html#NM-SETTING-GSM-PIN-FLAGS:CAPS"/>
     <keyword type="macro" name="NM_SETTING_GSM_HOME_ONLY" link="NMSettingGsm.html#NM-SETTING-GSM-HOME-ONLY:CAPS"/>
-    <keyword type="macro" name="NM_SETTING_GSM_PUK" link="NMSettingGsm.html#NM-SETTING-GSM-PUK:CAPS"/>
-    <keyword type="macro" name="NM_SETTING_GSM_BAND" link="NMSettingGsm.html#NM-SETTING-GSM-BAND:CAPS"/>
-    <keyword type="macro" name="NM_GSM_NETWORK_ANY" link="NMSettingGsm.html#NM-GSM-NETWORK-ANY:CAPS"/>
-    <keyword type="macro" name="NM_GSM_NETWORK_UMTS_HSPA" link="NMSettingGsm.html#NM-GSM-NETWORK-UMTS-HSPA:CAPS"/>
-    <keyword type="macro" name="NM_GSM_NETWORK_GPRS_EDGE" link="NMSettingGsm.html#NM-GSM-NETWORK-GPRS-EDGE:CAPS"/>
-    <keyword type="macro" name="NM_GSM_NETWORK_PREFER_UMTS_HSPA" link="NMSettingGsm.html#NM-GSM-NETWORK-PREFER-UMTS-HSPA:CAPS"/>
-    <keyword type="macro" name="NM_GSM_NETWORK_PREFER_GPRS_EDGE" link="NMSettingGsm.html#NM-GSM-NETWORK-PREFER-GPRS-EDGE:CAPS"/>
     <keyword type="enum" name="enum NMSettingGsmNetworkType" link="NMSettingGsm.html#NMSettingGsmNetworkType"/>
     <keyword type="enum" name="enum NMSettingGsmNetworkBand" link="NMSettingGsm.html#NMSettingGsmNetworkBand"/>
     <keyword type="struct" name="NMSettingGsm" link="NMSettingGsm.html#NMSettingGsm-struct"/>
@@ -367,18 +349,18 @@
     <keyword type="function" name="nm_setting_gsm_get_allowed_bands ()" link="NMSettingGsm.html#nm-setting-gsm-get-allowed-bands"/>
     <keyword type="function" name="nm_setting_gsm_get_pin ()" link="NMSettingGsm.html#nm-setting-gsm-get-pin"/>
     <keyword type="function" name="nm_setting_gsm_get_home_only ()" link="NMSettingGsm.html#nm-setting-gsm-get-home-only"/>
-    <keyword type="function" name="nm_setting_gsm_get_puk ()" link="NMSettingGsm.html#nm-setting-gsm-get-puk"/>
-    <keyword type="function" name="nm_setting_gsm_get_band ()" link="NMSettingGsm.html#nm-setting-gsm-get-band"/>
+    <keyword type="function" name="nm_setting_gsm_get_pin_flags ()" link="NMSettingGsm.html#nm-setting-gsm-get-pin-flags"/>
+    <keyword type="function" name="nm_setting_gsm_get_password_flags ()" link="NMSettingGsm.html#nm-setting-gsm-get-password-flags"/>
     <keyword type="property" name="The &quot;allowed-bands&quot; property" link="NMSettingGsm.html#NMSettingGsm--allowed-bands"/>
     <keyword type="property" name="The &quot;apn&quot; property" link="NMSettingGsm.html#NMSettingGsm--apn"/>
-    <keyword type="property" name="The &quot;band&quot; property" link="NMSettingGsm.html#NMSettingGsm--band"/>
     <keyword type="property" name="The &quot;home-only&quot; property" link="NMSettingGsm.html#NMSettingGsm--home-only"/>
     <keyword type="property" name="The &quot;network-id&quot; property" link="NMSettingGsm.html#NMSettingGsm--network-id"/>
     <keyword type="property" name="The &quot;network-type&quot; property" link="NMSettingGsm.html#NMSettingGsm--network-type"/>
     <keyword type="property" name="The &quot;number&quot; property" link="NMSettingGsm.html#NMSettingGsm--number"/>
     <keyword type="property" name="The &quot;password&quot; property" link="NMSettingGsm.html#NMSettingGsm--password"/>
+    <keyword type="property" name="The &quot;password-flags&quot; property" link="NMSettingGsm.html#NMSettingGsm--password-flags"/>
     <keyword type="property" name="The &quot;pin&quot; property" link="NMSettingGsm.html#NMSettingGsm--pin"/>
-    <keyword type="property" name="The &quot;puk&quot; property" link="NMSettingGsm.html#NMSettingGsm--puk"/>
+    <keyword type="property" name="The &quot;pin-flags&quot; property" link="NMSettingGsm.html#NMSettingGsm--pin-flags"/>
     <keyword type="property" name="The &quot;username&quot; property" link="NMSettingGsm.html#NMSettingGsm--username"/>
     <keyword type="macro" name="NM_SETTING_OLPC_MESH_SETTING_NAME" link="NMSettingOlpcMesh.html#NM-SETTING-OLPC-MESH-SETTING-NAME:CAPS"/>
     <keyword type="enum" name="enum NMSettingOlpcMeshError" link="NMSettingOlpcMesh.html#NMSettingOlpcMeshError"/>
@@ -420,12 +402,15 @@
     <keyword type="macro" name="NM_SETTING_802_1X_PHASE2_CA_PATH" link="NMSetting8021x.html#NM-SETTING-802-1X-PHASE2-CA-PATH:CAPS"/>
     <keyword type="macro" name="NM_SETTING_802_1X_PHASE2_CLIENT_CERT" link="NMSetting8021x.html#NM-SETTING-802-1X-PHASE2-CLIENT-CERT:CAPS"/>
     <keyword type="macro" name="NM_SETTING_802_1X_PASSWORD" link="NMSetting8021x.html#NM-SETTING-802-1X-PASSWORD:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_802_1X_PASSWORD_FLAGS" link="NMSetting8021x.html#NM-SETTING-802-1X-PASSWORD-FLAGS:CAPS"/>
     <keyword type="macro" name="NM_SETTING_802_1X_PRIVATE_KEY" link="NMSetting8021x.html#NM-SETTING-802-1X-PRIVATE-KEY:CAPS"/>
     <keyword type="macro" name="NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD" link="NMSetting8021x.html#NM-SETTING-802-1X-PRIVATE-KEY-PASSWORD:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS" link="NMSetting8021x.html#NM-SETTING-802-1X-PRIVATE-KEY-PASSWORD-FLAGS:CAPS"/>
     <keyword type="macro" name="NM_SETTING_802_1X_PHASE2_PRIVATE_KEY" link="NMSetting8021x.html#NM-SETTING-802-1X-PHASE2-PRIVATE-KEY:CAPS"/>
     <keyword type="macro" name="NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD" link="NMSetting8021x.html#NM-SETTING-802-1X-PHASE2-PRIVATE-KEY-PASSWORD:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS" link="NMSetting8021x.html#NM-SETTING-802-1X-PHASE2-PRIVATE-KEY-PASSWORD-FLAGS:CAPS"/>
     <keyword type="macro" name="NM_SETTING_802_1X_PIN" link="NMSetting8021x.html#NM-SETTING-802-1X-PIN:CAPS"/>
-    <keyword type="macro" name="NM_SETTING_802_1X_PSK" link="NMSetting8021x.html#NM-SETTING-802-1X-PSK:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_802_1X_PIN_FLAGS" link="NMSetting8021x.html#NM-SETTING-802-1X-PIN-FLAGS:CAPS"/>
     <keyword type="macro" name="NM_SETTING_802_1X_SYSTEM_CA_CERTS" link="NMSetting8021x.html#NM-SETTING-802-1X-SYSTEM-CA-CERTS:CAPS"/>
     <keyword type="struct" name="NMSetting8021x" link="NMSetting8021x.html#NMSetting8021x-struct"/>
     <keyword type="struct" name="NMSetting8021xClass" link="NMSetting8021x.html#NMSetting8021xClass"/>
@@ -463,35 +448,23 @@
     <keyword type="function" name="nm_setting_802_1x_get_phase2_client_cert_path ()" link="NMSetting8021x.html#nm-setting-802-1x-get-phase2-client-cert-path"/>
     <keyword type="function" name="nm_setting_802_1x_set_phase2_client_cert ()" link="NMSetting8021x.html#nm-setting-802-1x-set-phase2-client-cert"/>
     <keyword type="function" name="nm_setting_802_1x_get_password ()" link="NMSetting8021x.html#nm-setting-802-1x-get-password"/>
+    <keyword type="function" name="nm_setting_802_1x_get_password_flags ()" link="NMSetting8021x.html#nm-setting-802-1x-get-password-flags"/>
     <keyword type="function" name="nm_setting_802_1x_get_pin ()" link="NMSetting8021x.html#nm-setting-802-1x-get-pin"/>
-    <keyword type="function" name="nm_setting_802_1x_get_psk ()" link="NMSetting8021x.html#nm-setting-802-1x-get-psk"/>
+    <keyword type="function" name="nm_setting_802_1x_get_pin_flags ()" link="NMSetting8021x.html#nm-setting-802-1x-get-pin-flags"/>
     <keyword type="function" name="nm_setting_802_1x_get_private_key_scheme ()" link="NMSetting8021x.html#nm-setting-802-1x-get-private-key-scheme"/>
     <keyword type="function" name="nm_setting_802_1x_get_private_key_blob ()" link="NMSetting8021x.html#nm-setting-802-1x-get-private-key-blob"/>
     <keyword type="function" name="nm_setting_802_1x_get_private_key_path ()" link="NMSetting8021x.html#nm-setting-802-1x-get-private-key-path"/>
     <keyword type="function" name="nm_setting_802_1x_set_private_key ()" link="NMSetting8021x.html#nm-setting-802-1x-set-private-key"/>
     <keyword type="function" name="nm_setting_802_1x_get_private_key_password ()" link="NMSetting8021x.html#nm-setting-802-1x-get-private-key-password"/>
+    <keyword type="function" name="nm_setting_802_1x_get_private_key_password_flags ()" link="NMSetting8021x.html#nm-setting-802-1x-get-private-key-password-flags"/>
     <keyword type="function" name="nm_setting_802_1x_get_private_key_format ()" link="NMSetting8021x.html#nm-setting-802-1x-get-private-key-format"/>
     <keyword type="function" name="nm_setting_802_1x_get_phase2_private_key_scheme ()" link="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-scheme"/>
     <keyword type="function" name="nm_setting_802_1x_get_phase2_private_key_blob ()" link="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-blob"/>
     <keyword type="function" name="nm_setting_802_1x_get_phase2_private_key_path ()" link="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-path"/>
     <keyword type="function" name="nm_setting_802_1x_set_phase2_private_key ()" link="NMSetting8021x.html#nm-setting-802-1x-set-phase2-private-key"/>
     <keyword type="function" name="nm_setting_802_1x_get_phase2_private_key_password ()" link="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-password"/>
+    <keyword type="function" name="nm_setting_802_1x_get_phase2_private_key_password_flags ()" link="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-password-flags"/>
     <keyword type="function" name="nm_setting_802_1x_get_phase2_private_key_format ()" link="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-format"/>
-    <keyword type="enum" name="enum NMSetting8021xCKType" link="NMSetting8021x.html#NMSetting8021xCKType"/>
-    <keyword type="function" name="nm_setting_802_1x_get_ca_cert ()" link="NMSetting8021x.html#nm-setting-802-1x-get-ca-cert" deprecated=""/>
-    <keyword type="function" name="nm_setting_802_1x_set_ca_cert_from_file ()" link="NMSetting8021x.html#nm-setting-802-1x-set-ca-cert-from-file" deprecated=""/>
-    <keyword type="function" name="nm_setting_802_1x_get_client_cert ()" link="NMSetting8021x.html#nm-setting-802-1x-get-client-cert" deprecated=""/>
-    <keyword type="function" name="nm_setting_802_1x_set_client_cert_from_file ()" link="NMSetting8021x.html#nm-setting-802-1x-set-client-cert-from-file" deprecated=""/>
-    <keyword type="function" name="nm_setting_802_1x_get_phase2_ca_cert ()" link="NMSetting8021x.html#nm-setting-802-1x-get-phase2-ca-cert" deprecated=""/>
-    <keyword type="function" name="nm_setting_802_1x_set_phase2_ca_cert_from_file ()" link="NMSetting8021x.html#nm-setting-802-1x-set-phase2-ca-cert-from-file" deprecated=""/>
-    <keyword type="function" name="nm_setting_802_1x_get_phase2_client_cert ()" link="NMSetting8021x.html#nm-setting-802-1x-get-phase2-client-cert" deprecated=""/>
-    <keyword type="function" name="nm_setting_802_1x_set_phase2_client_cert_from_file ()" link="NMSetting8021x.html#nm-setting-802-1x-set-phase2-client-cert-from-file" deprecated=""/>
-    <keyword type="function" name="nm_setting_802_1x_get_private_key ()" link="NMSetting8021x.html#nm-setting-802-1x-get-private-key" deprecated=""/>
-    <keyword type="function" name="nm_setting_802_1x_set_private_key_from_file ()" link="NMSetting8021x.html#nm-setting-802-1x-set-private-key-from-file" deprecated=""/>
-    <keyword type="function" name="nm_setting_802_1x_get_private_key_type ()" link="NMSetting8021x.html#nm-setting-802-1x-get-private-key-type" deprecated=""/>
-    <keyword type="function" name="nm_setting_802_1x_get_phase2_private_key ()" link="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key" deprecated=""/>
-    <keyword type="function" name="nm_setting_802_1x_set_phase2_private_key_from_file ()" link="NMSetting8021x.html#nm-setting-802-1x-set-phase2-private-key-from-file" deprecated=""/>
-    <keyword type="function" name="nm_setting_802_1x_get_phase2_private_key_type ()" link="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-type" deprecated=""/>
     <keyword type="property" name="The &quot;anonymous-identity&quot; property" link="NMSetting8021x.html#NMSetting8021x--anonymous-identity"/>
     <keyword type="property" name="The &quot;ca-cert&quot; property" link="NMSetting8021x.html#NMSetting8021x--ca-cert"/>
     <keyword type="property" name="The &quot;ca-path&quot; property" link="NMSetting8021x.html#NMSetting8021x--ca-path"/>
@@ -499,6 +472,7 @@
     <keyword type="property" name="The &quot;eap&quot; property" link="NMSetting8021x.html#NMSetting8021x--eap"/>
     <keyword type="property" name="The &quot;identity&quot; property" link="NMSetting8021x.html#NMSetting8021x--identity"/>
     <keyword type="property" name="The &quot;password&quot; property" link="NMSetting8021x.html#NMSetting8021x--password"/>
+    <keyword type="property" name="The &quot;password-flags&quot; property" link="NMSetting8021x.html#NMSetting8021x--password-flags"/>
     <keyword type="property" name="The &quot;phase1-fast-provisioning&quot; property" link="NMSetting8021x.html#NMSetting8021x--phase1-fast-provisioning"/>
     <keyword type="property" name="The &quot;phase1-peaplabel&quot; property" link="NMSetting8021x.html#NMSetting8021x--phase1-peaplabel"/>
     <keyword type="property" name="The &quot;phase1-peapver&quot; property" link="NMSetting8021x.html#NMSetting8021x--phase1-peapver"/>
@@ -509,8 +483,10 @@
     <keyword type="property" name="The &quot;phase2-client-cert&quot; property" link="NMSetting8021x.html#NMSetting8021x--phase2-client-cert"/>
     <keyword type="property" name="The &quot;phase2-private-key&quot; property" link="NMSetting8021x.html#NMSetting8021x--phase2-private-key"/>
     <keyword type="property" name="The &quot;phase2-private-key-password&quot; property" link="NMSetting8021x.html#NMSetting8021x--phase2-private-key-password"/>
+    <keyword type="property" name="The &quot;phase2-private-key-password-flags&quot; property" link="NMSetting8021x.html#NMSetting8021x--phase2-private-key-password-flags"/>
     <keyword type="property" name="The &quot;private-key&quot; property" link="NMSetting8021x.html#NMSetting8021x--private-key"/>
     <keyword type="property" name="The &quot;private-key-password&quot; property" link="NMSetting8021x.html#NMSetting8021x--private-key-password"/>
+    <keyword type="property" name="The &quot;private-key-password-flags&quot; property" link="NMSetting8021x.html#NMSetting8021x--private-key-password-flags"/>
     <keyword type="property" name="The &quot;system-ca-certs&quot; property" link="NMSetting8021x.html#NMSetting8021x--system-ca-certs"/>
     <keyword type="macro" name="NM_SETTING_IP4_CONFIG_SETTING_NAME" link="NMSettingIP4Config.html#NM-SETTING-IP4-CONFIG-SETTING-NAME:CAPS"/>
     <keyword type="enum" name="enum NMSettingIP4ConfigError" link="NMSettingIP4Config.html#NMSettingIP4ConfigError"/>
@@ -535,6 +511,7 @@
     <keyword type="macro" name="NM_SETTING_IP4_CONFIG_METHOD_SHARED" link="NMSettingIP4Config.html#NM-SETTING-IP4-CONFIG-METHOD-SHARED:CAPS"/>
     <keyword type="macro" name="NM_SETTING_IP4_CONFIG_METHOD_DISABLED" link="NMSettingIP4Config.html#NM-SETTING-IP4-CONFIG-METHOD-DISABLED:CAPS"/>
     <keyword type="typedef" name="NMIP4Address" link="NMSettingIP4Config.html#NMIP4Address"/>
+    <keyword type="function" name="nm_ip4_address_get_type ()" link="NMSettingIP4Config.html#nm-ip4-address-get-type"/>
     <keyword type="function" name="nm_ip4_address_new ()" link="NMSettingIP4Config.html#nm-ip4-address-new"/>
     <keyword type="function" name="nm_ip4_address_dup ()" link="NMSettingIP4Config.html#nm-ip4-address-dup"/>
     <keyword type="function" name="nm_ip4_address_ref ()" link="NMSettingIP4Config.html#nm-ip4-address-ref"/>
@@ -547,6 +524,7 @@
     <keyword type="function" name="nm_ip4_address_get_gateway ()" link="NMSettingIP4Config.html#nm-ip4-address-get-gateway"/>
     <keyword type="function" name="nm_ip4_address_set_gateway ()" link="NMSettingIP4Config.html#nm-ip4-address-set-gateway"/>
     <keyword type="typedef" name="NMIP4Route" link="NMSettingIP4Config.html#NMIP4Route"/>
+    <keyword type="function" name="nm_ip4_route_get_type ()" link="NMSettingIP4Config.html#nm-ip4-route-get-type"/>
     <keyword type="function" name="nm_ip4_route_new ()" link="NMSettingIP4Config.html#nm-ip4-route-new"/>
     <keyword type="function" name="nm_ip4_route_dup ()" link="NMSettingIP4Config.html#nm-ip4-route-dup"/>
     <keyword type="function" name="nm_ip4_route_ref ()" link="NMSettingIP4Config.html#nm-ip4-route-ref"/>
@@ -625,6 +603,7 @@
     <keyword type="macro" name="NM_SETTING_IP6_CONFIG_METHOD_MANUAL" link="NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-METHOD-MANUAL:CAPS"/>
     <keyword type="macro" name="NM_SETTING_IP6_CONFIG_METHOD_SHARED" link="NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-METHOD-SHARED:CAPS"/>
     <keyword type="typedef" name="NMIP6Address" link="NMSettingIP6Config.html#NMIP6Address"/>
+    <keyword type="function" name="nm_ip6_address_get_type ()" link="NMSettingIP6Config.html#nm-ip6-address-get-type"/>
     <keyword type="function" name="nm_ip6_address_new ()" link="NMSettingIP6Config.html#nm-ip6-address-new"/>
     <keyword type="function" name="nm_ip6_address_dup ()" link="NMSettingIP6Config.html#nm-ip6-address-dup"/>
     <keyword type="function" name="nm_ip6_address_ref ()" link="NMSettingIP6Config.html#nm-ip6-address-ref"/>
@@ -637,6 +616,7 @@
     <keyword type="function" name="nm_ip6_address_get_gateway ()" link="NMSettingIP6Config.html#nm-ip6-address-get-gateway"/>
     <keyword type="function" name="nm_ip6_address_set_gateway ()" link="NMSettingIP6Config.html#nm-ip6-address-set-gateway"/>
     <keyword type="typedef" name="NMIP6Route" link="NMSettingIP6Config.html#NMIP6Route"/>
+    <keyword type="function" name="nm_ip6_route_get_type ()" link="NMSettingIP6Config.html#nm-ip6-route-get-type"/>
     <keyword type="function" name="nm_ip6_route_new ()" link="NMSettingIP6Config.html#nm-ip6-route-new"/>
     <keyword type="function" name="nm_ip6_route_dup ()" link="NMSettingIP6Config.html#nm-ip6-route-dup"/>
     <keyword type="function" name="nm_ip6_route_ref ()" link="NMSettingIP6Config.html#nm-ip6-route-ref"/>
@@ -759,6 +739,7 @@
     <keyword type="macro" name="NM_SETTING_PPPOE_SERVICE" link="NMSettingPPPOE.html#NM-SETTING-PPPOE-SERVICE:CAPS"/>
     <keyword type="macro" name="NM_SETTING_PPPOE_USERNAME" link="NMSettingPPPOE.html#NM-SETTING-PPPOE-USERNAME:CAPS"/>
     <keyword type="macro" name="NM_SETTING_PPPOE_PASSWORD" link="NMSettingPPPOE.html#NM-SETTING-PPPOE-PASSWORD:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_PPPOE_PASSWORD_FLAGS" link="NMSettingPPPOE.html#NM-SETTING-PPPOE-PASSWORD-FLAGS:CAPS"/>
     <keyword type="struct" name="NMSettingPPPOE" link="NMSettingPPPOE.html#NMSettingPPPOE-struct"/>
     <keyword type="struct" name="NMSettingPPPOEClass" link="NMSettingPPPOE.html#NMSettingPPPOEClass"/>
     <keyword type="function" name="nm_setting_pppoe_get_type ()" link="NMSettingPPPOE.html#nm-setting-pppoe-get-type"/>
@@ -766,7 +747,9 @@
     <keyword type="function" name="nm_setting_pppoe_get_service ()" link="NMSettingPPPOE.html#nm-setting-pppoe-get-service"/>
     <keyword type="function" name="nm_setting_pppoe_get_username ()" link="NMSettingPPPOE.html#nm-setting-pppoe-get-username"/>
     <keyword type="function" name="nm_setting_pppoe_get_password ()" link="NMSettingPPPOE.html#nm-setting-pppoe-get-password"/>
+    <keyword type="function" name="nm_setting_pppoe_get_password_flags ()" link="NMSettingPPPOE.html#nm-setting-pppoe-get-password-flags"/>
     <keyword type="property" name="The &quot;password&quot; property" link="NMSettingPPPOE.html#NMSettingPPPOE--password"/>
+    <keyword type="property" name="The &quot;password-flags&quot; property" link="NMSettingPPPOE.html#NMSettingPPPOE--password-flags"/>
     <keyword type="property" name="The &quot;service&quot; property" link="NMSettingPPPOE.html#NMSettingPPPOE--service"/>
     <keyword type="property" name="The &quot;username&quot; property" link="NMSettingPPPOE.html#NMSettingPPPOE--username"/>
     <keyword type="macro" name="NM_SETTING_VPN_SETTING_NAME" link="NMSettingVPN.html#NM-SETTING-VPN-SETTING-NAME:CAPS"/>
@@ -780,7 +763,7 @@
     <keyword type="macro" name="NM_SETTING_VPN_SECRETS" link="NMSettingVPN.html#NM-SETTING-VPN-SECRETS:CAPS"/>
     <keyword type="struct" name="NMSettingVPN" link="NMSettingVPN.html#NMSettingVPN-struct"/>
     <keyword type="struct" name="NMSettingVPNClass" link="NMSettingVPN.html#NMSettingVPNClass"/>
-    <keyword type="function" name="VPNIterFunc ()" link="NMSettingVPN.html#VPNIterFunc"/>
+    <keyword type="function" name="NMVPNIterFunc ()" link="NMSettingVPN.html#NMVPNIterFunc"/>
     <keyword type="function" name="nm_setting_vpn_get_type ()" link="NMSettingVPN.html#nm-setting-vpn-get-type"/>
     <keyword type="function" name="nm_setting_vpn_new ()" link="NMSettingVPN.html#nm-setting-vpn-new"/>
     <keyword type="function" name="nm_setting_vpn_get_service_type ()" link="NMSettingVPN.html#nm-setting-vpn-get-service-type"/>
@@ -797,16 +780,6 @@
     <keyword type="property" name="The &quot;secrets&quot; property" link="NMSettingVPN.html#NMSettingVPN--secrets"/>
     <keyword type="property" name="The &quot;service-type&quot; property" link="NMSettingVPN.html#NMSettingVPN--service-type"/>
     <keyword type="property" name="The &quot;user-name&quot; property" link="NMSettingVPN.html#NMSettingVPN--user-name"/>
-    <keyword type="macro" name="nm_print_backtrace" link="libnm-util-nm-utils.html#nm-print-backtrace"/>
-    <keyword type="macro" name="nm_get_timestamp()" link="libnm-util-nm-utils.html#nm-get-timestamp"/>
-    <keyword type="macro" name="nm_info()" link="libnm-util-nm-utils.html#nm-info"/>
-    <keyword type="macro" name="nm_info_str()" link="libnm-util-nm-utils.html#nm-info-str"/>
-    <keyword type="macro" name="nm_debug()" link="libnm-util-nm-utils.html#nm-debug"/>
-    <keyword type="macro" name="nm_debug_str()" link="libnm-util-nm-utils.html#nm-debug-str"/>
-    <keyword type="macro" name="nm_warning()" link="libnm-util-nm-utils.html#nm-warning"/>
-    <keyword type="macro" name="nm_warning_str()" link="libnm-util-nm-utils.html#nm-warning-str"/>
-    <keyword type="macro" name="nm_error()" link="libnm-util-nm-utils.html#nm-error"/>
-    <keyword type="macro" name="nm_error_str()" link="libnm-util-nm-utils.html#nm-error-str"/>
     <keyword type="function" name="nm_utils_init ()" link="libnm-util-nm-utils.html#nm-utils-init"/>
     <keyword type="function" name="nm_utils_deinit ()" link="libnm-util-nm-utils.html#nm-utils-deinit"/>
     <keyword type="function" name="nm_utils_is_empty_ssid ()" link="libnm-util-nm-utils.html#nm-utils-is-empty-ssid"/>
@@ -837,15 +810,17 @@
     <keyword type="function" name="nm_utils_wifi_channel_to_freq ()" link="libnm-util-nm-utils.html#nm-utils-wifi-channel-to-freq"/>
     <keyword type="function" name="nm_utils_wifi_find_next_channel ()" link="libnm-util-nm-utils.html#nm-utils-wifi-find-next-channel"/>
     <keyword type="function" name="nm_utils_wifi_is_channel_valid ()" link="libnm-util-nm-utils.html#nm-utils-wifi-is-channel-valid"/>
-    <keyword type="constant" name="NM_CONNECTION_SCOPE_UNKNOWN" link="NMConnection.html#NM-CONNECTION-SCOPE-UNKNOWN:CAPS"/>
-    <keyword type="constant" name="NM_CONNECTION_SCOPE_SYSTEM" link="NMConnection.html#NM-CONNECTION-SCOPE-SYSTEM:CAPS"/>
-    <keyword type="constant" name="NM_CONNECTION_SCOPE_USER" link="NMConnection.html#NM-CONNECTION-SCOPE-USER:CAPS"/>
-    <keyword type="constant" name="NM_CONNECTION_ERROR_UNKNOWN" link="NMConnection.html#NM-CONNECTION-ERROR-UNKNOWN:CAPS"/>
-    <keyword type="constant" name="NM_CONNECTION_ERROR_CONNECTION_SETTING_NOT_FOUND" link="NMConnection.html#NM-CONNECTION-ERROR-CONNECTION-SETTING-NOT-FOUND:CAPS"/>
     <keyword type="constant" name="NM_SETTING_ERROR_UNKNOWN" link="NMSetting.html#NM-SETTING-ERROR-UNKNOWN:CAPS"/>
     <keyword type="constant" name="NM_SETTING_ERROR_PROPERTY_NOT_FOUND" link="NMSetting.html#NM-SETTING-ERROR-PROPERTY-NOT-FOUND:CAPS"/>
     <keyword type="constant" name="NM_SETTING_ERROR_PROPERTY_NOT_SECRET" link="NMSetting.html#NM-SETTING-ERROR-PROPERTY-NOT-SECRET:CAPS"/>
     <keyword type="constant" name="NM_SETTING_ERROR_PROPERTY_TYPE_MISMATCH" link="NMSetting.html#NM-SETTING-ERROR-PROPERTY-TYPE-MISMATCH:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_SECRET_FLAG_NONE" link="NMSetting.html#NM-SETTING-SECRET-FLAG-NONE:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_SECRET_FLAG_AGENT_OWNED" link="NMSetting.html#NM-SETTING-SECRET-FLAG-AGENT-OWNED:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_SECRET_FLAG_NOT_SAVED" link="NMSetting.html#NM-SETTING-SECRET-FLAG-NOT-SAVED:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_SECRET_FLAG_NOT_REQUIRED" link="NMSetting.html#NM-SETTING-SECRET-FLAG-NOT-REQUIRED:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_HASH_FLAG_ALL" link="NMSetting.html#NM-SETTING-HASH-FLAG-ALL:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_HASH_FLAG_NO_SECRETS" link="NMSetting.html#NM-SETTING-HASH-FLAG-NO-SECRETS:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_HASH_FLAG_ONLY_SECRETS" link="NMSetting.html#NM-SETTING-HASH-FLAG-ONLY-SECRETS:CAPS"/>
     <keyword type="constant" name="NM_SETTING_COMPARE_FLAG_EXACT" link="NMSetting.html#NM-SETTING-COMPARE-FLAG-EXACT:CAPS"/>
     <keyword type="constant" name="NM_SETTING_COMPARE_FLAG_FUZZY" link="NMSetting.html#NM-SETTING-COMPARE-FLAG-FUZZY:CAPS"/>
     <keyword type="constant" name="NM_SETTING_COMPARE_FLAG_IGNORE_ID" link="NMSetting.html#NM-SETTING-COMPARE-FLAG-IGNORE-ID:CAPS"/>
@@ -857,5 +832,12 @@
     <keyword type="constant" name="NM_SETTING_CONNECTION_ERROR_INVALID_PROPERTY" link="NMSettingConnection.html#NM-SETTING-CONNECTION-ERROR-INVALID-PROPERTY:CAPS"/>
     <keyword type="constant" name="NM_SETTING_CONNECTION_ERROR_MISSING_PROPERTY" link="NMSettingConnection.html#NM-SETTING-CONNECTION-ERROR-MISSING-PROPERTY:CAPS"/>
     <keyword type="constant" name="NM_SETTING_CONNECTION_ERROR_TYPE_SETTING_NOT_FOUND" link="NMSettingConnection.html#NM-SETTING-CONNECTION-ERROR-TYPE-SETTING-NOT-FOUND:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_802_1X_CK_FORMAT_UNKNOWN" link="NMSetting8021x.html#NM-SETTING-802-1X-CK-FORMAT-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_802_1X_CK_FORMAT_X509" link="NMSetting8021x.html#NM-SETTING-802-1X-CK-FORMAT-X509:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_802_1X_CK_FORMAT_RAW_KEY" link="NMSetting8021x.html#NM-SETTING-802-1X-CK-FORMAT-RAW-KEY:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_802_1X_CK_FORMAT_PKCS12" link="NMSetting8021x.html#NM-SETTING-802-1X-CK-FORMAT-PKCS12:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_802_1X_CK_SCHEME_UNKNOWN" link="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_802_1X_CK_SCHEME_BLOB" link="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_802_1X_CK_SCHEME_PATH" link="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"/>
   </functions>
 </book>
diff --git a/docs/libnm-util/html/object-tree.html b/docs/libnm-util/html/object-tree.html
index b6a18ffeb..bbe2a6d2c 100644
--- a/docs/libnm-util/html/object-tree.html
+++ b/docs/libnm-util/html/object-tree.html
@@ -3,12 +3,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Object Hierarchy</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="libnm-util Reference Manual">
 <link rel="up" href="index.html" title="libnm-util Reference Manual">
 <link rel="prev" href="libnm-util-nm-utils.html" title="nm-utils">
 <link rel="next" href="api-index-full.html" title="API Index">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -19,12 +19,12 @@
 <th width="100%" align="center">libnm-util Reference Manual</th>
 <td><a accesskey="n" href="api-index-full.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
 </tr></table>
-<div class="chapter" title="Object Hierarchy">
+<div class="chapter">
 <div class="titlepage"><div><div><h2 class="title">
 <a name="object-tree"></a>Object Hierarchy</h2></div></div></div>
 <pre class="screen">
     <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>
-        <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+        NMConnection
         <a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
             <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
             <a class="link" href="NMSettingBluetooth.html" title="NMSettingBluetooth">NMSettingBluetooth</a>
@@ -38,13 +38,38 @@
             <a class="link" href="NMSettingPPPOE.html" title="NMSettingPPPOE">NMSettingPPPOE</a>
             <a class="link" href="NMSettingSerial.html" title="NMSettingSerial">NMSettingSerial</a>
             <a class="link" href="NMSettingVPN.html" title="NMSettingVPN">NMSettingVPN</a>
+            NMSettingWimax
             <a class="link" href="NMSettingWired.html" title="NMSettingWired">NMSettingWired</a>
             <a class="link" href="NMSettingWireless.html" title="NMSettingWireless">NMSettingWireless</a>
             <a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity">NMSettingWirelessSecurity</a>
+    GEnum
+        NMConnectionError
+        <a class="link" href="NMSetting8021x.html#NMSetting8021xError">NMSetting8021xError</a>
+        <a class="link" href="NMSettingBluetooth.html#NMSettingBluetoothError">NMSettingBluetoothError</a>
+        <a class="link" href="NMSettingCdma.html#NMSettingCdmaError">NMSettingCdmaError</a>
+        <a class="link" href="NMSettingConnection.html#NMSettingConnectionError">NMSettingConnectionError</a>
+        <a class="link" href="NMSetting.html#NMSettingError">NMSettingError</a>
+        <a class="link" href="NMSettingGsm.html#NMSettingGsmError">NMSettingGsmError</a>
+        <a class="link" href="NMSettingIP4Config.html#NMSettingIP4ConfigError">NMSettingIP4ConfigError</a>
+        <a class="link" href="NMSettingIP6Config.html#NMSettingIP6ConfigError">NMSettingIP6ConfigError</a>
+        <a class="link" href="NMSettingOlpcMesh.html#NMSettingOlpcMeshError">NMSettingOlpcMeshError</a>
+        <a class="link" href="NMSettingPPP.html#NMSettingPPPError">NMSettingPPPError</a>
+        <a class="link" href="NMSettingPPPOE.html#NMSettingPPPOEError">NMSettingPPPOEError</a>
+        <a class="link" href="NMSettingSerial.html#NMSettingSerialError">NMSettingSerialError</a>
+        <a class="link" href="NMSettingVPN.html#NMSettingVpnError">NMSettingVpnError</a>
+        NMSettingWimaxError
+        <a class="link" href="NMSettingWired.html#NMSettingWiredError">NMSettingWiredError</a>
+        <a class="link" href="NMSettingWireless.html#NMSettingWirelessError">NMSettingWirelessError</a>
+        <a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurityError">NMSettingWirelessSecurityError</a>
+    GBoxed
+        <a class="link" href="NMSettingIP4Config.html#NMIP4Address">NMIP4Address</a>
+        <a class="link" href="NMSettingIP4Config.html#NMIP4Route">NMIP4Route</a>
+        <a class="link" href="NMSettingIP6Config.html#NMIP6Address">NMIP6Address</a>
+        <a class="link" href="NMSettingIP6Config.html#NMIP6Route">NMIP6Route</a>
 </pre>
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.15</div>
+          Generated by GTK-Doc V1.17</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/style.css b/docs/libnm-util/html/style.css
index d544a2c2e..d6f6c26ec 100644
--- a/docs/libnm-util/html/style.css
+++ b/docs/libnm-util/html/style.css
@@ -32,8 +32,9 @@
   /* this is needed so that the local anchors are displayed below the naviagtion */
   div.footnote a[name], div.refnamediv a[name], div.refsect1 a[name], div.refsect2 a[name], div.index a[name], div.glossary a[name], div.sect1 a[name]
   {
+    display: inline-block;
     position: relative;
-    padding-top:4.5em;
+    top:-5em;
   }
   /* this seems to be a bug in the xsl style sheets when generating indexes */
   div.index div.index
diff --git a/docs/libnm-util/libnm-util-docs.sgml b/docs/libnm-util/libnm-util-docs.sgml
index 78b931d8a..c80565ab6 100644
--- a/docs/libnm-util/libnm-util-docs.sgml
+++ b/docs/libnm-util/libnm-util-docs.sgml
@@ -8,9 +8,9 @@
   <bookinfo>
     <title>libnm-util Reference Manual</title>
     <releaseinfo>
-      for libnm-util 0.8
+      for libnm-util 0.9
       The latest version of this documentation can be found on-line at
-      <ulink role="online-location" url="http://projects.gnome.org/NetworkManager/developers/libnm-util/08/">http://projects.gnome.org/NetworkManager/developers/libnm-util/08/</ulink>.
+      <ulink role="online-location" url="http://projects.gnome.org/NetworkManager/developers/libnm-util/09/">http://projects.gnome.org/NetworkManager/developers/libnm-util/09/</ulink>.
     </releaseinfo>
   </bookinfo>
 
diff --git a/docs/libnm-util/libnm-util-sections.txt b/docs/libnm-util/libnm-util-sections.txt
index 38eef9cb2..1df4b49b0 100644
--- a/docs/libnm-util/libnm-util-sections.txt
+++ b/docs/libnm-util/libnm-util-sections.txt
@@ -1,4 +1,50 @@
 <SECTION>
+<FILE>nm-setting-gsm</FILE>
+<TITLE>NMSettingGsm</TITLE>
+NM_SETTING_GSM_SETTING_NAME
+NMSettingGsmError
+NM_TYPE_SETTING_GSM_ERROR
+NM_SETTING_GSM_ERROR
+nm_setting_gsm_error_quark
+NM_SETTING_GSM_NUMBER
+NM_SETTING_GSM_USERNAME
+NM_SETTING_GSM_PASSWORD
+NM_SETTING_GSM_PASSWORD_FLAGS
+NM_SETTING_GSM_APN
+NM_SETTING_GSM_NETWORK_ID
+NM_SETTING_GSM_NETWORK_TYPE
+NM_SETTING_GSM_ALLOWED_BANDS
+NM_SETTING_GSM_PIN
+NM_SETTING_GSM_PIN_FLAGS
+NM_SETTING_GSM_HOME_ONLY
+NMSettingGsmNetworkType
+NMSettingGsmNetworkBand
+NMSettingGsm
+NMSettingGsmClass
+nm_setting_gsm_get_type
+nm_setting_gsm_new
+nm_setting_gsm_get_number
+nm_setting_gsm_get_username
+nm_setting_gsm_get_password
+nm_setting_gsm_get_apn
+nm_setting_gsm_get_network_id
+nm_setting_gsm_get_network_type
+nm_setting_gsm_get_allowed_bands
+nm_setting_gsm_get_pin
+nm_setting_gsm_get_home_only
+nm_setting_gsm_get_pin_flags
+nm_setting_gsm_get_password_flags
+<SUBSECTION Standard>
+NM_SETTING_GSM
+NM_IS_SETTING_GSM
+NM_TYPE_SETTING_GSM
+nm_setting_gsm_error_get_type
+NM_SETTING_GSM_CLASS
+NM_IS_SETTING_GSM_CLASS
+NM_SETTING_GSM_GET_CLASS
+</SECTION>
+
+<SECTION>
 <FILE>nm-setting-8021x</FILE>
 <TITLE>NMSetting8021x</TITLE>
 NMSetting8021xCKFormat
@@ -23,12 +69,15 @@ NM_SETTING_802_1X_PHASE2_CA_CERT
 NM_SETTING_802_1X_PHASE2_CA_PATH
 NM_SETTING_802_1X_PHASE2_CLIENT_CERT
 NM_SETTING_802_1X_PASSWORD
+NM_SETTING_802_1X_PASSWORD_FLAGS
 NM_SETTING_802_1X_PRIVATE_KEY
 NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD
+NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS
 NM_SETTING_802_1X_PHASE2_PRIVATE_KEY
 NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD
+NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS
 NM_SETTING_802_1X_PIN
-NM_SETTING_802_1X_PSK
+NM_SETTING_802_1X_PIN_FLAGS
 NM_SETTING_802_1X_SYSTEM_CA_CERTS
 NMSetting8021x
 NMSetting8021xClass
@@ -66,35 +115,23 @@ nm_setting_802_1x_get_phase2_client_cert_blob
 nm_setting_802_1x_get_phase2_client_cert_path
 nm_setting_802_1x_set_phase2_client_cert
 nm_setting_802_1x_get_password
+nm_setting_802_1x_get_password_flags
 nm_setting_802_1x_get_pin
-nm_setting_802_1x_get_psk
+nm_setting_802_1x_get_pin_flags
 nm_setting_802_1x_get_private_key_scheme
 nm_setting_802_1x_get_private_key_blob
 nm_setting_802_1x_get_private_key_path
 nm_setting_802_1x_set_private_key
 nm_setting_802_1x_get_private_key_password
+nm_setting_802_1x_get_private_key_password_flags
 nm_setting_802_1x_get_private_key_format
 nm_setting_802_1x_get_phase2_private_key_scheme
 nm_setting_802_1x_get_phase2_private_key_blob
 nm_setting_802_1x_get_phase2_private_key_path
 nm_setting_802_1x_set_phase2_private_key
 nm_setting_802_1x_get_phase2_private_key_password
+nm_setting_802_1x_get_phase2_private_key_password_flags
 nm_setting_802_1x_get_phase2_private_key_format
-NMSetting8021xCKType
-nm_setting_802_1x_get_ca_cert
-nm_setting_802_1x_set_ca_cert_from_file
-nm_setting_802_1x_get_client_cert
-nm_setting_802_1x_set_client_cert_from_file
-nm_setting_802_1x_get_phase2_ca_cert
-nm_setting_802_1x_set_phase2_ca_cert_from_file
-nm_setting_802_1x_get_phase2_client_cert
-nm_setting_802_1x_set_phase2_client_cert_from_file
-nm_setting_802_1x_get_private_key
-nm_setting_802_1x_set_private_key_from_file
-nm_setting_802_1x_get_private_key_type
-nm_setting_802_1x_get_phase2_private_key
-nm_setting_802_1x_set_phase2_private_key_from_file
-nm_setting_802_1x_get_phase2_private_key_type
 <SUBSECTION Standard>
 NM_SETTING_802_1X
 NM_IS_SETTING_802_1X
@@ -106,180 +143,31 @@ NM_SETTING_802_1X_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>nm-connection</FILE>
-<TITLE>NMConnection</TITLE>
-NMConnectionScope
-NMConnectionError
-NM_TYPE_CONNECTION_ERROR
-NM_CONNECTION_ERROR
-nm_connection_error_quark
-NM_CONNECTION_SCOPE
-NM_CONNECTION_PATH
-NMConnection
-NMConnectionClass
-nm_connection_get_type
-nm_connection_new
-nm_connection_new_from_hash
-nm_connection_duplicate
-nm_connection_add_setting
-nm_connection_remove_setting
-nm_connection_get_setting
-nm_connection_get_setting_by_name
-nm_connection_replace_settings
-nm_connection_compare
-nm_connection_diff
-nm_connection_verify
-nm_connection_need_secrets
-nm_connection_clear_secrets
-nm_connection_update_secrets
-nm_connection_set_scope
-nm_connection_get_scope
-nm_connection_set_path
-nm_connection_get_path
-nm_connection_for_each_setting_value
-nm_connection_to_hash
-nm_connection_dump
-nm_connection_create_setting
-nm_connection_lookup_setting_type
-nm_connection_lookup_setting_type_by_quark
-<SUBSECTION Standard>
-NM_CONNECTION
-NM_IS_CONNECTION
-NM_TYPE_CONNECTION
-nm_connection_error_get_type
-NM_CONNECTION_CLASS
-NM_IS_CONNECTION_CLASS
-NM_CONNECTION_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>nm-setting</FILE>
-<TITLE>NMSetting</TITLE>
-NMSettingError
-NM_TYPE_SETTING_ERROR
-NM_SETTING_ERROR
-nm_setting_error_quark
-NM_SETTING_PARAM_SERIALIZE
-NM_SETTING_PARAM_REQUIRED
-NM_SETTING_PARAM_SECRET
-NM_SETTING_PARAM_FUZZY_IGNORE
-NM_SETTING_NAME
-NMSetting
-NMSettingClass
-NMSettingValueIterFn
-nm_setting_get_type
-nm_setting_to_hash
-nm_setting_new_from_hash
-nm_setting_duplicate
-nm_setting_get_name
-nm_setting_verify
-NMSettingCompareFlags
-nm_setting_compare
-NMSettingDiffResult
-nm_setting_diff
-nm_setting_enumerate_values
-nm_setting_to_string
-nm_setting_clear_secrets
-nm_setting_need_secrets
-nm_setting_update_secrets
-<SUBSECTION Standard>
-NM_SETTING
-NM_IS_SETTING
-NM_TYPE_SETTING
-nm_setting_error_get_type
-NM_SETTING_CLASS
-NM_IS_SETTING_CLASS
-NM_SETTING_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>nm-setting-serial</FILE>
-<TITLE>NMSettingSerial</TITLE>
-NM_SETTING_SERIAL_SETTING_NAME
-NMSettingSerialError
-NM_TYPE_SETTING_SERIAL_ERROR
-NM_SETTING_SERIAL_ERROR
-nm_setting_serial_error_quark
-NM_SETTING_SERIAL_BAUD
-NM_SETTING_SERIAL_BITS
-NM_SETTING_SERIAL_PARITY
-NM_SETTING_SERIAL_STOPBITS
-NM_SETTING_SERIAL_SEND_DELAY
-NMSettingSerial
-NMSettingSerialClass
-nm_setting_serial_get_type
-nm_setting_serial_new
-nm_setting_serial_get_baud
-nm_setting_serial_get_bits
-nm_setting_serial_get_parity
-nm_setting_serial_get_stopbits
-nm_setting_serial_get_send_delay
-<SUBSECTION Standard>
-NM_SETTING_SERIAL
-NM_IS_SETTING_SERIAL
-NM_TYPE_SETTING_SERIAL
-nm_setting_serial_error_get_type
-NM_SETTING_SERIAL_CLASS
-NM_IS_SETTING_SERIAL_CLASS
-NM_SETTING_SERIAL_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>nm-setting-ppp</FILE>
-<TITLE>NMSettingPPP</TITLE>
-NM_SETTING_PPP_SETTING_NAME
-NMSettingPPPError
-NM_TYPE_SETTING_PPP_ERROR
-NM_SETTING_PPP_ERROR
-nm_setting_ppp_error_quark
-NM_SETTING_PPP_NOAUTH
-NM_SETTING_PPP_REFUSE_EAP
-NM_SETTING_PPP_REFUSE_PAP
-NM_SETTING_PPP_REFUSE_CHAP
-NM_SETTING_PPP_REFUSE_MSCHAP
-NM_SETTING_PPP_REFUSE_MSCHAPV2
-NM_SETTING_PPP_NOBSDCOMP
-NM_SETTING_PPP_NODEFLATE
-NM_SETTING_PPP_NO_VJ_COMP
-NM_SETTING_PPP_REQUIRE_MPPE
-NM_SETTING_PPP_REQUIRE_MPPE_128
-NM_SETTING_PPP_MPPE_STATEFUL
-NM_SETTING_PPP_CRTSCTS
-NM_SETTING_PPP_BAUD
-NM_SETTING_PPP_MRU
-NM_SETTING_PPP_MTU
-NM_SETTING_PPP_LCP_ECHO_FAILURE
-NM_SETTING_PPP_LCP_ECHO_INTERVAL
-NMSettingPPP
-NMSettingPPPClass
-nm_setting_ppp_get_type
-nm_setting_ppp_new
-nm_setting_ppp_get_noauth
-nm_setting_ppp_get_refuse_eap
-nm_setting_ppp_get_refuse_pap
-nm_setting_ppp_get_refuse_chap
-nm_setting_ppp_get_refuse_mschap
-nm_setting_ppp_get_refuse_mschapv2
-nm_setting_ppp_get_nobsdcomp
-nm_setting_ppp_get_nodeflate
-nm_setting_ppp_get_no_vj_comp
-nm_setting_ppp_get_require_mppe
-nm_setting_ppp_get_require_mppe_128
-nm_setting_ppp_get_mppe_stateful
-nm_setting_ppp_get_crtscts
-nm_setting_ppp_get_baud
-nm_setting_ppp_get_mru
-nm_setting_ppp_get_mtu
-nm_setting_ppp_get_lcp_echo_failure
-nm_setting_ppp_get_lcp_echo_interval
+<FILE>nm-setting-bluetooth</FILE>
+<TITLE>NMSettingBluetooth</TITLE>
+NM_SETTING_BLUETOOTH_SETTING_NAME
+NMSettingBluetoothError
+NM_TYPE_SETTING_BLUETOOTH_ERROR
+NM_SETTING_BLUETOOTH_ERROR
+nm_setting_bluetooth_error_quark
+NM_SETTING_BLUETOOTH_BDADDR
+NM_SETTING_BLUETOOTH_TYPE
+NM_SETTING_BLUETOOTH_TYPE_DUN
+NM_SETTING_BLUETOOTH_TYPE_PANU
+NMSettingBluetooth
+NMSettingBluetoothClass
+nm_setting_bluetooth_get_type
+nm_setting_bluetooth_new
+nm_setting_bluetooth_get_bdaddr
+nm_setting_bluetooth_get_connection_type
 <SUBSECTION Standard>
-NM_SETTING_PPP
-NM_IS_SETTING_PPP
-NM_TYPE_SETTING_PPP
-nm_setting_ppp_error_get_type
-NM_SETTING_PPP_CLASS
-NM_IS_SETTING_PPP_CLASS
-NM_SETTING_PPP_GET_CLASS
+NM_SETTING_BLUETOOTH
+NM_IS_SETTING_BLUETOOTH
+NM_TYPE_SETTING_BLUETOOTH
+nm_setting_bluetooth_error_get_type
+NM_SETTING_BLUETOOTH_CLASS
+NM_IS_SETTING_BLUETOOTH_CLASS
+NM_SETTING_BLUETOOTH_GET_CLASS
 </SECTION>
 
 <SECTION>
@@ -311,101 +199,6 @@ NM_SETTING_OLPC_MESH_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>nm-setting-wired</FILE>
-<TITLE>NMSettingWired</TITLE>
-NM_SETTING_WIRED_SETTING_NAME
-NMSettingWiredError
-NM_TYPE_SETTING_WIRED_ERROR
-NM_SETTING_WIRED_ERROR
-nm_setting_wired_error_quark
-NM_SETTING_WIRED_PORT
-NM_SETTING_WIRED_SPEED
-NM_SETTING_WIRED_DUPLEX
-NM_SETTING_WIRED_AUTO_NEGOTIATE
-NM_SETTING_WIRED_MAC_ADDRESS
-NM_SETTING_WIRED_CLONED_MAC_ADDRESS
-NM_SETTING_WIRED_MTU
-NM_SETTING_WIRED_S390_SUBCHANNELS
-NM_SETTING_WIRED_S390_NETTYPE
-NM_SETTING_WIRED_S390_OPTIONS
-NMSettingWired
-NMSettingWiredClass
-nm_setting_wired_get_type
-nm_setting_wired_new
-nm_setting_wired_get_port
-nm_setting_wired_get_speed
-nm_setting_wired_get_duplex
-nm_setting_wired_get_auto_negotiate
-nm_setting_wired_get_mac_address
-nm_setting_wired_get_cloned_mac_address
-nm_setting_wired_get_mtu
-nm_setting_wired_get_s390_subchannels
-nm_setting_wired_get_s390_nettype
-nm_setting_wired_get_num_s390_options
-nm_setting_wired_get_s390_option
-nm_setting_wired_get_s390_option_by_key
-nm_setting_wired_add_s390_option
-nm_setting_wired_remove_s390_option
-<SUBSECTION Standard>
-NM_SETTING_WIRED
-NM_IS_SETTING_WIRED
-NM_TYPE_SETTING_WIRED
-nm_setting_wired_error_get_type
-NM_SETTING_WIRED_CLASS
-NM_IS_SETTING_WIRED_CLASS
-NM_SETTING_WIRED_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>nm-setting-wireless</FILE>
-<TITLE>NMSettingWireless</TITLE>
-NM_SETTING_WIRELESS_SETTING_NAME
-NMSettingWirelessError
-NM_TYPE_SETTING_WIRELESS_ERROR
-NM_SETTING_WIRELESS_ERROR
-nm_setting_wireless_error_quark
-NM_SETTING_WIRELESS_SSID
-NM_SETTING_WIRELESS_MODE
-NM_SETTING_WIRELESS_BAND
-NM_SETTING_WIRELESS_CHANNEL
-NM_SETTING_WIRELESS_BSSID
-NM_SETTING_WIRELESS_RATE
-NM_SETTING_WIRELESS_TX_POWER
-NM_SETTING_WIRELESS_MAC_ADDRESS
-NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS
-NM_SETTING_WIRELESS_MTU
-NM_SETTING_WIRELESS_SEEN_BSSIDS
-NM_SETTING_WIRELESS_SEC
-NMSettingWireless
-NMSettingWirelessClass
-nm_setting_wireless_get_type
-nm_setting_wireless_new
-nm_setting_wireless_get_ssid
-nm_setting_wireless_get_mode
-nm_setting_wireless_get_band
-nm_setting_wireless_get_channel
-nm_setting_wireless_get_bssid
-nm_setting_wireless_get_rate
-nm_setting_wireless_get_tx_power
-nm_setting_wireless_get_mac_address
-nm_setting_wireless_get_cloned_mac_address
-nm_setting_wireless_get_mtu
-nm_setting_wireless_get_security
-nm_setting_wireless_add_seen_bssid
-nm_setting_wireless_get_num_seen_bssids
-nm_setting_wireless_get_seen_bssid
-nm_setting_wireless_ap_security_compatible
-<SUBSECTION Standard>
-NM_SETTING_WIRELESS
-NM_IS_SETTING_WIRELESS
-NM_TYPE_SETTING_WIRELESS
-nm_setting_wireless_error_get_type
-NM_SETTING_WIRELESS_CLASS
-NM_IS_SETTING_WIRELESS_CLASS
-NM_SETTING_WIRELESS_GET_CLASS
-</SECTION>
-
-<SECTION>
 <FILE>nm-setting-cdma</FILE>
 <TITLE>NMSettingCdma</TITLE>
 NM_SETTING_CDMA_SETTING_NAME
@@ -416,6 +209,7 @@ nm_setting_cdma_error_quark
 NM_SETTING_CDMA_NUMBER
 NM_SETTING_CDMA_USERNAME
 NM_SETTING_CDMA_PASSWORD
+NM_SETTING_CDMA_PASSWORD_FLAGS
 NMSettingCdma
 NMSettingCdmaClass
 nm_setting_cdma_get_type
@@ -423,6 +217,7 @@ nm_setting_cdma_new
 nm_setting_cdma_get_number
 nm_setting_cdma_get_username
 nm_setting_cdma_get_password
+nm_setting_cdma_get_password_flags
 <SUBSECTION Standard>
 NM_SETTING_CDMA
 NM_IS_SETTING_CDMA
@@ -434,96 +229,35 @@ NM_SETTING_CDMA_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>nm-setting-ip4-config</FILE>
-<TITLE>NMSettingIP4Config</TITLE>
-NM_SETTING_IP4_CONFIG_SETTING_NAME
-NMSettingIP4ConfigError
-NM_TYPE_SETTING_IP4_CONFIG_ERROR
-NM_SETTING_IP4_CONFIG_ERROR
-nm_setting_ip4_config_error_quark
-NM_SETTING_IP4_CONFIG_METHOD
-NM_SETTING_IP4_CONFIG_DNS
-NM_SETTING_IP4_CONFIG_DNS_SEARCH
-NM_SETTING_IP4_CONFIG_ADDRESSES
-NM_SETTING_IP4_CONFIG_ROUTES
-NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES
-NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS
-NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID
-NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME
-NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME
-NM_SETTING_IP4_CONFIG_NEVER_DEFAULT
-NM_SETTING_IP4_CONFIG_MAY_FAIL
-NM_SETTING_IP4_CONFIG_METHOD_AUTO
-NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL
-NM_SETTING_IP4_CONFIG_METHOD_MANUAL
-NM_SETTING_IP4_CONFIG_METHOD_SHARED
-NM_SETTING_IP4_CONFIG_METHOD_DISABLED
-NMIP4Address
-nm_ip4_address_new
-nm_ip4_address_dup
-nm_ip4_address_ref
-nm_ip4_address_unref
-nm_ip4_address_compare
-nm_ip4_address_get_address
-nm_ip4_address_set_address
-nm_ip4_address_get_prefix
-nm_ip4_address_set_prefix
-nm_ip4_address_get_gateway
-nm_ip4_address_set_gateway
-NMIP4Route
-nm_ip4_route_new
-nm_ip4_route_dup
-nm_ip4_route_ref
-nm_ip4_route_unref
-nm_ip4_route_compare
-nm_ip4_route_get_dest
-nm_ip4_route_set_dest
-nm_ip4_route_get_prefix
-nm_ip4_route_set_prefix
-nm_ip4_route_get_next_hop
-nm_ip4_route_set_next_hop
-nm_ip4_route_get_metric
-nm_ip4_route_set_metric
-NMSettingIP4Config
-NMSettingIP4ConfigClass
-nm_setting_ip4_config_get_type
-nm_setting_ip4_config_new
-nm_setting_ip4_config_get_method
-nm_setting_ip4_config_get_num_dns
-nm_setting_ip4_config_get_dns
-nm_setting_ip4_config_add_dns
-nm_setting_ip4_config_remove_dns
-nm_setting_ip4_config_clear_dns
-nm_setting_ip4_config_get_num_dns_searches
-nm_setting_ip4_config_get_dns_search
-nm_setting_ip4_config_add_dns_search
-nm_setting_ip4_config_remove_dns_search
-nm_setting_ip4_config_clear_dns_searches
-nm_setting_ip4_config_get_num_addresses
-nm_setting_ip4_config_get_address
-nm_setting_ip4_config_add_address
-nm_setting_ip4_config_remove_address
-nm_setting_ip4_config_clear_addresses
-nm_setting_ip4_config_get_num_routes
-nm_setting_ip4_config_get_route
-nm_setting_ip4_config_add_route
-nm_setting_ip4_config_remove_route
-nm_setting_ip4_config_clear_routes
-nm_setting_ip4_config_get_ignore_auto_routes
-nm_setting_ip4_config_get_ignore_auto_dns
-nm_setting_ip4_config_get_dhcp_client_id
-nm_setting_ip4_config_get_dhcp_send_hostname
-nm_setting_ip4_config_get_dhcp_hostname
-nm_setting_ip4_config_get_never_default
-nm_setting_ip4_config_get_may_fail
+<FILE>nm-setting-serial</FILE>
+<TITLE>NMSettingSerial</TITLE>
+NM_SETTING_SERIAL_SETTING_NAME
+NMSettingSerialError
+NM_TYPE_SETTING_SERIAL_ERROR
+NM_SETTING_SERIAL_ERROR
+nm_setting_serial_error_quark
+NM_SETTING_SERIAL_BAUD
+NM_SETTING_SERIAL_BITS
+NM_SETTING_SERIAL_PARITY
+NM_SETTING_SERIAL_STOPBITS
+NM_SETTING_SERIAL_SEND_DELAY
+NMSettingSerial
+NMSettingSerialClass
+nm_setting_serial_get_type
+nm_setting_serial_new
+nm_setting_serial_get_baud
+nm_setting_serial_get_bits
+nm_setting_serial_get_parity
+nm_setting_serial_get_stopbits
+nm_setting_serial_get_send_delay
 <SUBSECTION Standard>
-NM_SETTING_IP4_CONFIG
-NM_IS_SETTING_IP4_CONFIG
-NM_TYPE_SETTING_IP4_CONFIG
-nm_setting_ip4_config_error_get_type
-NM_SETTING_IP4_CONFIG_CLASS
-NM_IS_SETTING_IP4_CONFIG_CLASS
-NM_SETTING_IP4_CONFIG_GET_CLASS
+NM_SETTING_SERIAL
+NM_IS_SETTING_SERIAL
+NM_TYPE_SETTING_SERIAL
+nm_setting_serial_error_get_type
+NM_SETTING_SERIAL_CLASS
+NM_IS_SETTING_SERIAL_CLASS
+NM_SETTING_SERIAL_GET_CLASS
 </SECTION>
 
 <SECTION>
@@ -546,9 +280,12 @@ NM_SETTING_WIRELESS_SECURITY_WEP_KEY0
 NM_SETTING_WIRELESS_SECURITY_WEP_KEY1
 NM_SETTING_WIRELESS_SECURITY_WEP_KEY2
 NM_SETTING_WIRELESS_SECURITY_WEP_KEY3
+NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS
+NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE
 NM_SETTING_WIRELESS_SECURITY_PSK
+NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS
 NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD
-NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE
+NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS
 NMSettingWirelessSecurity
 NMSettingWirelessSecurityClass
 nm_setting_wireless_security_get_type
@@ -570,12 +307,15 @@ nm_setting_wireless_security_add_group
 nm_setting_wireless_security_remove_group
 nm_setting_wireless_security_clear_groups
 nm_setting_wireless_security_get_psk
+nm_setting_wireless_security_get_psk_flags
 nm_setting_wireless_security_get_leap_username
 nm_setting_wireless_security_get_leap_password
+nm_setting_wireless_security_get_leap_password_flags
 nm_setting_wireless_security_get_wep_key
 nm_setting_wireless_security_set_wep_key
 nm_setting_wireless_security_get_wep_tx_keyidx
 nm_setting_wireless_security_get_auth_alg
+nm_setting_wireless_security_get_wep_key_flags
 nm_setting_wireless_security_get_wep_key_type
 <SUBSECTION Standard>
 NM_SETTING_WIRELESS_SECURITY
@@ -588,119 +328,6 @@ NM_SETTING_WIRELESS_SECURITY_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>nm-setting-pppoe</FILE>
-<TITLE>NMSettingPPPOE</TITLE>
-NM_SETTING_PPPOE_SETTING_NAME
-NMSettingPPPOEError
-NM_TYPE_SETTING_PPPOE_ERROR
-NM_SETTING_PPPOE_ERROR
-nm_setting_pppoe_error_quark
-NM_SETTING_PPPOE_SERVICE
-NM_SETTING_PPPOE_USERNAME
-NM_SETTING_PPPOE_PASSWORD
-NMSettingPPPOE
-NMSettingPPPOEClass
-nm_setting_pppoe_get_type
-nm_setting_pppoe_new
-nm_setting_pppoe_get_service
-nm_setting_pppoe_get_username
-nm_setting_pppoe_get_password
-<SUBSECTION Standard>
-NM_SETTING_PPPOE
-NM_IS_SETTING_PPPOE
-NM_TYPE_SETTING_PPPOE
-nm_setting_pppoe_error_get_type
-NM_SETTING_PPPOE_CLASS
-NM_IS_SETTING_PPPOE_CLASS
-NM_SETTING_PPPOE_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>nm-setting-connection</FILE>
-<TITLE>NMSettingConnection</TITLE>
-NM_SETTING_CONNECTION_SETTING_NAME
-NMSettingConnectionError
-NM_TYPE_SETTING_CONNECTION_ERROR
-NM_SETTING_CONNECTION_ERROR
-nm_setting_connection_error_quark
-NM_SETTING_CONNECTION_ID
-NM_SETTING_CONNECTION_UUID
-NM_SETTING_CONNECTION_TYPE
-NM_SETTING_CONNECTION_AUTOCONNECT
-NM_SETTING_CONNECTION_TIMESTAMP
-NM_SETTING_CONNECTION_READ_ONLY
-NMSettingConnection
-NMSettingConnectionClass
-nm_setting_connection_get_type
-nm_setting_connection_new
-nm_setting_connection_get_id
-nm_setting_connection_get_uuid
-nm_setting_connection_get_connection_type
-nm_setting_connection_get_autoconnect
-nm_setting_connection_get_timestamp
-nm_setting_connection_get_read_only
-<SUBSECTION Standard>
-NM_SETTING_CONNECTION
-NM_IS_SETTING_CONNECTION
-NM_TYPE_SETTING_CONNECTION
-nm_setting_connection_error_get_type
-NM_SETTING_CONNECTION_CLASS
-NM_IS_SETTING_CONNECTION_CLASS
-NM_SETTING_CONNECTION_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>nm-setting-gsm</FILE>
-<TITLE>NMSettingGsm</TITLE>
-NM_SETTING_GSM_SETTING_NAME
-NMSettingGsmError
-NM_TYPE_SETTING_GSM_ERROR
-NM_SETTING_GSM_ERROR
-nm_setting_gsm_error_quark
-NM_SETTING_GSM_NUMBER
-NM_SETTING_GSM_USERNAME
-NM_SETTING_GSM_PASSWORD
-NM_SETTING_GSM_APN
-NM_SETTING_GSM_NETWORK_ID
-NM_SETTING_GSM_NETWORK_TYPE
-NM_SETTING_GSM_ALLOWED_BANDS
-NM_SETTING_GSM_PIN
-NM_SETTING_GSM_HOME_ONLY
-NM_SETTING_GSM_PUK
-NM_SETTING_GSM_BAND
-NM_GSM_NETWORK_ANY
-NM_GSM_NETWORK_UMTS_HSPA
-NM_GSM_NETWORK_GPRS_EDGE
-NM_GSM_NETWORK_PREFER_UMTS_HSPA
-NM_GSM_NETWORK_PREFER_GPRS_EDGE
-NMSettingGsmNetworkType
-NMSettingGsmNetworkBand
-NMSettingGsm
-NMSettingGsmClass
-nm_setting_gsm_get_type
-nm_setting_gsm_new
-nm_setting_gsm_get_number
-nm_setting_gsm_get_username
-nm_setting_gsm_get_password
-nm_setting_gsm_get_apn
-nm_setting_gsm_get_network_id
-nm_setting_gsm_get_network_type
-nm_setting_gsm_get_allowed_bands
-nm_setting_gsm_get_pin
-nm_setting_gsm_get_home_only
-nm_setting_gsm_get_puk
-nm_setting_gsm_get_band
-<SUBSECTION Standard>
-NM_SETTING_GSM
-NM_IS_SETTING_GSM
-NM_TYPE_SETTING_GSM
-nm_setting_gsm_error_get_type
-NM_SETTING_GSM_CLASS
-NM_IS_SETTING_GSM_CLASS
-NM_SETTING_GSM_GET_CLASS
-</SECTION>
-
-<SECTION>
 <FILE>nm-setting-ip6-config</FILE>
 <TITLE>NMSettingIP6Config</TITLE>
 NM_SETTING_IP6_CONFIG_SETTING_NAME
@@ -724,6 +351,7 @@ NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL
 NM_SETTING_IP6_CONFIG_METHOD_MANUAL
 NM_SETTING_IP6_CONFIG_METHOD_SHARED
 NMIP6Address
+nm_ip6_address_get_type
 nm_ip6_address_new
 nm_ip6_address_dup
 nm_ip6_address_ref
@@ -736,6 +364,7 @@ nm_ip6_address_set_prefix
 nm_ip6_address_get_gateway
 nm_ip6_address_set_gateway
 NMIP6Route
+nm_ip6_route_get_type
 nm_ip6_route_new
 nm_ip6_route_dup
 nm_ip6_route_ref
@@ -789,31 +418,402 @@ NM_SETTING_IP6_CONFIG_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>nm-setting-bluetooth</FILE>
-<TITLE>NMSettingBluetooth</TITLE>
-NM_SETTING_BLUETOOTH_SETTING_NAME
-NMSettingBluetoothError
-NM_TYPE_SETTING_BLUETOOTH_ERROR
-NM_SETTING_BLUETOOTH_ERROR
-nm_setting_bluetooth_error_quark
-NM_SETTING_BLUETOOTH_BDADDR
-NM_SETTING_BLUETOOTH_TYPE
-NM_SETTING_BLUETOOTH_TYPE_DUN
-NM_SETTING_BLUETOOTH_TYPE_PANU
-NMSettingBluetooth
-NMSettingBluetoothClass
-nm_setting_bluetooth_get_type
-nm_setting_bluetooth_new
-nm_setting_bluetooth_get_bdaddr
-nm_setting_bluetooth_get_connection_type
+<FILE>nm-setting-wimax</FILE>
+<TITLE>NMSettingWimax</TITLE>
+NM_SETTING_WIMAX_SETTING_NAME
+NMSettingWimaxError
+NM_TYPE_SETTING_WIMAX_ERROR
+NM_SETTING_WIMAX_ERROR
+nm_setting_wimax_error_quark
+NM_SETTING_WIMAX_NETWORK_NAME
+NM_SETTING_WIMAX_MAC_ADDRESS
+NMSettingWimax
+NMSettingWimaxClass
+nm_setting_wimax_get_type
+nm_setting_wimax_new
+nm_setting_wimax_get_network_name
+nm_setting_wimax_get_mac_address
 <SUBSECTION Standard>
-NM_SETTING_BLUETOOTH
-NM_IS_SETTING_BLUETOOTH
-NM_TYPE_SETTING_BLUETOOTH
-nm_setting_bluetooth_error_get_type
-NM_SETTING_BLUETOOTH_CLASS
-NM_IS_SETTING_BLUETOOTH_CLASS
-NM_SETTING_BLUETOOTH_GET_CLASS
+NM_SETTING_WIMAX
+NM_IS_SETTING_WIMAX
+NM_TYPE_SETTING_WIMAX
+nm_setting_wimax_error_get_type
+NM_SETTING_WIMAX_CLASS
+NM_IS_SETTING_WIMAX_CLASS
+NM_SETTING_WIMAX_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>nm-setting-ip4-config</FILE>
+<TITLE>NMSettingIP4Config</TITLE>
+NM_SETTING_IP4_CONFIG_SETTING_NAME
+NMSettingIP4ConfigError
+NM_TYPE_SETTING_IP4_CONFIG_ERROR
+NM_SETTING_IP4_CONFIG_ERROR
+nm_setting_ip4_config_error_quark
+NM_SETTING_IP4_CONFIG_METHOD
+NM_SETTING_IP4_CONFIG_DNS
+NM_SETTING_IP4_CONFIG_DNS_SEARCH
+NM_SETTING_IP4_CONFIG_ADDRESSES
+NM_SETTING_IP4_CONFIG_ROUTES
+NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES
+NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS
+NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID
+NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME
+NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME
+NM_SETTING_IP4_CONFIG_NEVER_DEFAULT
+NM_SETTING_IP4_CONFIG_MAY_FAIL
+NM_SETTING_IP4_CONFIG_METHOD_AUTO
+NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL
+NM_SETTING_IP4_CONFIG_METHOD_MANUAL
+NM_SETTING_IP4_CONFIG_METHOD_SHARED
+NM_SETTING_IP4_CONFIG_METHOD_DISABLED
+NMIP4Address
+nm_ip4_address_get_type
+nm_ip4_address_new
+nm_ip4_address_dup
+nm_ip4_address_ref
+nm_ip4_address_unref
+nm_ip4_address_compare
+nm_ip4_address_get_address
+nm_ip4_address_set_address
+nm_ip4_address_get_prefix
+nm_ip4_address_set_prefix
+nm_ip4_address_get_gateway
+nm_ip4_address_set_gateway
+NMIP4Route
+nm_ip4_route_get_type
+nm_ip4_route_new
+nm_ip4_route_dup
+nm_ip4_route_ref
+nm_ip4_route_unref
+nm_ip4_route_compare
+nm_ip4_route_get_dest
+nm_ip4_route_set_dest
+nm_ip4_route_get_prefix
+nm_ip4_route_set_prefix
+nm_ip4_route_get_next_hop
+nm_ip4_route_set_next_hop
+nm_ip4_route_get_metric
+nm_ip4_route_set_metric
+NMSettingIP4Config
+NMSettingIP4ConfigClass
+nm_setting_ip4_config_get_type
+nm_setting_ip4_config_new
+nm_setting_ip4_config_get_method
+nm_setting_ip4_config_get_num_dns
+nm_setting_ip4_config_get_dns
+nm_setting_ip4_config_add_dns
+nm_setting_ip4_config_remove_dns
+nm_setting_ip4_config_clear_dns
+nm_setting_ip4_config_get_num_dns_searches
+nm_setting_ip4_config_get_dns_search
+nm_setting_ip4_config_add_dns_search
+nm_setting_ip4_config_remove_dns_search
+nm_setting_ip4_config_clear_dns_searches
+nm_setting_ip4_config_get_num_addresses
+nm_setting_ip4_config_get_address
+nm_setting_ip4_config_add_address
+nm_setting_ip4_config_remove_address
+nm_setting_ip4_config_clear_addresses
+nm_setting_ip4_config_get_num_routes
+nm_setting_ip4_config_get_route
+nm_setting_ip4_config_add_route
+nm_setting_ip4_config_remove_route
+nm_setting_ip4_config_clear_routes
+nm_setting_ip4_config_get_ignore_auto_routes
+nm_setting_ip4_config_get_ignore_auto_dns
+nm_setting_ip4_config_get_dhcp_client_id
+nm_setting_ip4_config_get_dhcp_send_hostname
+nm_setting_ip4_config_get_dhcp_hostname
+nm_setting_ip4_config_get_never_default
+nm_setting_ip4_config_get_may_fail
+<SUBSECTION Standard>
+NM_SETTING_IP4_CONFIG
+NM_IS_SETTING_IP4_CONFIG
+NM_TYPE_SETTING_IP4_CONFIG
+nm_setting_ip4_config_error_get_type
+NM_SETTING_IP4_CONFIG_CLASS
+NM_IS_SETTING_IP4_CONFIG_CLASS
+NM_SETTING_IP4_CONFIG_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>nm-setting-wired</FILE>
+<TITLE>NMSettingWired</TITLE>
+NM_SETTING_WIRED_SETTING_NAME
+NMSettingWiredError
+NM_TYPE_SETTING_WIRED_ERROR
+NM_SETTING_WIRED_ERROR
+nm_setting_wired_error_quark
+NM_SETTING_WIRED_PORT
+NM_SETTING_WIRED_SPEED
+NM_SETTING_WIRED_DUPLEX
+NM_SETTING_WIRED_AUTO_NEGOTIATE
+NM_SETTING_WIRED_MAC_ADDRESS
+NM_SETTING_WIRED_CLONED_MAC_ADDRESS
+NM_SETTING_WIRED_MTU
+NM_SETTING_WIRED_S390_SUBCHANNELS
+NM_SETTING_WIRED_S390_NETTYPE
+NM_SETTING_WIRED_S390_OPTIONS
+NMSettingWired
+NMSettingWiredClass
+nm_setting_wired_get_type
+nm_setting_wired_new
+nm_setting_wired_get_port
+nm_setting_wired_get_speed
+nm_setting_wired_get_duplex
+nm_setting_wired_get_auto_negotiate
+nm_setting_wired_get_mac_address
+nm_setting_wired_get_cloned_mac_address
+nm_setting_wired_get_mtu
+nm_setting_wired_get_s390_subchannels
+nm_setting_wired_get_s390_nettype
+nm_setting_wired_get_num_s390_options
+nm_setting_wired_get_s390_option
+nm_setting_wired_get_s390_option_by_key
+nm_setting_wired_add_s390_option
+nm_setting_wired_remove_s390_option
+<SUBSECTION Standard>
+NM_SETTING_WIRED
+NM_IS_SETTING_WIRED
+NM_TYPE_SETTING_WIRED
+nm_setting_wired_error_get_type
+NM_SETTING_WIRED_CLASS
+NM_IS_SETTING_WIRED_CLASS
+NM_SETTING_WIRED_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>nm-setting-connection</FILE>
+<TITLE>NMSettingConnection</TITLE>
+NM_SETTING_CONNECTION_SETTING_NAME
+NMSettingConnectionError
+NM_TYPE_SETTING_CONNECTION_ERROR
+NM_SETTING_CONNECTION_ERROR
+nm_setting_connection_error_quark
+NM_SETTING_CONNECTION_ID
+NM_SETTING_CONNECTION_UUID
+NM_SETTING_CONNECTION_TYPE
+NM_SETTING_CONNECTION_AUTOCONNECT
+NM_SETTING_CONNECTION_TIMESTAMP
+NM_SETTING_CONNECTION_READ_ONLY
+NM_SETTING_CONNECTION_PERMISSIONS
+NMSettingConnection
+NMSettingConnectionClass
+nm_setting_connection_get_type
+nm_setting_connection_new
+nm_setting_connection_get_id
+nm_setting_connection_get_uuid
+nm_setting_connection_get_connection_type
+nm_setting_connection_get_autoconnect
+nm_setting_connection_get_timestamp
+nm_setting_connection_get_read_only
+nm_setting_connection_get_num_permissions
+nm_setting_connection_get_permission
+nm_setting_connection_permissions_user_allowed
+nm_setting_connection_add_permission
+nm_setting_connection_remove_permission
+<SUBSECTION Standard>
+NM_SETTING_CONNECTION
+NM_IS_SETTING_CONNECTION
+NM_TYPE_SETTING_CONNECTION
+nm_setting_connection_error_get_type
+NM_SETTING_CONNECTION_CLASS
+NM_IS_SETTING_CONNECTION_CLASS
+NM_SETTING_CONNECTION_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>nm-setting</FILE>
+<TITLE>NMSetting</TITLE>
+NMSettingError
+NM_TYPE_SETTING_ERROR
+NM_SETTING_ERROR
+nm_setting_error_quark
+NM_SETTING_PARAM_SERIALIZE
+NM_SETTING_PARAM_REQUIRED
+NM_SETTING_PARAM_SECRET
+NM_SETTING_PARAM_FUZZY_IGNORE
+NM_SETTING_NAME
+NMSettingSecretFlags
+NMSetting
+NMSettingClass
+NMSettingValueIterFn
+nm_setting_get_type
+NMSettingHashFlags
+nm_setting_to_hash
+nm_setting_new_from_hash
+nm_setting_duplicate
+nm_setting_get_name
+nm_setting_verify
+NMSettingCompareFlags
+nm_setting_compare
+NMSettingDiffResult
+nm_setting_diff
+nm_setting_enumerate_values
+nm_setting_to_string
+nm_setting_clear_secrets
+nm_setting_need_secrets
+nm_setting_update_secrets
+nm_setting_get_secret_flags
+nm_setting_set_secret_flags
+<SUBSECTION Standard>
+NM_SETTING
+NM_IS_SETTING
+NM_TYPE_SETTING
+nm_setting_error_get_type
+NM_SETTING_CLASS
+NM_IS_SETTING_CLASS
+NM_SETTING_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>nm-setting-ppp</FILE>
+<TITLE>NMSettingPPP</TITLE>
+NM_SETTING_PPP_SETTING_NAME
+NMSettingPPPError
+NM_TYPE_SETTING_PPP_ERROR
+NM_SETTING_PPP_ERROR
+nm_setting_ppp_error_quark
+NM_SETTING_PPP_NOAUTH
+NM_SETTING_PPP_REFUSE_EAP
+NM_SETTING_PPP_REFUSE_PAP
+NM_SETTING_PPP_REFUSE_CHAP
+NM_SETTING_PPP_REFUSE_MSCHAP
+NM_SETTING_PPP_REFUSE_MSCHAPV2
+NM_SETTING_PPP_NOBSDCOMP
+NM_SETTING_PPP_NODEFLATE
+NM_SETTING_PPP_NO_VJ_COMP
+NM_SETTING_PPP_REQUIRE_MPPE
+NM_SETTING_PPP_REQUIRE_MPPE_128
+NM_SETTING_PPP_MPPE_STATEFUL
+NM_SETTING_PPP_CRTSCTS
+NM_SETTING_PPP_BAUD
+NM_SETTING_PPP_MRU
+NM_SETTING_PPP_MTU
+NM_SETTING_PPP_LCP_ECHO_FAILURE
+NM_SETTING_PPP_LCP_ECHO_INTERVAL
+NMSettingPPP
+NMSettingPPPClass
+nm_setting_ppp_get_type
+nm_setting_ppp_new
+nm_setting_ppp_get_noauth
+nm_setting_ppp_get_refuse_eap
+nm_setting_ppp_get_refuse_pap
+nm_setting_ppp_get_refuse_chap
+nm_setting_ppp_get_refuse_mschap
+nm_setting_ppp_get_refuse_mschapv2
+nm_setting_ppp_get_nobsdcomp
+nm_setting_ppp_get_nodeflate
+nm_setting_ppp_get_no_vj_comp
+nm_setting_ppp_get_require_mppe
+nm_setting_ppp_get_require_mppe_128
+nm_setting_ppp_get_mppe_stateful
+nm_setting_ppp_get_crtscts
+nm_setting_ppp_get_baud
+nm_setting_ppp_get_mru
+nm_setting_ppp_get_mtu
+nm_setting_ppp_get_lcp_echo_failure
+nm_setting_ppp_get_lcp_echo_interval
+<SUBSECTION Standard>
+NM_SETTING_PPP
+NM_IS_SETTING_PPP
+NM_TYPE_SETTING_PPP
+nm_setting_ppp_error_get_type
+NM_SETTING_PPP_CLASS
+NM_IS_SETTING_PPP_CLASS
+NM_SETTING_PPP_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>nm-connection</FILE>
+<TITLE>NMConnection</TITLE>
+NMConnectionError
+NM_TYPE_CONNECTION_ERROR
+NM_CONNECTION_ERROR
+nm_connection_error_quark
+NM_CONNECTION_PATH
+NMConnection
+NMConnectionClass
+nm_connection_get_type
+nm_connection_new
+nm_connection_new_from_hash
+nm_connection_duplicate
+nm_connection_create_setting
+nm_connection_add_setting
+nm_connection_remove_setting
+nm_connection_get_setting
+nm_connection_get_setting_by_name
+nm_connection_replace_settings
+nm_connection_compare
+nm_connection_diff
+nm_connection_verify
+nm_connection_need_secrets
+nm_connection_clear_secrets
+nm_connection_update_secrets
+nm_connection_set_path
+nm_connection_get_path
+nm_connection_for_each_setting_value
+nm_connection_to_hash
+nm_connection_dump
+nm_connection_lookup_setting_type
+nm_connection_lookup_setting_type_by_quark
+nm_connection_get_uuid
+nm_connection_get_id
+nm_connection_get_setting_802_1x
+nm_connection_get_setting_bluetooth
+nm_connection_get_setting_cdma
+nm_connection_get_setting_connection
+nm_connection_get_setting_gsm
+nm_connection_get_setting_ip4_config
+nm_connection_get_setting_ip6_config
+nm_connection_get_setting_olpc_mesh
+nm_connection_get_setting_ppp
+nm_connection_get_setting_pppoe
+nm_connection_get_setting_vpn
+nm_connection_get_setting_wimax
+nm_connection_get_setting_wired
+nm_connection_get_setting_wireless
+nm_connection_get_setting_wireless_security
+<SUBSECTION Standard>
+NM_CONNECTION
+NM_IS_CONNECTION
+NM_TYPE_CONNECTION
+nm_connection_error_get_type
+NM_CONNECTION_CLASS
+NM_IS_CONNECTION_CLASS
+NM_CONNECTION_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>nm-setting-pppoe</FILE>
+<TITLE>NMSettingPPPOE</TITLE>
+NM_SETTING_PPPOE_SETTING_NAME
+NMSettingPPPOEError
+NM_TYPE_SETTING_PPPOE_ERROR
+NM_SETTING_PPPOE_ERROR
+nm_setting_pppoe_error_quark
+NM_SETTING_PPPOE_SERVICE
+NM_SETTING_PPPOE_USERNAME
+NM_SETTING_PPPOE_PASSWORD
+NM_SETTING_PPPOE_PASSWORD_FLAGS
+NMSettingPPPOE
+NMSettingPPPOEClass
+nm_setting_pppoe_get_type
+nm_setting_pppoe_new
+nm_setting_pppoe_get_service
+nm_setting_pppoe_get_username
+nm_setting_pppoe_get_password
+nm_setting_pppoe_get_password_flags
+<SUBSECTION Standard>
+NM_SETTING_PPPOE
+NM_IS_SETTING_PPPOE
+NM_TYPE_SETTING_PPPOE
+nm_setting_pppoe_error_get_type
+NM_SETTING_PPPOE_CLASS
+NM_IS_SETTING_PPPOE_CLASS
+NM_SETTING_PPPOE_GET_CLASS
 </SECTION>
 
 <SECTION>
@@ -830,7 +830,7 @@ NM_SETTING_VPN_DATA
 NM_SETTING_VPN_SECRETS
 NMSettingVPN
 NMSettingVPNClass
-VPNIterFunc
+NMVPNIterFunc
 nm_setting_vpn_get_type
 nm_setting_vpn_new
 nm_setting_vpn_get_service_type
@@ -854,17 +854,58 @@ NM_SETTING_VPN_GET_CLASS
 </SECTION>
 
 <SECTION>
+<FILE>nm-setting-wireless</FILE>
+<TITLE>NMSettingWireless</TITLE>
+NM_SETTING_WIRELESS_SETTING_NAME
+NMSettingWirelessError
+NM_TYPE_SETTING_WIRELESS_ERROR
+NM_SETTING_WIRELESS_ERROR
+nm_setting_wireless_error_quark
+NM_SETTING_WIRELESS_SSID
+NM_SETTING_WIRELESS_MODE
+NM_SETTING_WIRELESS_BAND
+NM_SETTING_WIRELESS_CHANNEL
+NM_SETTING_WIRELESS_BSSID
+NM_SETTING_WIRELESS_RATE
+NM_SETTING_WIRELESS_TX_POWER
+NM_SETTING_WIRELESS_MAC_ADDRESS
+NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS
+NM_SETTING_WIRELESS_MTU
+NM_SETTING_WIRELESS_SEEN_BSSIDS
+NM_SETTING_WIRELESS_SEC
+NM_SETTING_WIRELESS_MODE_ADHOC
+NM_SETTING_WIRELESS_MODE_INFRA
+NMSettingWireless
+NMSettingWirelessClass
+nm_setting_wireless_get_type
+nm_setting_wireless_new
+nm_setting_wireless_get_ssid
+nm_setting_wireless_get_mode
+nm_setting_wireless_get_band
+nm_setting_wireless_get_channel
+nm_setting_wireless_get_bssid
+nm_setting_wireless_get_rate
+nm_setting_wireless_get_tx_power
+nm_setting_wireless_get_mac_address
+nm_setting_wireless_get_cloned_mac_address
+nm_setting_wireless_get_mtu
+nm_setting_wireless_get_security
+nm_setting_wireless_add_seen_bssid
+nm_setting_wireless_get_num_seen_bssids
+nm_setting_wireless_get_seen_bssid
+nm_setting_wireless_ap_security_compatible
+<SUBSECTION Standard>
+NM_SETTING_WIRELESS
+NM_IS_SETTING_WIRELESS
+NM_TYPE_SETTING_WIRELESS
+nm_setting_wireless_error_get_type
+NM_SETTING_WIRELESS_CLASS
+NM_IS_SETTING_WIRELESS_CLASS
+NM_SETTING_WIRELESS_GET_CLASS
+</SECTION>
+
+<SECTION>
 <FILE>nm-utils</FILE>
-nm_print_backtrace
-nm_get_timestamp
-nm_info
-nm_info_str
-nm_debug
-nm_debug_str
-nm_warning
-nm_warning_str
-nm_error
-nm_error_str
 nm_utils_init
 nm_utils_deinit
 nm_utils_is_empty_ssid
@@ -897,3 +938,8 @@ nm_utils_wifi_find_next_channel
 nm_utils_wifi_is_channel_valid
 </SECTION>
 
+<SECTION>
+<FILE>nm-setting-private</FILE>
+NM_SETTING_SECRET_FLAGS_ALL
+</SECTION>
+
diff --git a/docs/libnm-util/libnm-util.types b/docs/libnm-util/libnm-util.types
deleted file mode 100644
index c02837678..000000000
--- a/docs/libnm-util/libnm-util.types
+++ /dev/null
@@ -1,34 +0,0 @@
-nm_connection_error_get_type
-nm_connection_get_type
-nm_setting_802_1x_error_get_type
-nm_setting_802_1x_get_type
-nm_setting_bluetooth_error_get_type
-nm_setting_bluetooth_get_type
-nm_setting_cdma_error_get_type
-nm_setting_cdma_get_type
-nm_setting_connection_error_get_type
-nm_setting_connection_get_type
-nm_setting_error_get_type
-nm_setting_get_type
-nm_setting_gsm_error_get_type
-nm_setting_gsm_get_type
-nm_setting_ip4_config_error_get_type
-nm_setting_ip4_config_get_type
-nm_setting_ip6_config_error_get_type
-nm_setting_ip6_config_get_type
-nm_setting_olpc_mesh_error_get_type
-nm_setting_olpc_mesh_get_type
-nm_setting_ppp_error_get_type
-nm_setting_ppp_get_type
-nm_setting_pppoe_error_get_type
-nm_setting_pppoe_get_type
-nm_setting_serial_error_get_type
-nm_setting_serial_get_type
-nm_setting_vpn_error_get_type
-nm_setting_vpn_get_type
-nm_setting_wired_error_get_type
-nm_setting_wired_get_type
-nm_setting_wireless_error_get_type
-nm_setting_wireless_get_type
-nm_setting_wireless_security_error_get_type
-nm_setting_wireless_security_get_type
diff --git a/docs/libnm-util/tmpl/nm-connection.sgml b/docs/libnm-util/tmpl/nm-connection.sgml
deleted file mode 100644
index f9d52c981..000000000
--- a/docs/libnm-util/tmpl/nm-connection.sgml
+++ /dev/null
@@ -1,349 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMConnection
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### ENUM NMConnectionScope ##### -->
-<para>
-
-</para>
-
-@NM_CONNECTION_SCOPE_UNKNOWN: 
-@NM_CONNECTION_SCOPE_SYSTEM: 
-@NM_CONNECTION_SCOPE_USER: 
-
-<!-- ##### ENUM NMConnectionError ##### -->
-<para>
-
-</para>
-
-@NM_CONNECTION_ERROR_UNKNOWN: 
-@NM_CONNECTION_ERROR_CONNECTION_SETTING_NOT_FOUND: 
-
-<!-- ##### MACRO NM_TYPE_CONNECTION_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_CONNECTION_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_connection_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_CONNECTION_SCOPE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_CONNECTION_PATH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### STRUCT NMConnection ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SIGNAL NMConnection::secrets-updated ##### -->
-<para>
-
-</para>
-
-@nmconnection: the object which received the signal.
-@arg1: 
-
-<!-- ##### ARG NMConnection:path ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMConnection:scope ##### -->
-<para>
-
-</para>
-
-<!-- ##### STRUCT NMConnectionClass ##### -->
-<para>
-
-</para>
-
-@parent: 
-@secrets_updated: 
-
-<!-- ##### FUNCTION nm_connection_get_type ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_new_from_hash ##### -->
-<para>
-
-</para>
-
-@hash: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_duplicate ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_add_setting ##### -->
-<para>
-
-</para>
-
-@connection: 
-@setting: 
-
-
-<!-- ##### FUNCTION nm_connection_remove_setting ##### -->
-<para>
-
-</para>
-
-@connection: 
-@setting_type: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting ##### -->
-<para>
-
-</para>
-
-@connection: 
-@setting_type: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_by_name ##### -->
-<para>
-
-</para>
-
-@connection: 
-@name: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_replace_settings ##### -->
-<para>
-
-</para>
-
-@connection: 
-@new_settings: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_compare ##### -->
-<para>
-
-</para>
-
-@a: 
-@b: 
-@flags: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_diff ##### -->
-<para>
-
-</para>
-
-@a: 
-@b: 
-@flags: 
-@out_settings: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_verify ##### -->
-<para>
-
-</para>
-
-@connection: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_need_secrets ##### -->
-<para>
-
-</para>
-
-@connection: 
-@hints: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_clear_secrets ##### -->
-<para>
-
-</para>
-
-@connection: 
-
-
-<!-- ##### FUNCTION nm_connection_update_secrets ##### -->
-<para>
-
-</para>
-
-@connection: 
-@setting_name: 
-@setting_secrets: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_set_scope ##### -->
-<para>
-
-</para>
-
-@connection: 
-@scope: 
-
-
-<!-- ##### FUNCTION nm_connection_get_scope ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_set_path ##### -->
-<para>
-
-</para>
-
-@connection: 
-@path: 
-
-
-<!-- ##### FUNCTION nm_connection_get_path ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_for_each_setting_value ##### -->
-<para>
-
-</para>
-
-@connection: 
-@func: 
-@user_data: 
-
-
-<!-- ##### FUNCTION nm_connection_to_hash ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_dump ##### -->
-<para>
-
-</para>
-
-@connection: 
-
-
-<!-- ##### FUNCTION nm_connection_create_setting ##### -->
-<para>
-
-</para>
-
-@name: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_lookup_setting_type ##### -->
-<para>
-
-</para>
-
-@name: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_lookup_setting_type_by_quark ##### -->
-<para>
-
-</para>
-
-@error_quark: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-8021x.sgml b/docs/libnm-util/tmpl/nm-setting-8021x.sgml
deleted file mode 100644
index c6742d9b9..000000000
--- a/docs/libnm-util/tmpl/nm-setting-8021x.sgml
+++ /dev/null
@@ -1,968 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSetting8021x
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### ENUM NMSetting8021xCKFormat ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_802_1X_CK_FORMAT_UNKNOWN: 
-@NM_SETTING_802_1X_CK_FORMAT_X509: 
-@NM_SETTING_802_1X_CK_FORMAT_RAW_KEY: 
-@NM_SETTING_802_1X_CK_FORMAT_PKCS12: 
-
-<!-- ##### ENUM NMSetting8021xCKScheme ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_802_1X_CK_SCHEME_UNKNOWN: 
-@NM_SETTING_802_1X_CK_SCHEME_BLOB: 
-@NM_SETTING_802_1X_CK_SCHEME_PATH: 
-
-<!-- ##### MACRO NM_SETTING_802_1X_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSetting8021xError ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_802_1X_ERROR_UNKNOWN: 
-@NM_SETTING_802_1X_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_802_1X_ERROR_MISSING_PROPERTY: 
-
-<!-- ##### MACRO NM_TYPE_SETTING_802_1X_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_EAP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_IDENTITY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_ANONYMOUS_IDENTITY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_CA_CERT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_CA_PATH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_CLIENT_CERT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PHASE1_PEAPVER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PHASE1_PEAPLABEL ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PHASE2_AUTH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PHASE2_AUTHEAP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PHASE2_CA_CERT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PHASE2_CA_PATH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PHASE2_CLIENT_CERT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PASSWORD ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PRIVATE_KEY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PHASE2_PRIVATE_KEY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PIN ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PSK ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_SYSTEM_CA_CERTS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### STRUCT NMSetting8021x ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG NMSetting8021x:anonymous-identity ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSetting8021x:ca-cert ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSetting8021x:ca-path ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSetting8021x:client-cert ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSetting8021x:eap ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSetting8021x:identity ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSetting8021x:password ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSetting8021x:phase1-fast-provisioning ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSetting8021x:phase1-peaplabel ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSetting8021x:phase1-peapver ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSetting8021x:phase2-auth ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSetting8021x:phase2-autheap ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSetting8021x:phase2-ca-cert ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSetting8021x:phase2-ca-path ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSetting8021x:phase2-client-cert ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSetting8021x:phase2-private-key ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSetting8021x:phase2-private-key-password ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSetting8021x:private-key ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSetting8021x:private-key-password ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSetting8021x:system-ca-certs ##### -->
-<para>
-
-</para>
-
-<!-- ##### STRUCT NMSetting8021xClass ##### -->
-<para>
-
-</para>
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_type ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_num_eap_methods ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_eap_method ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_add_eap_method ##### -->
-<para>
-
-</para>
-
-@setting: 
-@eap: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_remove_eap_method ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_clear_eap_methods ##### -->
-<para>
-
-</para>
-
-@setting: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_identity ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_anonymous_identity ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_system_ca_certs ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_ca_path ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase2_ca_path ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_ca_cert_scheme ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_ca_cert_blob ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_ca_cert_path ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_set_ca_cert ##### -->
-<para>
-
-</para>
-
-@setting: 
-@value: 
-@scheme: 
-@out_format: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_client_cert_scheme ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_client_cert_blob ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_client_cert_path ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_set_client_cert ##### -->
-<para>
-
-</para>
-
-@setting: 
-@value: 
-@scheme: 
-@out_format: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase1_peapver ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase1_peaplabel ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase1_fast_provisioning ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase2_auth ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase2_autheap ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase2_ca_cert_scheme ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase2_ca_cert_blob ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase2_ca_cert_path ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_set_phase2_ca_cert ##### -->
-<para>
-
-</para>
-
-@setting: 
-@value: 
-@scheme: 
-@out_format: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase2_client_cert_scheme ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase2_client_cert_blob ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase2_client_cert_path ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_set_phase2_client_cert ##### -->
-<para>
-
-</para>
-
-@setting: 
-@value: 
-@scheme: 
-@out_format: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_password ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_pin ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_psk ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_private_key_scheme ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_private_key_blob ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_private_key_path ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_set_private_key ##### -->
-<para>
-
-</para>
-
-@setting: 
-@value: 
-@password: 
-@scheme: 
-@out_format: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_private_key_password ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_private_key_format ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase2_private_key_scheme ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase2_private_key_blob ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase2_private_key_path ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_set_phase2_private_key ##### -->
-<para>
-
-</para>
-
-@setting: 
-@value: 
-@password: 
-@scheme: 
-@out_format: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase2_private_key_password ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase2_private_key_format ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### ENUM NMSetting8021xCKType ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_802_1X_CK_TYPE_UNKNOWN: 
-@NM_SETTING_802_1X_CK_TYPE_X509: 
-@NM_SETTING_802_1X_CK_TYPE_RAW_KEY: 
-@NM_SETTING_802_1X_CK_TYPE_PKCS12: 
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_ca_cert ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_set_ca_cert_from_file ##### -->
-<para>
-
-</para>
-
-@setting: 
-@filename: 
-@out_ck_type: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_client_cert ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_set_client_cert_from_file ##### -->
-<para>
-
-</para>
-
-@setting: 
-@filename: 
-@out_ck_type: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase2_ca_cert ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_set_phase2_ca_cert_from_file ##### -->
-<para>
-
-</para>
-
-@setting: 
-@filename: 
-@out_ck_type: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase2_client_cert ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_set_phase2_client_cert_from_file ##### -->
-<para>
-
-</para>
-
-@setting: 
-@filename: 
-@out_ck_type: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_private_key ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_set_private_key_from_file ##### -->
-<para>
-
-</para>
-
-@setting: 
-@filename: 
-@password: 
-@out_ck_type: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_private_key_type ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase2_private_key ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_set_phase2_private_key_from_file ##### -->
-<para>
-
-</para>
-
-@setting: 
-@filename: 
-@password: 
-@out_ck_type: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase2_private_key_type ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-bluetooth.sgml b/docs/libnm-util/tmpl/nm-setting-bluetooth.sgml
deleted file mode 100644
index e698b78c3..000000000
--- a/docs/libnm-util/tmpl/nm-setting-bluetooth.sgml
+++ /dev/null
@@ -1,155 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingBluetooth
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_BLUETOOTH_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingBluetoothError ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_BLUETOOTH_ERROR_UNKNOWN: 
-@NM_SETTING_BLUETOOTH_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_BLUETOOTH_ERROR_MISSING_PROPERTY: 
-@NM_SETTING_BLUETOOTH_ERROR_TYPE_SETTING_NOT_FOUND: 
-
-<!-- ##### MACRO NM_TYPE_SETTING_BLUETOOTH_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BLUETOOTH_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_bluetooth_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_SETTING_BLUETOOTH_BDADDR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BLUETOOTH_TYPE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BLUETOOTH_TYPE_DUN ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BLUETOOTH_TYPE_PANU ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### STRUCT NMSettingBluetooth ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG NMSettingBluetooth:bdaddr ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingBluetooth:type ##### -->
-<para>
-
-</para>
-
-<!-- ##### STRUCT NMSettingBluetoothClass ##### -->
-<para>
-
-</para>
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-
-<!-- ##### FUNCTION nm_setting_bluetooth_get_type ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_bluetooth_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_bluetooth_get_bdaddr ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_bluetooth_get_connection_type ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-cdma.sgml b/docs/libnm-util/tmpl/nm-setting-cdma.sgml
deleted file mode 100644
index 7cd8fbc73..000000000
--- a/docs/libnm-util/tmpl/nm-setting-cdma.sgml
+++ /dev/null
@@ -1,162 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingCdma
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_CDMA_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingCdmaError ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_CDMA_ERROR_UNKNOWN: 
-@NM_SETTING_CDMA_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_CDMA_ERROR_MISSING_PROPERTY: 
-@NM_SETTING_CDMA_ERROR_MISSING_SERIAL_SETTING: 
-
-<!-- ##### MACRO NM_TYPE_SETTING_CDMA_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_CDMA_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_cdma_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_SETTING_CDMA_NUMBER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_CDMA_USERNAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_CDMA_PASSWORD ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### STRUCT NMSettingCdma ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG NMSettingCdma:number ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingCdma:password ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingCdma:username ##### -->
-<para>
-
-</para>
-
-<!-- ##### STRUCT NMSettingCdmaClass ##### -->
-<para>
-
-</para>
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-
-<!-- ##### FUNCTION nm_setting_cdma_get_type ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_cdma_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_cdma_get_number ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_cdma_get_username ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_cdma_get_password ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-connection.sgml b/docs/libnm-util/tmpl/nm-setting-connection.sgml
deleted file mode 100644
index ad17800f1..000000000
--- a/docs/libnm-util/tmpl/nm-setting-connection.sgml
+++ /dev/null
@@ -1,225 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingConnection
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_CONNECTION_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingConnectionError ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_CONNECTION_ERROR_UNKNOWN: 
-@NM_SETTING_CONNECTION_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_CONNECTION_ERROR_MISSING_PROPERTY: 
-@NM_SETTING_CONNECTION_ERROR_TYPE_SETTING_NOT_FOUND: 
-
-<!-- ##### MACRO NM_TYPE_SETTING_CONNECTION_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_CONNECTION_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_connection_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_SETTING_CONNECTION_ID ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_CONNECTION_UUID ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_CONNECTION_TYPE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_CONNECTION_AUTOCONNECT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_CONNECTION_TIMESTAMP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_CONNECTION_READ_ONLY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### STRUCT NMSettingConnection ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG NMSettingConnection:autoconnect ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingConnection:id ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingConnection:read-only ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingConnection:timestamp ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingConnection:type ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingConnection:uuid ##### -->
-<para>
-
-</para>
-
-<!-- ##### STRUCT NMSettingConnectionClass ##### -->
-<para>
-
-</para>
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-
-<!-- ##### FUNCTION nm_setting_connection_get_type ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_get_id ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_get_uuid ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_get_connection_type ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_get_autoconnect ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_get_timestamp ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_get_read_only ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-gsm.sgml b/docs/libnm-util/tmpl/nm-setting-gsm.sgml
deleted file mode 100644
index fd7dc209a..000000000
--- a/docs/libnm-util/tmpl/nm-setting-gsm.sgml
+++ /dev/null
@@ -1,396 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingGsm
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_GSM_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingGsmError ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_GSM_ERROR_UNKNOWN: 
-@NM_SETTING_GSM_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_GSM_ERROR_MISSING_PROPERTY: 
-@NM_SETTING_GSM_ERROR_MISSING_SERIAL_SETTING: 
-
-<!-- ##### MACRO NM_TYPE_SETTING_GSM_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_GSM_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_gsm_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_SETTING_GSM_NUMBER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_GSM_USERNAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_GSM_PASSWORD ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_GSM_APN ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_GSM_NETWORK_ID ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_GSM_NETWORK_TYPE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_GSM_ALLOWED_BANDS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_GSM_PIN ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_GSM_HOME_ONLY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_GSM_PUK ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_GSM_BAND ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_GSM_NETWORK_ANY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_GSM_NETWORK_UMTS_HSPA ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_GSM_NETWORK_GPRS_EDGE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_GSM_NETWORK_PREFER_UMTS_HSPA ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_GSM_NETWORK_PREFER_GPRS_EDGE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingGsmNetworkType ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_GSM_NETWORK_TYPE_ANY: 
-@NM_SETTING_GSM_NETWORK_TYPE_UMTS_HSPA: 
-@NM_SETTING_GSM_NETWORK_TYPE_GPRS_EDGE: 
-@NM_SETTING_GSM_NETWORK_TYPE_PREFER_UMTS_HSPA: 
-@NM_SETTING_GSM_NETWORK_TYPE_PREFER_GPRS_EDGE: 
-
-<!-- ##### ENUM NMSettingGsmNetworkBand ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_GSM_BAND_UNKNOWN: 
-@NM_SETTING_GSM_BAND_ANY: 
-@NM_SETTING_GSM_BAND_EGSM: 
-@NM_SETTING_GSM_BAND_DCS: 
-@NM_SETTING_GSM_BAND_PCS: 
-@NM_SETTING_GSM_BAND_G850: 
-@NM_SETTING_GSM_BAND_U2100: 
-@NM_SETTING_GSM_BAND_U1800: 
-@NM_SETTING_GSM_BAND_U17IV: 
-@NM_SETTING_GSM_BAND_U800: 
-@NM_SETTING_GSM_BAND_U850: 
-@NM_SETTING_GSM_BAND_U900: 
-@NM_SETTING_GSM_BAND_U17IX: 
-@NM_SETTING_GSM_BAND_U1900: 
-
-<!-- ##### STRUCT NMSettingGsm ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG NMSettingGsm:allowed-bands ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingGsm:apn ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingGsm:band ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingGsm:home-only ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingGsm:network-id ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingGsm:network-type ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingGsm:number ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingGsm:password ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingGsm:pin ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingGsm:puk ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingGsm:username ##### -->
-<para>
-
-</para>
-
-<!-- ##### STRUCT NMSettingGsmClass ##### -->
-<para>
-
-</para>
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-
-<!-- ##### FUNCTION nm_setting_gsm_get_type ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_gsm_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_gsm_get_number ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_gsm_get_username ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_gsm_get_password ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_gsm_get_apn ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_gsm_get_network_id ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_gsm_get_network_type ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_gsm_get_allowed_bands ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_gsm_get_pin ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_gsm_get_home_only ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_gsm_get_puk ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_gsm_get_band ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-ip4-config.sgml b/docs/libnm-util/tmpl/nm-setting-ip4-config.sgml
deleted file mode 100644
index 41fc9aabd..000000000
--- a/docs/libnm-util/tmpl/nm-setting-ip4-config.sgml
+++ /dev/null
@@ -1,760 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingIP4Config
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_IP4_CONFIG_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingIP4ConfigError ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_IP4_CONFIG_ERROR_UNKNOWN: 
-@NM_SETTING_IP4_CONFIG_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_IP4_CONFIG_ERROR_MISSING_PROPERTY: 
-@NM_SETTING_IP4_CONFIG_ERROR_NOT_ALLOWED_FOR_METHOD: 
-
-<!-- ##### MACRO NM_TYPE_SETTING_IP4_CONFIG_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP4_CONFIG_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_SETTING_IP4_CONFIG_METHOD ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP4_CONFIG_DNS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP4_CONFIG_DNS_SEARCH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP4_CONFIG_ADDRESSES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP4_CONFIG_ROUTES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP4_CONFIG_NEVER_DEFAULT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP4_CONFIG_MAY_FAIL ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP4_CONFIG_METHOD_AUTO ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP4_CONFIG_METHOD_MANUAL ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP4_CONFIG_METHOD_SHARED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP4_CONFIG_METHOD_DISABLED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### TYPEDEF NMIP4Address ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION nm_ip4_address_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip4_address_dup ##### -->
-<para>
-
-</para>
-
-@source: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip4_address_ref ##### -->
-<para>
-
-</para>
-
-@address: 
-
-
-<!-- ##### FUNCTION nm_ip4_address_unref ##### -->
-<para>
-
-</para>
-
-@address: 
-
-
-<!-- ##### FUNCTION nm_ip4_address_compare ##### -->
-<para>
-
-</para>
-
-@address: 
-@other: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip4_address_get_address ##### -->
-<para>
-
-</para>
-
-@address: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip4_address_set_address ##### -->
-<para>
-
-</para>
-
-@address: 
-@addr: 
-
-
-<!-- ##### FUNCTION nm_ip4_address_get_prefix ##### -->
-<para>
-
-</para>
-
-@address: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip4_address_set_prefix ##### -->
-<para>
-
-</para>
-
-@address: 
-@prefix: 
-
-
-<!-- ##### FUNCTION nm_ip4_address_get_gateway ##### -->
-<para>
-
-</para>
-
-@address: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip4_address_set_gateway ##### -->
-<para>
-
-</para>
-
-@address: 
-@gateway: 
-
-
-<!-- ##### TYPEDEF NMIP4Route ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION nm_ip4_route_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip4_route_dup ##### -->
-<para>
-
-</para>
-
-@route: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip4_route_ref ##### -->
-<para>
-
-</para>
-
-@route: 
-
-
-<!-- ##### FUNCTION nm_ip4_route_unref ##### -->
-<para>
-
-</para>
-
-@route: 
-
-
-<!-- ##### FUNCTION nm_ip4_route_compare ##### -->
-<para>
-
-</para>
-
-@route: 
-@other: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip4_route_get_dest ##### -->
-<para>
-
-</para>
-
-@route: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip4_route_set_dest ##### -->
-<para>
-
-</para>
-
-@route: 
-@dest: 
-
-
-<!-- ##### FUNCTION nm_ip4_route_get_prefix ##### -->
-<para>
-
-</para>
-
-@route: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip4_route_set_prefix ##### -->
-<para>
-
-</para>
-
-@route: 
-@prefix: 
-
-
-<!-- ##### FUNCTION nm_ip4_route_get_next_hop ##### -->
-<para>
-
-</para>
-
-@route: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip4_route_set_next_hop ##### -->
-<para>
-
-</para>
-
-@route: 
-@next_hop: 
-
-
-<!-- ##### FUNCTION nm_ip4_route_get_metric ##### -->
-<para>
-
-</para>
-
-@route: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip4_route_set_metric ##### -->
-<para>
-
-</para>
-
-@route: 
-@metric: 
-
-
-<!-- ##### STRUCT NMSettingIP4Config ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG NMSettingIP4Config:addresses ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingIP4Config:dhcp-client-id ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingIP4Config:dhcp-hostname ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingIP4Config:dhcp-send-hostname ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingIP4Config:dns ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingIP4Config:dns-search ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingIP4Config:ignore-auto-dns ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingIP4Config:ignore-auto-routes ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingIP4Config:may-fail ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingIP4Config:method ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingIP4Config:never-default ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingIP4Config:routes ##### -->
-<para>
-
-</para>
-
-<!-- ##### STRUCT NMSettingIP4ConfigClass ##### -->
-<para>
-
-</para>
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-
-<!-- ##### FUNCTION nm_setting_ip4_config_get_type ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_get_method ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_get_num_dns ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_get_dns ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_add_dns ##### -->
-<para>
-
-</para>
-
-@setting: 
-@dns: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_remove_dns ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_clear_dns ##### -->
-<para>
-
-</para>
-
-@setting: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_get_num_dns_searches ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_get_dns_search ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_add_dns_search ##### -->
-<para>
-
-</para>
-
-@setting: 
-@dns_search: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_remove_dns_search ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_clear_dns_searches ##### -->
-<para>
-
-</para>
-
-@setting: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_get_num_addresses ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_get_address ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_add_address ##### -->
-<para>
-
-</para>
-
-@setting: 
-@address: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_remove_address ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_clear_addresses ##### -->
-<para>
-
-</para>
-
-@setting: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_get_num_routes ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_get_route ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_add_route ##### -->
-<para>
-
-</para>
-
-@setting: 
-@route: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_remove_route ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_clear_routes ##### -->
-<para>
-
-</para>
-
-@setting: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_get_ignore_auto_routes ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_get_ignore_auto_dns ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_get_dhcp_client_id ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_get_dhcp_send_hostname ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_get_dhcp_hostname ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_get_never_default ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_get_may_fail ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-ip6-config.sgml b/docs/libnm-util/tmpl/nm-setting-ip6-config.sgml
deleted file mode 100644
index 456b5f293..000000000
--- a/docs/libnm-util/tmpl/nm-setting-ip6-config.sgml
+++ /dev/null
@@ -1,704 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingIP6Config
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_IP6_CONFIG_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingIP6ConfigError ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_IP6_CONFIG_ERROR_UNKNOWN: 
-@NM_SETTING_IP6_CONFIG_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_IP6_CONFIG_ERROR_MISSING_PROPERTY: 
-@NM_SETTING_IP6_CONFIG_ERROR_NOT_ALLOWED_FOR_METHOD: 
-
-<!-- ##### MACRO NM_TYPE_SETTING_IP6_CONFIG_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP6_CONFIG_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_SETTING_IP6_CONFIG_METHOD ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP6_CONFIG_DNS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP6_CONFIG_DNS_SEARCH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP6_CONFIG_ADDRESSES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP6_CONFIG_ROUTES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP6_CONFIG_NEVER_DEFAULT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP6_CONFIG_MAY_FAIL ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP6_CONFIG_METHOD_IGNORE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP6_CONFIG_METHOD_AUTO ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP6_CONFIG_METHOD_DHCP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP6_CONFIG_METHOD_MANUAL ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP6_CONFIG_METHOD_SHARED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### TYPEDEF NMIP6Address ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION nm_ip6_address_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip6_address_dup ##### -->
-<para>
-
-</para>
-
-@source: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip6_address_ref ##### -->
-<para>
-
-</para>
-
-@address: 
-
-
-<!-- ##### FUNCTION nm_ip6_address_unref ##### -->
-<para>
-
-</para>
-
-@address: 
-
-
-<!-- ##### FUNCTION nm_ip6_address_compare ##### -->
-<para>
-
-</para>
-
-@address: 
-@other: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip6_address_get_address ##### -->
-<para>
-
-</para>
-
-@address: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip6_address_set_address ##### -->
-<para>
-
-</para>
-
-@address: 
-@addr: 
-
-
-<!-- ##### FUNCTION nm_ip6_address_get_prefix ##### -->
-<para>
-
-</para>
-
-@address: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip6_address_set_prefix ##### -->
-<para>
-
-</para>
-
-@address: 
-@prefix: 
-
-
-<!-- ##### FUNCTION nm_ip6_address_get_gateway ##### -->
-<para>
-
-</para>
-
-@address: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip6_address_set_gateway ##### -->
-<para>
-
-</para>
-
-@address: 
-@gw: 
-
-
-<!-- ##### TYPEDEF NMIP6Route ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION nm_ip6_route_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip6_route_dup ##### -->
-<para>
-
-</para>
-
-@route: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip6_route_ref ##### -->
-<para>
-
-</para>
-
-@route: 
-
-
-<!-- ##### FUNCTION nm_ip6_route_unref ##### -->
-<para>
-
-</para>
-
-@route: 
-
-
-<!-- ##### FUNCTION nm_ip6_route_compare ##### -->
-<para>
-
-</para>
-
-@route: 
-@other: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip6_route_get_dest ##### -->
-<para>
-
-</para>
-
-@route: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip6_route_set_dest ##### -->
-<para>
-
-</para>
-
-@route: 
-@dest: 
-
-
-<!-- ##### FUNCTION nm_ip6_route_get_prefix ##### -->
-<para>
-
-</para>
-
-@route: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip6_route_set_prefix ##### -->
-<para>
-
-</para>
-
-@route: 
-@prefix: 
-
-
-<!-- ##### FUNCTION nm_ip6_route_get_next_hop ##### -->
-<para>
-
-</para>
-
-@route: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip6_route_set_next_hop ##### -->
-<para>
-
-</para>
-
-@route: 
-@next_hop: 
-
-
-<!-- ##### FUNCTION nm_ip6_route_get_metric ##### -->
-<para>
-
-</para>
-
-@route: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip6_route_set_metric ##### -->
-<para>
-
-</para>
-
-@route: 
-@metric: 
-
-
-<!-- ##### STRUCT NMSettingIP6Config ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG NMSettingIP6Config:addresses ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingIP6Config:dns ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingIP6Config:dns-search ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingIP6Config:ignore-auto-dns ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingIP6Config:ignore-auto-routes ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingIP6Config:may-fail ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingIP6Config:method ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingIP6Config:never-default ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingIP6Config:routes ##### -->
-<para>
-
-</para>
-
-<!-- ##### STRUCT NMSettingIP6ConfigClass ##### -->
-<para>
-
-</para>
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-
-<!-- ##### FUNCTION nm_setting_ip6_config_get_type ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_get_method ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_get_num_dns ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_get_dns ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_add_dns ##### -->
-<para>
-
-</para>
-
-@setting: 
-@dns: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_remove_dns ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_clear_dns ##### -->
-<para>
-
-</para>
-
-@setting: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_get_num_dns_searches ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_get_dns_search ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_add_dns_search ##### -->
-<para>
-
-</para>
-
-@setting: 
-@dns_search: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_remove_dns_search ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_clear_dns_searches ##### -->
-<para>
-
-</para>
-
-@setting: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_get_num_addresses ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_get_address ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_add_address ##### -->
-<para>
-
-</para>
-
-@setting: 
-@address: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_remove_address ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_clear_addresses ##### -->
-<para>
-
-</para>
-
-@setting: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_get_num_routes ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_get_route ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_add_route ##### -->
-<para>
-
-</para>
-
-@setting: 
-@route: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_remove_route ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_clear_routes ##### -->
-<para>
-
-</para>
-
-@setting: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_get_ignore_auto_routes ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_get_ignore_auto_dns ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_get_never_default ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_get_may_fail ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml b/docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml
deleted file mode 100644
index 7c44977c8..000000000
--- a/docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml
+++ /dev/null
@@ -1,161 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingOlpcMesh
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_OLPC_MESH_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingOlpcMeshError ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_OLPC_MESH_ERROR_UNKNOWN: 
-@NM_SETTING_OLPC_MESH_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_OLPC_MESH_ERROR_MISSING_PROPERTY: 
-
-<!-- ##### MACRO NM_TYPE_SETTING_OLPC_MESH_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_OLPC_MESH_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_olpc_mesh_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_SETTING_OLPC_MESH_SSID ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_OLPC_MESH_CHANNEL ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### STRUCT NMSettingOlpcMesh ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG NMSettingOlpcMesh:channel ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingOlpcMesh:dhcp-anycast-address ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingOlpcMesh:ssid ##### -->
-<para>
-
-</para>
-
-<!-- ##### STRUCT NMSettingOlpcMeshClass ##### -->
-<para>
-
-</para>
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-
-<!-- ##### FUNCTION nm_setting_olpc_mesh_get_type ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_olpc_mesh_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_olpc_mesh_get_ssid ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_olpc_mesh_get_channel ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_olpc_mesh_get_dhcp_anycast_address ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-ppp.sgml b/docs/libnm-util/tmpl/nm-setting-ppp.sgml
deleted file mode 100644
index bc80c47b6..000000000
--- a/docs/libnm-util/tmpl/nm-setting-ppp.sgml
+++ /dev/null
@@ -1,477 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingPPP
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_PPP_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingPPPError ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_PPP_ERROR_UNKNOWN: 
-@NM_SETTING_PPP_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_PPP_ERROR_MISSING_PROPERTY: 
-@NM_SETTING_PPP_ERROR_REQUIRE_MPPE_NOT_ALLOWED: 
-
-<!-- ##### MACRO NM_TYPE_SETTING_PPP_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPP_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_ppp_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_SETTING_PPP_NOAUTH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPP_REFUSE_EAP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPP_REFUSE_PAP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPP_REFUSE_CHAP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPP_REFUSE_MSCHAP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPP_REFUSE_MSCHAPV2 ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPP_NOBSDCOMP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPP_NODEFLATE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPP_NO_VJ_COMP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPP_REQUIRE_MPPE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPP_REQUIRE_MPPE_128 ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPP_MPPE_STATEFUL ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPP_CRTSCTS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPP_BAUD ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPP_MRU ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPP_MTU ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPP_LCP_ECHO_FAILURE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPP_LCP_ECHO_INTERVAL ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### STRUCT NMSettingPPP ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG NMSettingPPP:baud ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingPPP:crtscts ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingPPP:lcp-echo-failure ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingPPP:lcp-echo-interval ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingPPP:mppe-stateful ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingPPP:mru ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingPPP:mtu ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingPPP:no-vj-comp ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingPPP:noauth ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingPPP:nobsdcomp ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingPPP:nodeflate ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingPPP:refuse-chap ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingPPP:refuse-eap ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingPPP:refuse-mschap ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingPPP:refuse-mschapv2 ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingPPP:refuse-pap ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingPPP:require-mppe ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingPPP:require-mppe-128 ##### -->
-<para>
-
-</para>
-
-<!-- ##### STRUCT NMSettingPPPClass ##### -->
-<para>
-
-</para>
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-
-<!-- ##### FUNCTION nm_setting_ppp_get_type ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ppp_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ppp_get_noauth ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ppp_get_refuse_eap ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ppp_get_refuse_pap ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ppp_get_refuse_chap ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ppp_get_refuse_mschap ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ppp_get_refuse_mschapv2 ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ppp_get_nobsdcomp ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ppp_get_nodeflate ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ppp_get_no_vj_comp ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ppp_get_require_mppe ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ppp_get_require_mppe_128 ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ppp_get_mppe_stateful ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ppp_get_crtscts ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ppp_get_baud ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ppp_get_mru ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ppp_get_mtu ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ppp_get_lcp_echo_failure ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ppp_get_lcp_echo_interval ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-pppoe.sgml b/docs/libnm-util/tmpl/nm-setting-pppoe.sgml
deleted file mode 100644
index 7bd9fd387..000000000
--- a/docs/libnm-util/tmpl/nm-setting-pppoe.sgml
+++ /dev/null
@@ -1,162 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingPPPOE
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_PPPOE_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingPPPOEError ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_PPPOE_ERROR_UNKNOWN: 
-@NM_SETTING_PPPOE_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_PPPOE_ERROR_MISSING_PROPERTY: 
-@NM_SETTING_PPPOE_ERROR_MISSING_PPP_SETTING: 
-
-<!-- ##### MACRO NM_TYPE_SETTING_PPPOE_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPPOE_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_pppoe_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_SETTING_PPPOE_SERVICE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPPOE_USERNAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPPOE_PASSWORD ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### STRUCT NMSettingPPPOE ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG NMSettingPPPOE:password ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingPPPOE:service ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingPPPOE:username ##### -->
-<para>
-
-</para>
-
-<!-- ##### STRUCT NMSettingPPPOEClass ##### -->
-<para>
-
-</para>
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-
-<!-- ##### FUNCTION nm_setting_pppoe_get_type ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_pppoe_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_pppoe_get_service ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_pppoe_get_username ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_pppoe_get_password ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-serial.sgml b/docs/libnm-util/tmpl/nm-setting-serial.sgml
deleted file mode 100644
index 20e684128..000000000
--- a/docs/libnm-util/tmpl/nm-setting-serial.sgml
+++ /dev/null
@@ -1,204 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingSerial
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_SERIAL_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingSerialError ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_SERIAL_ERROR_UNKNOWN: 
-@NM_SETTING_SERIAL_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_SERIAL_ERROR_MISSING_PROPERTY: 
-@NM_SETTING_SERIAL_ERROR_MISSING_PPP_SETTING: 
-
-<!-- ##### MACRO NM_TYPE_SETTING_SERIAL_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_SERIAL_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_serial_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_SETTING_SERIAL_BAUD ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_SERIAL_BITS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_SERIAL_PARITY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_SERIAL_STOPBITS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_SERIAL_SEND_DELAY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### STRUCT NMSettingSerial ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG NMSettingSerial:baud ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingSerial:bits ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingSerial:parity ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingSerial:send-delay ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingSerial:stopbits ##### -->
-<para>
-
-</para>
-
-<!-- ##### STRUCT NMSettingSerialClass ##### -->
-<para>
-
-</para>
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-
-<!-- ##### FUNCTION nm_setting_serial_get_type ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_serial_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_serial_get_baud ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_serial_get_bits ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_serial_get_parity ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_serial_get_stopbits ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_serial_get_send_delay ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-vpn.sgml b/docs/libnm-util/tmpl/nm-setting-vpn.sgml
deleted file mode 100644
index ad33652a1..000000000
--- a/docs/libnm-util/tmpl/nm-setting-vpn.sgml
+++ /dev/null
@@ -1,252 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingVPN
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_VPN_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingVpnError ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_VPN_ERROR_UNKNOWN: 
-@NM_SETTING_VPN_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_VPN_ERROR_MISSING_PROPERTY: 
-
-<!-- ##### MACRO NM_TYPE_SETTING_VPN_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_VPN_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_vpn_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_SETTING_VPN_SERVICE_TYPE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_VPN_USER_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_VPN_DATA ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_VPN_SECRETS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### STRUCT NMSettingVPN ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG NMSettingVPN:data ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingVPN:secrets ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingVPN:service-type ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingVPN:user-name ##### -->
-<para>
-
-</para>
-
-<!-- ##### STRUCT NMSettingVPNClass ##### -->
-<para>
-
-</para>
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-
-<!-- ##### USER_FUNCTION VPNIterFunc ##### -->
-<para>
-
-</para>
-
-@key: 
-@value: 
-@user_data: 
-
-
-<!-- ##### FUNCTION nm_setting_vpn_get_type ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_vpn_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_vpn_get_service_type ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_vpn_get_user_name ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_vpn_add_data_item ##### -->
-<para>
-
-</para>
-
-@setting: 
-@key: 
-@item: 
-
-
-<!-- ##### FUNCTION nm_setting_vpn_get_data_item ##### -->
-<para>
-
-</para>
-
-@setting: 
-@key: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_vpn_remove_data_item ##### -->
-<para>
-
-</para>
-
-@setting: 
-@key: 
-
-
-<!-- ##### FUNCTION nm_setting_vpn_foreach_data_item ##### -->
-<para>
-
-</para>
-
-@setting: 
-@func: 
-@user_data: 
-
-
-<!-- ##### FUNCTION nm_setting_vpn_add_secret ##### -->
-<para>
-
-</para>
-
-@setting: 
-@key: 
-@secret: 
-
-
-<!-- ##### FUNCTION nm_setting_vpn_get_secret ##### -->
-<para>
-
-</para>
-
-@setting: 
-@key: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_vpn_remove_secret ##### -->
-<para>
-
-</para>
-
-@setting: 
-@key: 
-
-
-<!-- ##### FUNCTION nm_setting_vpn_foreach_secret ##### -->
-<para>
-
-</para>
-
-@setting: 
-@func: 
-@user_data: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-wired.sgml b/docs/libnm-util/tmpl/nm-setting-wired.sgml
deleted file mode 100644
index 8b5242476..000000000
--- a/docs/libnm-util/tmpl/nm-setting-wired.sgml
+++ /dev/null
@@ -1,351 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingWired
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_WIRED_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingWiredError ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_WIRED_ERROR_UNKNOWN: 
-@NM_SETTING_WIRED_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_WIRED_ERROR_MISSING_PROPERTY: 
-
-<!-- ##### MACRO NM_TYPE_SETTING_WIRED_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRED_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_wired_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_SETTING_WIRED_PORT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRED_SPEED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRED_DUPLEX ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRED_AUTO_NEGOTIATE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRED_MAC_ADDRESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRED_CLONED_MAC_ADDRESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRED_MTU ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRED_S390_SUBCHANNELS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRED_S390_NETTYPE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRED_S390_OPTIONS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### STRUCT NMSettingWired ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG NMSettingWired:auto-negotiate ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingWired:cloned-mac-address ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingWired:duplex ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingWired:mac-address ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingWired:mtu ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingWired:port ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingWired:s390-nettype ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingWired:s390-options ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingWired:s390-subchannels ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingWired:speed ##### -->
-<para>
-
-</para>
-
-<!-- ##### STRUCT NMSettingWiredClass ##### -->
-<para>
-
-</para>
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-
-<!-- ##### FUNCTION nm_setting_wired_get_type ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_get_port ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_get_speed ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_get_duplex ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_get_auto_negotiate ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_get_mac_address ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_get_cloned_mac_address ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_get_mtu ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_get_s390_subchannels ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_get_s390_nettype ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_get_num_s390_options ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_get_s390_option ##### -->
-<para>
-
-</para>
-
-@setting: 
-@idx: 
-@out_key: 
-@out_value: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_get_s390_option_by_key ##### -->
-<para>
-
-</para>
-
-@setting: 
-@key: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_add_s390_option ##### -->
-<para>
-
-</para>
-
-@setting: 
-@key: 
-@item: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_remove_s390_option ##### -->
-<para>
-
-</para>
-
-@setting: 
-@key: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-wireless-security.sgml b/docs/libnm-util/tmpl/nm-setting-wireless-security.sgml
deleted file mode 100644
index eb576bb91..000000000
--- a/docs/libnm-util/tmpl/nm-setting-wireless-security.sgml
+++ /dev/null
@@ -1,501 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingWirelessSecurity
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingWirelessSecurityError ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_WIRELESS_SECURITY_ERROR_UNKNOWN: 
-@NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_WIRELESS_SECURITY_ERROR_MISSING_PROPERTY: 
-@NM_SETTING_WIRELESS_SECURITY_ERROR_MISSING_802_1X_SETTING: 
-@NM_SETTING_WIRELESS_SECURITY_ERROR_LEAP_REQUIRES_802_1X: 
-@NM_SETTING_WIRELESS_SECURITY_ERROR_LEAP_REQUIRES_USERNAME: 
-@NM_SETTING_WIRELESS_SECURITY_ERROR_SHARED_KEY_REQUIRES_WEP: 
-
-<!-- ##### MACRO NM_TYPE_SETTING_WIRELESS_SECURITY_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### ENUM NMWepKeyType ##### -->
-<para>
-
-</para>
-
-@NM_WEP_KEY_TYPE_UNKNOWN: 
-@NM_WEP_KEY_TYPE_KEY: 
-@NM_WEP_KEY_TYPE_PASSPHRASE: 
-@NM_WEP_KEY_TYPE_LAST: 
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_KEY_MGMT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_AUTH_ALG ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_PROTO ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_PAIRWISE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_GROUP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_WEP_KEY0 ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_WEP_KEY1 ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_WEP_KEY2 ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_WEP_KEY3 ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_PSK ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### STRUCT NMSettingWirelessSecurity ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG NMSettingWirelessSecurity:auth-alg ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingWirelessSecurity:group ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingWirelessSecurity:key-mgmt ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingWirelessSecurity:leap-password ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingWirelessSecurity:leap-username ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingWirelessSecurity:pairwise ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingWirelessSecurity:proto ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingWirelessSecurity:psk ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingWirelessSecurity:wep-key-type ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingWirelessSecurity:wep-key0 ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingWirelessSecurity:wep-key1 ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingWirelessSecurity:wep-key2 ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingWirelessSecurity:wep-key3 ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingWirelessSecurity:wep-tx-keyidx ##### -->
-<para>
-
-</para>
-
-<!-- ##### STRUCT NMSettingWirelessSecurityClass ##### -->
-<para>
-
-</para>
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-
-<!-- ##### FUNCTION nm_setting_wireless_security_get_type ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_get_key_mgmt ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_get_num_protos ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_get_proto ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_add_proto ##### -->
-<para>
-
-</para>
-
-@setting: 
-@proto: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_remove_proto ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_clear_protos ##### -->
-<para>
-
-</para>
-
-@setting: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_get_num_pairwise ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_get_pairwise ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_add_pairwise ##### -->
-<para>
-
-</para>
-
-@setting: 
-@pairwise: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_remove_pairwise ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_clear_pairwise ##### -->
-<para>
-
-</para>
-
-@setting: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_get_num_groups ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_get_group ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_add_group ##### -->
-<para>
-
-</para>
-
-@setting: 
-@group: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_remove_group ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_clear_groups ##### -->
-<para>
-
-</para>
-
-@setting: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_get_psk ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_get_leap_username ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_get_leap_password ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_get_wep_key ##### -->
-<para>
-
-</para>
-
-@setting: 
-@idx: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_set_wep_key ##### -->
-<para>
-
-</para>
-
-@setting: 
-@idx: 
-@key: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_get_wep_tx_keyidx ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_get_auth_alg ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_get_wep_key_type ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-wireless.sgml b/docs/libnm-util/tmpl/nm-setting-wireless.sgml
deleted file mode 100644
index 69a60b5b9..000000000
--- a/docs/libnm-util/tmpl/nm-setting-wireless.sgml
+++ /dev/null
@@ -1,386 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingWireless
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingWirelessError ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_WIRELESS_ERROR_UNKNOWN: 
-@NM_SETTING_WIRELESS_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_WIRELESS_ERROR_MISSING_PROPERTY: 
-@NM_SETTING_WIRELESS_ERROR_MISSING_SECURITY_SETTING: 
-@NM_SETTING_WIRELESS_ERROR_CHANNEL_REQUIRES_BAND: 
-
-<!-- ##### MACRO NM_TYPE_SETTING_WIRELESS_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_wireless_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SSID ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_MODE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_BAND ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_CHANNEL ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_BSSID ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_RATE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_TX_POWER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_MAC_ADDRESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_MTU ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SEEN_BSSIDS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SEC ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### STRUCT NMSettingWireless ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG NMSettingWireless:band ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingWireless:bssid ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingWireless:channel ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingWireless:cloned-mac-address ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingWireless:mac-address ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingWireless:mode ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingWireless:mtu ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingWireless:rate ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingWireless:security ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingWireless:seen-bssids ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingWireless:ssid ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingWireless:tx-power ##### -->
-<para>
-
-</para>
-
-<!-- ##### STRUCT NMSettingWirelessClass ##### -->
-<para>
-
-</para>
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-
-<!-- ##### FUNCTION nm_setting_wireless_get_type ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_get_ssid ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_get_mode ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_get_band ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_get_channel ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_get_bssid ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_get_rate ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_get_tx_power ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_get_mac_address ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_get_cloned_mac_address ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_get_mtu ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_get_security ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_add_seen_bssid ##### -->
-<para>
-
-</para>
-
-@setting: 
-@bssid: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_get_num_seen_bssids ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_get_seen_bssid ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_ap_security_compatible ##### -->
-<para>
-
-</para>
-
-@s_wireless: 
-@s_wireless_sec: 
-@ap_flags: 
-@ap_wpa: 
-@ap_rsn: 
-@ap_mode: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting.sgml b/docs/libnm-util/tmpl/nm-setting.sgml
deleted file mode 100644
index 832a29c6c..000000000
--- a/docs/libnm-util/tmpl/nm-setting.sgml
+++ /dev/null
@@ -1,276 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSetting
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### ENUM NMSettingError ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_ERROR_UNKNOWN: 
-@NM_SETTING_ERROR_PROPERTY_NOT_FOUND: 
-@NM_SETTING_ERROR_PROPERTY_NOT_SECRET: 
-@NM_SETTING_ERROR_PROPERTY_TYPE_MISMATCH: 
-
-<!-- ##### MACRO NM_TYPE_SETTING_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_SETTING_PARAM_SERIALIZE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PARAM_REQUIRED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PARAM_SECRET ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PARAM_FUZZY_IGNORE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### STRUCT NMSetting ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG NMSetting:name ##### -->
-<para>
-
-</para>
-
-<!-- ##### STRUCT NMSettingClass ##### -->
-<para>
-
-</para>
-
-@parent: 
-@verify: 
-@need_secrets: 
-@update_one_secret: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-
-<!-- ##### USER_FUNCTION NMSettingValueIterFn ##### -->
-<para>
-
-</para>
-
-@setting: 
-@key: 
-@value: 
-@flags: 
-@user_data: 
-
-
-<!-- ##### FUNCTION nm_setting_get_type ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_to_hash ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_new_from_hash ##### -->
-<para>
-
-</para>
-
-@setting_type: 
-@hash: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_duplicate ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_get_name ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_verify ##### -->
-<para>
-
-</para>
-
-@setting: 
-@all_settings: 
-@error: 
-@Returns: 
-
-
-<!-- ##### ENUM NMSettingCompareFlags ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_COMPARE_FLAG_EXACT: 
-@NM_SETTING_COMPARE_FLAG_FUZZY: 
-@NM_SETTING_COMPARE_FLAG_IGNORE_ID: 
-@NM_SETTING_COMPARE_FLAG_IGNORE_SECRETS: 
-
-<!-- ##### FUNCTION nm_setting_compare ##### -->
-<para>
-
-</para>
-
-@a: 
-@b: 
-@flags: 
-@Returns: 
-
-
-<!-- ##### ENUM NMSettingDiffResult ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_DIFF_RESULT_UNKNOWN: 
-@NM_SETTING_DIFF_RESULT_IN_A: 
-@NM_SETTING_DIFF_RESULT_IN_B: 
-
-<!-- ##### FUNCTION nm_setting_diff ##### -->
-<para>
-
-</para>
-
-@a: 
-@b: 
-@flags: 
-@invert_results: 
-@results: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_enumerate_values ##### -->
-<para>
-
-</para>
-
-@setting: 
-@func: 
-@user_data: 
-
-
-<!-- ##### FUNCTION nm_setting_to_string ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_clear_secrets ##### -->
-<para>
-
-</para>
-
-@setting: 
-
-
-<!-- ##### FUNCTION nm_setting_need_secrets ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_update_secrets ##### -->
-<para>
-
-</para>
-
-@setting: 
-@secrets: 
-@error: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-utils.sgml b/docs/libnm-util/tmpl/nm-utils.sgml
deleted file mode 100644
index 15c82f33d..000000000
--- a/docs/libnm-util/tmpl/nm-utils.sgml
+++ /dev/null
@@ -1,404 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-nm-utils
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO nm_print_backtrace ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO nm_get_timestamp ##### -->
-<para>
-
-</para>
-
-@timestamp: 
-
-
-<!-- ##### MACRO nm_info ##### -->
-<para>
-
-</para>
-
-@fmt: 
-@args...: 
-
-
-<!-- ##### MACRO nm_info_str ##### -->
-<para>
-
-</para>
-
-@fmt_str: 
-@args...: 
-
-
-<!-- ##### MACRO nm_debug ##### -->
-<para>
-
-</para>
-
-@fmt: 
-@args...: 
-
-
-<!-- ##### MACRO nm_debug_str ##### -->
-<para>
-
-</para>
-
-@fmt_str: 
-@args...: 
-
-
-<!-- ##### MACRO nm_warning ##### -->
-<para>
-
-</para>
-
-@fmt: 
-@args...: 
-
-
-<!-- ##### MACRO nm_warning_str ##### -->
-<para>
-
-</para>
-
-@fmt_str: 
-@args...: 
-
-
-<!-- ##### MACRO nm_error ##### -->
-<para>
-
-</para>
-
-@fmt: 
-@args...: 
-
-
-<!-- ##### MACRO nm_error_str ##### -->
-<para>
-
-</para>
-
-@fmt_str: 
-@args...: 
-
-
-<!-- ##### FUNCTION nm_utils_init ##### -->
-<para>
-
-</para>
-
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_deinit ##### -->
-<para>
-
-</para>
-
-@void: 
-
-
-<!-- ##### FUNCTION nm_utils_is_empty_ssid ##### -->
-<para>
-
-</para>
-
-@ssid: 
-@len: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_escape_ssid ##### -->
-<para>
-
-</para>
-
-@ssid: 
-@len: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_same_ssid ##### -->
-<para>
-
-</para>
-
-@ssid1: 
-@ssid2: 
-@ignore_trailing_null: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_ssid_to_utf8 ##### -->
-<para>
-
-</para>
-
-@ssid: 
-@len: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_gvalue_hash_dup ##### -->
-<para>
-
-</para>
-
-@hash: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_slist_free ##### -->
-<para>
-
-</para>
-
-@list: 
-@elem_destroy_fn: 
-
-
-<!-- ##### ENUM NMUtilsSecurityType ##### -->
-<para>
-
-</para>
-
-@NMU_SEC_INVALID: 
-@NMU_SEC_NONE: 
-@NMU_SEC_STATIC_WEP: 
-@NMU_SEC_LEAP: 
-@NMU_SEC_DYNAMIC_WEP: 
-@NMU_SEC_WPA_PSK: 
-@NMU_SEC_WPA_ENTERPRISE: 
-@NMU_SEC_WPA2_PSK: 
-@NMU_SEC_WPA2_ENTERPRISE: 
-
-<!-- ##### FUNCTION nm_utils_security_valid ##### -->
-<para>
-
-</para>
-
-@type: 
-@wifi_caps: 
-@have_ap: 
-@adhoc: 
-@ap_flags: 
-@ap_wpa: 
-@ap_rsn: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_ip4_addresses_from_gvalue ##### -->
-<para>
-
-</para>
-
-@value: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_ip4_addresses_to_gvalue ##### -->
-<para>
-
-</para>
-
-@list: 
-@value: 
-
-
-<!-- ##### FUNCTION nm_utils_ip4_routes_from_gvalue ##### -->
-<para>
-
-</para>
-
-@value: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_ip4_routes_to_gvalue ##### -->
-<para>
-
-</para>
-
-@list: 
-@value: 
-
-
-<!-- ##### FUNCTION nm_utils_ip4_netmask_to_prefix ##### -->
-<para>
-
-</para>
-
-@netmask: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_ip4_prefix_to_netmask ##### -->
-<para>
-
-</para>
-
-@prefix: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_ip4_get_default_prefix ##### -->
-<para>
-
-</para>
-
-@ip: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_ip6_addresses_from_gvalue ##### -->
-<para>
-
-</para>
-
-@value: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_ip6_addresses_to_gvalue ##### -->
-<para>
-
-</para>
-
-@list: 
-@value: 
-
-
-<!-- ##### FUNCTION nm_utils_ip6_routes_from_gvalue ##### -->
-<para>
-
-</para>
-
-@value: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_ip6_routes_to_gvalue ##### -->
-<para>
-
-</para>
-
-@list: 
-@value: 
-
-
-<!-- ##### FUNCTION nm_utils_ip6_dns_from_gvalue ##### -->
-<para>
-
-</para>
-
-@value: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_ip6_dns_to_gvalue ##### -->
-<para>
-
-</para>
-
-@list: 
-@value: 
-
-
-<!-- ##### FUNCTION nm_utils_uuid_generate ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_uuid_generate_from_string ##### -->
-<para>
-
-</para>
-
-@s: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_rsa_key_encrypt ##### -->
-<para>
-
-</para>
-
-@data: 
-@in_password: 
-@out_password: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_wifi_freq_to_channel ##### -->
-<para>
-
-</para>
-
-@freq: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_wifi_channel_to_freq ##### -->
-<para>
-
-</para>
-
-@channel: 
-@band: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_wifi_find_next_channel ##### -->
-<para>
-
-</para>
-
-@channel: 
-@direction: 
-@band: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_wifi_is_channel_valid ##### -->
-<para>
-
-</para>
-
-@channel: 
-@band: 
-@Returns: 
-
-
diff --git a/docs/settings-spec.html b/docs/settings-spec.html
deleted file mode 100644
index f2f010321..000000000
--- a/docs/settings-spec.html
+++ /dev/null
@@ -1,993 +0,0 @@
-<html>
-<head>
-<title>NetworkManager 0.8.3.999 Settings Specification</title></head>
-<body>
-<p><h2>Setting name: '802-1x'</h2></p>
-<table cellspacing=10 border=0 cellpadding=2>
-<th align=left>Key Name</th>
-<th align=left>Value Type</th>
-<th align=left>Default Value</th>
-<th align=left>Value Description</th>
-<tr align=left valign=top>
-<td><strong>name</strong></td>
-<td>string</td>
-<td>802-1x</td>
-<td>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.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>eap</strong></td>
-<td>array of string</td>
-<td>[]</td>
-<td>The allowed EAP method to be used when authenticating to the network with 802.1x. Valid methods are: 'leap', 'md5', 'tls', 'peap', 'ttls', and 'fast'. Each method requires different configuration using the properties of this setting; refer to wpa_supplicant documentation for the allowed combinations.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>identity</strong></td>
-<td>string</td>
-<td></td>
-<td>Identity string for EAP authentication methods.  Often the user's user or login name.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>anonymous-identity</strong></td>
-<td>string</td>
-<td></td>
-<td>Anonymous identity string for EAP authentication methods.  Used as the unencrypted identity with EAP types that support different tunneled identity like EAP-TTLS.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>ca-cert</strong></td>
-<td>byte array</td>
-<td>[]</td>
-<td>Contains the CA certificate if used by the EAP method specified in the 'eap' property.  Certificate data is specified using a 'scheme'; two are currently supported: blob and path.  When using the blob scheme (which is backwards compatible with NM 0.7.x) this property should be set to the certificate's DER encoded data.  When using the path scheme, this property should be set to the full UTF-8 encoded path of the certificate, prefixed with the string 'file://' and ending with a terminating NULL byte.  This property can be unset even if the EAP method supports CA certificates, but this allows man-in-the-middle attacks and is NOT recommended.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>ca-path</strong></td>
-<td>string</td>
-<td></td>
-<td>UTF-8 encoded path to a directory containing PEM or DER formatted certificates to be added to the verification chain in addition to the certificate specified in the 'ca-cert' property.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>client-cert</strong></td>
-<td>byte array</td>
-<td>[]</td>
-<td>Contains the client certificate if used by the EAP method specified in the 'eap' property.  Certificate data is specified using a 'scheme'; two are currently supported: blob and path.  When using the blob scheme (which is backwards compatible with NM 0.7.x) this property should be set to the certificate's DER encoded data.  When using the path scheme, this property should be set to the full UTF-8 encoded path of the certificate, prefixed with the string 'file://' and ending with a terminating NULL byte.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>phase1-peapver</strong></td>
-<td>string</td>
-<td></td>
-<td>Forces which PEAP version is used when PEAP is set as the EAP method in 'eap' property.  When unset, the version reported by the server will be used.  Sometimes when using older RADIUS servers, it is necessary to force the client to use a particular PEAP version.  To do so, this property may be set to '0' or '1; to force that specific PEAP version.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>phase1-peaplabel</strong></td>
-<td>string</td>
-<td></td>
-<td>Forces use of the new PEAP label during key derivation.  Some RADIUS servers may require forcing the new PEAP label to interoperate with PEAPv1.  Set to '1' to force use of the new PEAP label.  See the wpa_supplicant documentation for more details.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>phase1-fast-provisioning</strong></td>
-<td>string</td>
-<td></td>
-<td>Enables or disables in-line provisioning of EAP-FAST credentials when FAST is specified as the EAP method in the #NMSetting8021x:eap property. Allowed values are '0' (disabled), '1' (allow unauthenticated provisioning), '2' (allow authenticated provisioning), and '3' (allow both authenticated and unauthenticated provisioning).  See the wpa_supplicant documentation for more details.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>phase2-auth</strong></td>
-<td>string</td>
-<td></td>
-<td>Specifies the allowed 'phase 2' inner non-EAP authentication methods when an EAP method that uses an inner TLS tunnel is specified in the 'eap' property. Recognized non-EAP phase2 methods are 'pap', 'chap', 'mschap', 'mschapv2', 'gtc', 'otp', 'md5', and 'tls'.  Each 'phase 2' inner method requires specific parameters for successful authentication; see the wpa_supplicant documentation for more details.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>phase2-autheap</strong></td>
-<td>string</td>
-<td></td>
-<td>Specifies the allowed 'phase 2' inner EAP-based authentication methods when an EAP method that uses an inner TLS tunnel is specified in the 'eap' property. Recognized EAP-based 'phase 2' methods are 'md5', 'mschapv2', 'otp', 'gtc', and 'tls'. Each 'phase 2' inner method requires specific parameters for successful authentication; see the wpa_supplicant documentation for more details.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>phase2-ca-cert</strong></td>
-<td>byte array</td>
-<td>[]</td>
-<td>Contains the 'phase 2' CA certificate if used by the EAP method specified in the 'phase2-auth' or 'phase2-autheap' properties.  Certificate data is specified using a 'scheme'; two are currentlysupported: blob and path. When using the blob scheme (which is backwards compatible with NM 0.7.x) this property should be set to the certificate's DER encoded data. When using the path scheme, this property should be set to the full UTF-8 encoded path of the certificate, prefixed with the string 'file://' and ending with a terminating NULL byte.  This property can be unset even if the EAP method supports CA certificates, but this allows man-in-the-middle attacks and is NOT recommended.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>phase2-ca-path</strong></td>
-<td>string</td>
-<td></td>
-<td>UTF-8 encoded path to a directory containing PEM or DER formatted certificates to be added to the verification chain in addition to the certificate specified in the 'phase2-ca-cert' property.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>phase2-client-cert</strong></td>
-<td>byte array</td>
-<td>[]</td>
-<td>Contains the 'phase 2' client certificate if used by the EAP method specified in the 'phase2-eap' or 'phase2-autheap' properties. Certificate data is specified using a 'scheme'; two are currently supported: blob and path.  When using the blob scheme (which is backwards compatible with NM 0.7.x) this property should be set to the certificate's DER encoded data.  When using the path scheme, this property should be set to the full UTF-8 encoded path of the certificate, prefixed with the string 'file://' and ending with a terminating NULL byte.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>password</strong></td>
-<td>string</td>
-<td></td>
-<td>Password used for EAP authentication methods.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>private-key</strong></td>
-<td>byte array</td>
-<td>[]</td>
-<td>Contains the private key when the 'eap' property is set to 'tls'.  Key data is specified using a 'scheme'; two are currently supported: blob and path. When using the blob scheme and X.509 private keys, this property should be set to the keys's decrypted DER encoded data.  When using X.509 private keys with the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string 'file://' and and ending with a terminating NULL byte.  When using PKCS#12 format private keys and the blob scheme, this property should be set to the PKCS#12 data (which is encrypted) and the 'private-key-password' property must be set to password used to decrypt the PKCS#12 certificate and key.  When using PKCS#12 files and the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string 'file://' and and ending with a terminating NULL byte, and as with the blob scheme the 'private-key-password' property must be set to the password used to decode the PKCS#12 private key and certificate.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>private-key-password</strong></td>
-<td>string</td>
-<td></td>
-<td>The password used to decrypt the private key specified in the 'private-key' property when the private key either uses the path scheme, or if the private key is a PKCS#12 format key.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>phase2-private-key</strong></td>
-<td>byte array</td>
-<td>[]</td>
-<td>Contains the 'phase 2' inner private key when the 'phase2-eap' or 'phase2-autheap' property is set to 'tls'.  Key data is specified using a 'scheme'; two are currently supported: blob and path. When using the blob scheme and X.509 private keys, this property should be set to the keys's decrypted DER encoded data.  When using X.509 private keys with the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string 'file://' and and ending with a terminating NULL byte.  When using PKCS#12 format private keys and the blob scheme, this property should be set to the PKCS#12 data (which is encrypted) and the 'private-key-password' property must be set to password used to decrypt the PKCS#12 certificate and key.  When using PKCS#12 files and the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string 'file://' and and ending with a terminating NULL byte, and as with the blob scheme the 'private-key-password' property must be set to the password used to decode the PKCS#12 private key and certificate.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>phase2-private-key-password</strong></td>
-<td>string</td>
-<td></td>
-<td>The password used to decrypt the 'phase 2' private key specified in the 'private-key' property when the phase2 private key either uses the path scheme, or if the phase2 private key is a PKCS#12 format key.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>system-ca-certs</strong></td>
-<td>boolean</td>
-<td>FALSE</td>
-<td>When TRUE, overrides 'ca-path' and 'phase2-ca-path' properties using the system CA directory specified at configure time with the --system-ca-path switch.  The certificates in this directory are added to the verification chain in addition to any certificates specified by the 'ca-cert' and 'phase2-ca-cert' properties.</td>
-</tr>
-</table><br/>
-<p><h2>Setting name: 'bluetooth'</h2></p>
-<table cellspacing=10 border=0 cellpadding=2>
-<th align=left>Key Name</th>
-<th align=left>Value Type</th>
-<th align=left>Default Value</th>
-<th align=left>Value Description</th>
-<tr align=left valign=top>
-<td><strong>name</strong></td>
-<td>string</td>
-<td>bluetooth</td>
-<td>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.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>bdaddr</strong></td>
-<td>byte array</td>
-<td>[]</td>
-<td>The Bluetooth address of the device</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>type</strong></td>
-<td>string</td>
-<td></td>
-<td>Either 'dun' for Dial-Up Networking connections or 'panu' for Personal Area Networking connections.</td>
-</tr>
-</table><br/>
-<p><h2>Setting name: 'cdma'</h2></p>
-<table cellspacing=10 border=0 cellpadding=2>
-<th align=left>Key Name</th>
-<th align=left>Value Type</th>
-<th align=left>Default Value</th>
-<th align=left>Value Description</th>
-<tr align=left valign=top>
-<td><strong>name</strong></td>
-<td>string</td>
-<td>cdma</td>
-<td>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.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>number</strong></td>
-<td>string</td>
-<td></td>
-<td>Number to dial when establishing a PPP data session with the CDMA-based mobile broadband network.  If not specified, the default number (#777) is used when required.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>username</strong></td>
-<td>string</td>
-<td></td>
-<td>Username used to authenticate with the network, if required.  Note that many providers do not require a username or accept any username.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>password</strong></td>
-<td>string</td>
-<td></td>
-<td>Password used to authenticate with the network, if required.  Note that many providers do not require a password or accept any password.</td>
-</tr>
-</table><br/>
-<p><h2>Setting name: 'connection'</h2></p>
-<table cellspacing=10 border=0 cellpadding=2>
-<th align=left>Key Name</th>
-<th align=left>Value Type</th>
-<th align=left>Default Value</th>
-<th align=left>Value Description</th>
-<tr align=left valign=top>
-<td><strong>name</strong></td>
-<td>string</td>
-<td>connection</td>
-<td>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.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>id</strong></td>
-<td>string</td>
-<td></td>
-<td>User-readable connection identifier/name.  Must be one or more characters and may change over the lifetime of the connection if the user decides to rename it.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>uuid</strong></td>
-<td>string</td>
-<td></td>
-<td>Universally unique connection identifier.  Must be in the format '2815492f-7e56-435e-b2e9-246bd7cdc664' (ie, contains only hexadecimal characters and '-'). The UUID should be assigned when the connection is created and never changed as long as the connection still applies to the same network.  For example, it should not be changed when the user changes the connection's 'id', but should be recreated when the WiFi SSID, mobile broadband network provider, or the connection type changes.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>type</strong></td>
-<td>string</td>
-<td></td>
-<td>Base type of the connection.  For hardware-dependent connections, should contain the setting name of the hardware-type specific setting (ie, '802-3-ethernet' or '802-11-wireless' or 'bluetooth', etc), and for non-hardware dependent connections like VPN or otherwise, should contain the setting name of that setting type (ie, 'vpn' or 'bridge', etc).</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>autoconnect</strong></td>
-<td>boolean</td>
-<td>TRUE</td>
-<td>If TRUE, NetworkManager will activate this connection when its network resources are available.  If FALSE, the connection must be manually activated by the user or some other mechanism.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>timestamp</strong></td>
-<td>uint64</td>
-<td>0</td>
-<td>Timestamp (in seconds since the Unix Epoch) that the connection was last successfully activated.  Settings services should update the connection timestamp periodically when the connection is active to ensure that an active connection has the latest timestamp.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>read-only</strong></td>
-<td>boolean</td>
-<td>FALSE</td>
-<td>If TRUE, the connection is read-only and cannot be changed by the user or any other mechanism.  This is normally set for system connections whose plugin cannot yet write updated connections back out.</td>
-</tr>
-</table><br/>
-<p><h2>Setting name: 'gsm'</h2></p>
-<table cellspacing=10 border=0 cellpadding=2>
-<th align=left>Key Name</th>
-<th align=left>Value Type</th>
-<th align=left>Default Value</th>
-<th align=left>Value Description</th>
-<tr align=left valign=top>
-<td><strong>name</strong></td>
-<td>string</td>
-<td>gsm</td>
-<td>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.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>number</strong></td>
-<td>string</td>
-<td></td>
-<td>Number to dial when establishing a PPP data session with the GSM-based mobile broadband network.  In most cases, leave the number blank and a number selecting the APN specified in the 'apn' property will be used automatically when required.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>username</strong></td>
-<td>string</td>
-<td></td>
-<td>Username used to authenticate with the network, if required.  Note that many providers do not require a username or accept any username.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>password</strong></td>
-<td>string</td>
-<td></td>
-<td>Password used to authenticate with the network, if required.  Note that many providers do not require a password or accept any password.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>apn</strong></td>
-<td>string</td>
-<td></td>
-<td>The GPRS Access Point Name specifying the APN used when establishing a data session with the GSM-based network.  The APN often determines how the user will be billed for their network usage and whether the user has access to the Internet or just a provider-specific walled-garden, so it is important to use the correct APN for the user's mobile broadband plan.  The APN may only be composed of the characters a-z, 0-9, ., and - per GSM 03.60 Section 14.9.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>network-id</strong></td>
-<td>string</td>
-<td></td>
-<td>The Network ID (GSM LAI format, ie MCC-MNC) to force specific network registration.  If the Network ID is specified, NetworkManager will attempt to force the device to register only on the specified network.  This can be used to ensure that the device does not roam when direct roaming control of the device is not otherwise possible.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>network-type</strong></td>
-<td>int32</td>
-<td>-1</td>
-<td>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.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>band</strong></td>
-<td>int32</td>
-<td>-1</td>
-<td>Band (DEPRECATED and UNUSED)</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>pin</strong></td>
-<td>string</td>
-<td></td>
-<td>If the SIM is locked with a PIN it must be unlocked before any other operations are requested.  Specify the PIN here to allow operation of the device.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>puk</strong></td>
-<td>string</td>
-<td></td>
-<td>PUK (DEPRECATED and UNUSED)</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>allowed-bands</strong></td>
-<td>uint32</td>
-<td>1</td>
-<td>Bitfield of allowed frequency bands.  Note that not all devices allow frequency band control.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>home-only</strong></td>
-<td>boolean</td>
-<td>FALSE</td>
-<td>When TRUE, only connections to the home network will be allowed.  Connections to roaming networks will not be made.</td>
-</tr>
-</table><br/>
-<p><h2>Setting name: 'ipv4'</h2></p>
-<table cellspacing=10 border=0 cellpadding=2>
-<th align=left>Key Name</th>
-<th align=left>Value Type</th>
-<th align=left>Default Value</th>
-<th align=left>Value Description</th>
-<tr align=left valign=top>
-<td><strong>name</strong></td>
-<td>string</td>
-<td>ipv4</td>
-<td>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.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>method</strong></td>
-<td>string</td>
-<td></td>
-<td>IPv4 configuration method.  If 'auto' is specified then the appropriate automatic method (DHCP, PPP, etc) is used for the interface and most other properties can be left unset.  If 'link-local' is specified, then a link-local address in the 169.254/16 range will be assigned to the interface.  If 'manual' is specified, static IP addressing is used and at least one IP address must be given in the 'addresses' property.  If 'shared' is specified (indicating that this connection will provide network access to other computers) then the interface is assigned an address in the 10.42.x.1/24 range and a DHCP and forwarding DNS server are started, and the interface is NAT-ed to the current default network connection.  'disabled' means IPv4 will not be used on this connection.  This property must be set.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>dns</strong></td>
-<td>array of uint32</td>
-<td>[]</td>
-<td>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.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>dns-search</strong></td>
-<td>array of string</td>
-<td>[]</td>
-<td>List of DNS search domains.  For the 'auto' method, these search domains are appended to those returned by automatic configuration. Search domains cannot be used with the 'shared', 'link-local', or 'disabled' methods as there is no upstream network.  In all other methods, these search domains are used as the only search domains for this connection.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>addresses</strong></td>
-<td>array of array of uint32</td>
-<td>[]</td>
-<td>Array of IPv4 address structures.  Each IPv4 address structure is composed of 3 32-bit values; the first being the IPv4 address (network byte order), the second the prefix (1 - 32), and last the IPv4 gateway (network byte order). The gateway may be left as 0 if no gateway exists for that subnet.  For the 'auto' method, given IP addresses are appended to those returned by automatic configuration.  Addresses cannot be used with the 'shared', 'link-local', or 'disabled' methods as addressing is either automatic or disabled with these methods.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>routes</strong></td>
-<td>array of array of uint32</td>
-<td>[]</td>
-<td>Array of IPv4 route structures.  Each IPv4 route structure is composed of 4 32-bit values; the first being the destination IPv4 network or address (network byte order), the second the destination network or address prefix (1 - 32), the third being the next-hop (network byte order) if any, and the fourth being the route metric. For the 'auto' method, given IP routes are appended to those returned by automatic configuration.  Routes cannot be used with the 'shared', 'link-local', or 'disabled', methods as there is no upstream network.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>ignore-auto-routes</strong></td>
-<td>boolean</td>
-<td>FALSE</td>
-<td>When the method is set to 'auto' and this property to TRUE, automatically configured routes are ignored and only routes specified in the 'routes' property, if any, are used.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>ignore-auto-dns</strong></td>
-<td>boolean</td>
-<td>FALSE</td>
-<td>When the method is set to 'auto' and this property to TRUE, automatically configured nameservers and search domains are ignored and only nameservers and search domains specified in the 'dns' and 'dns-search' properties, if any, are used.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>dhcp-client-id</strong></td>
-<td>string</td>
-<td></td>
-<td>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.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>dhcp-send-hostname</strong></td>
-<td>boolean</td>
-<td>TRUE</td>
-<td>If TRUE, a hostname is sent to the DHCP server when acquiring a lease.  Some DHCP servers use this hostname to update DNS databases, essentially providing a static hostname for the computer.  If the 'dhcp-hostname' property is empty and this property is TRUE, the current persistent hostname of the computer is sent.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>dhcp-hostname</strong></td>
-<td>string</td>
-<td></td>
-<td>If the 'dhcp-send-hostname' property is TRUE, then the specified name will be sent to the DHCP server when acquiring a lease.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>never-default</strong></td>
-<td>boolean</td>
-<td>FALSE</td>
-<td>If TRUE, this connection will never be the default IPv4 connection, meaning it will never be assigned the default route by NetworkManager.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>may-fail</strong></td>
-<td>boolean</td>
-<td>FALSE</td>
-<td>If TRUE, allow overall network configuration to proceed even if IPv4 configuration times out. Note that at least one IP configuration must succeed or overall network configuration will still fail.  For example, in IPv6-only networks, setting this property to TRUE allows the overall network configuration to succeed if IPv4 configuration fails but IPv6 configuration completes successfully.</td>
-</tr>
-</table><br/>
-<p><h2>Setting name: 'ipv6'</h2></p>
-<table cellspacing=10 border=0 cellpadding=2>
-<th align=left>Key Name</th>
-<th align=left>Value Type</th>
-<th align=left>Default Value</th>
-<th align=left>Value Description</th>
-<tr align=left valign=top>
-<td><strong>name</strong></td>
-<td>string</td>
-<td>ipv6</td>
-<td>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.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>method</strong></td>
-<td>string</td>
-<td></td>
-<td>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.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>dns</strong></td>
-<td>array of byte array</td>
-<td>[]</td>
-<td>Array of DNS servers, where each member of the array is a byte array containing the IPv6 address of the DNS server (in network byte order). For the 'auto' method, these DNS servers are appended to those (if any) returned by automatic configuration.  DNS servers cannot be used with the 'shared' or 'link-local' methods as there is no usptream network.  In all other methods, these DNS servers are used as the only DNS servers for this connection.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>dns-search</strong></td>
-<td>array of string</td>
-<td>[]</td>
-<td>List of DNS search domains.  For the 'auto' method, these search domains are appended to those returned by automatic configuration. Search domains cannot be used with the 'shared' or 'link-local' methods as there is no upstream network.  In all other methods, these search domains are used as the only search domains for this connection.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>addresses</strong></td>
-<td>array of (byte array, uint32, byte array)</td>
-<td>[]</td>
-<td>Array of IPv6 address structures.  Each IPv6 address structure is composed of 3 members, the first being a byte array containing the IPv6 address (network byte order), the second a 32-bit integer containing the IPv6 address prefix, and the third a byte array containing the IPv6 address (network byte order) of the gateway associated with this address, if any. If no gateway is given, the third element should be given as all zeros.  For the 'auto' method, given IP addresses are appended to those returned by automatic configuration.  Addresses cannot be used with the 'shared' or 'link-local' methods as the interface is automatically assigned an address with these methods.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>routes</strong></td>
-<td>array of (byte array, uint32, byte array, uint32)</td>
-<td>[]</td>
-<td>Array of IPv6 route structures.  Each IPv6 route structure is composed of 4 members; the first being the destination IPv6 network or address (network byte order) as a byte array, the second the destination network or address IPv6 prefix, the third being the next-hop IPv6 address (network byte order) if any, and the fourth being the route metric. For the 'auto' method, given IP routes are appended to those returned by automatic configuration.  Routes cannot be used with the 'shared' or 'link-local' methods because there is no upstream network.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>ignore-auto-routes</strong></td>
-<td>boolean</td>
-<td>FALSE</td>
-<td>When the method is set to 'auto' or 'dhcp' and this property is set to TRUE, automatically configured routes are ignored and only routes specified in the 'routes' property, if any, are used.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>ignore-auto-dns</strong></td>
-<td>boolean</td>
-<td>FALSE</td>
-<td>When the method is set to 'auto' or 'dhcp' and this property is set to TRUE, automatically configured nameservers and search domains are ignored and only nameservers and search domains specified in the 'dns' and 'dns-search' properties, if any, are used.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>never-default</strong></td>
-<td>boolean</td>
-<td>FALSE</td>
-<td>If TRUE, this connection will never be the default IPv6 connection, meaning it will never be assigned the default IPv6 route by NetworkManager.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>may-fail</strong></td>
-<td>boolean</td>
-<td>FALSE</td>
-<td>If TRUE, allow overall network configuration to proceed even if IPv6 configuration times out. Note that at least one IP configuration must succeed or overall network configuration will still fail.  For example, in IPv4-only networks, setting this property to TRUE allows the overall network configuration to succeed if IPv6 configuration fails but IPv4 configuration completes successfully.</td>
-</tr>
-</table><br/>
-<p><h2>Setting name: '802-11-olpc-mesh'</h2></p>
-<table cellspacing=10 border=0 cellpadding=2>
-<th align=left>Key Name</th>
-<th align=left>Value Type</th>
-<th align=left>Default Value</th>
-<th align=left>Value Description</th>
-<tr align=left valign=top>
-<td><strong>name</strong></td>
-<td>string</td>
-<td>802-11-olpc-mesh</td>
-<td>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.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>ssid</strong></td>
-<td>byte array</td>
-<td>[]</td>
-<td>SSID of the mesh network to join.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>channel</strong></td>
-<td>uint32</td>
-<td>0</td>
-<td>Channel on which the mesh network to join is located.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>dhcp-anycast-address</strong></td>
-<td>byte array</td>
-<td>[]</td>
-<td>Anycast DHCP MAC address used when requesting an IP address via DHCP.  The specific anycast address used determines which DHCP server class answers the the request.</td>
-</tr>
-</table><br/>
-<p><h2>Setting name: 'ppp'</h2></p>
-<table cellspacing=10 border=0 cellpadding=2>
-<th align=left>Key Name</th>
-<th align=left>Value Type</th>
-<th align=left>Default Value</th>
-<th align=left>Value Description</th>
-<tr align=left valign=top>
-<td><strong>name</strong></td>
-<td>string</td>
-<td>ppp</td>
-<td>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.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>noauth</strong></td>
-<td>boolean</td>
-<td>TRUE</td>
-<td>If TRUE, do not require the other side (usually the PPP server) to authenticate itself to the client.  If FALSE, require authentication from the remote side.  In almost all cases, this should be TRUE.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>refuse-eap</strong></td>
-<td>boolean</td>
-<td>FALSE</td>
-<td>If TRUE, the EAP authentication method will not be used.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>refuse-pap</strong></td>
-<td>boolean</td>
-<td>FALSE</td>
-<td>If TRUE, the PAP authentication method will not be used.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>refuse-chap</strong></td>
-<td>boolean</td>
-<td>FALSE</td>
-<td>If TRUE, the CHAP authentication method will not be used.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>refuse-mschap</strong></td>
-<td>boolean</td>
-<td>FALSE</td>
-<td>If TRUE, the MSCHAP authentication method will not be used.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>refuse-mschapv2</strong></td>
-<td>boolean</td>
-<td>FALSE</td>
-<td>If TRUE, the MSCHAPv2 authentication method will not be used.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>nobsdcomp</strong></td>
-<td>boolean</td>
-<td>FALSE</td>
-<td>If TRUE, BSD compression will not be requested.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>nodeflate</strong></td>
-<td>boolean</td>
-<td>FALSE</td>
-<td>If TRUE, 'deflate' compression will not be requested.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>no-vj-comp</strong></td>
-<td>boolean</td>
-<td>FALSE</td>
-<td>If TRUE, Van Jacobsen TCP header compression will not be requested.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>require-mppe</strong></td>
-<td>boolean</td>
-<td>FALSE</td>
-<td>If TRUE, MPPE (Microsoft Point-to-Point Encrpytion) will be required for the PPP session.  If either 64-bit or 128-bit MPPE is not available the session will fail.  Note that MPPE is not used on mobile broadband connections.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>require-mppe-128</strong></td>
-<td>boolean</td>
-<td>FALSE</td>
-<td>If TRUE, 128-bit MPPE (Microsoft Point-to-Point Encrpytion) will be required for the PPP session, and the 'require-mppe' property must also be set to TRUE.  If 128-bit MPPE is not available the session will fail.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>mppe-stateful</strong></td>
-<td>boolean</td>
-<td>FALSE</td>
-<td>If TRUE, stateful MPPE is used.  See pppd documentation for more information on stateful MPPE.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>crtscts</strong></td>
-<td>boolean</td>
-<td>FALSE</td>
-<td>If TRUE, specify that pppd should set the serial port to use hardware flow control with RTS and CTS signals.  This value should normally be set to FALSE.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>baud</strong></td>
-<td>uint32</td>
-<td>0</td>
-<td>If non-zero, instruct pppd to set the serial port to the specified baudrate.  This value should normally be left as 0 to automatically choose the speed.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>mru</strong></td>
-<td>uint32</td>
-<td>0</td>
-<td>If non-zero, instruct pppd to request that the peer send packets no larger than the specified size.  If non-zero, the MRU should be between 128 and 16384.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>mtu</strong></td>
-<td>uint32</td>
-<td>0</td>
-<td>If non-zero, instruct pppd to send packets no larger than the specified size.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>lcp-echo-failure</strong></td>
-<td>uint32</td>
-<td>0</td>
-<td>If non-zero, instruct pppd to presume the connection to the peer has failed if the specified number of LCP echo-requests go unanswered by the peer.  The 'lcp-echo-interval' property must also be set to a non-zero value if this property is used.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>lcp-echo-interval</strong></td>
-<td>uint32</td>
-<td>0</td>
-<td>If non-zero, instruct pppd to send an LCP echo-request frame to the peer every n seconds (where n is the specified value).  Note that some PPP peers will respond to echo requests and some will not, and it is not possible to autodetect this.</td>
-</tr>
-</table><br/>
-<p><h2>Setting name: 'pppoe'</h2></p>
-<table cellspacing=10 border=0 cellpadding=2>
-<th align=left>Key Name</th>
-<th align=left>Value Type</th>
-<th align=left>Default Value</th>
-<th align=left>Value Description</th>
-<tr align=left valign=top>
-<td><strong>name</strong></td>
-<td>string</td>
-<td>pppoe</td>
-<td>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.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>service</strong></td>
-<td>string</td>
-<td></td>
-<td>If specified, instruct PPPoE to only initiate sessions with access concentrators that provide the specified serivce.  For most providers, this should be left blank.  It is only required if there are multiple access concentrators or a specific service is known to be required.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>username</strong></td>
-<td>string</td>
-<td></td>
-<td>Username used to authenticate with the PPPoE service.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>password</strong></td>
-<td>string</td>
-<td></td>
-<td>Password used to authenticate with the PPPoE service.</td>
-</tr>
-</table><br/>
-<p><h2>Setting name: 'serial'</h2></p>
-<table cellspacing=10 border=0 cellpadding=2>
-<th align=left>Key Name</th>
-<th align=left>Value Type</th>
-<th align=left>Default Value</th>
-<th align=left>Value Description</th>
-<tr align=left valign=top>
-<td><strong>name</strong></td>
-<td>string</td>
-<td>serial</td>
-<td>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.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>baud</strong></td>
-<td>uint32</td>
-<td>57600</td>
-<td>Speed to use for communication over the serial port.  Note that this value usually has no effect for mobile broadband modems as they generally ignore speed settings and use the highest available speed.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>bits</strong></td>
-<td>uint32</td>
-<td>8</td>
-<td>Byte-width of the serial communication.  The 8 in '8n1' for example.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>parity</strong></td>
-<td>gchar</td>
-<td>110</td>
-<td>Parity setting of the serial port.  Either 'E' for even parity, 'o' for odd parity, or 'n' for no parity.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>stopbits</strong></td>
-<td>uint32</td>
-<td>1</td>
-<td>Number of stop bits for communication on the serial port.  Either 1 or 2.  The 1 in '8n1' for example.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>send-delay</strong></td>
-<td>uint64</td>
-<td>0</td>
-<td>Time to delay between each byte sent to the modem, in microseconds.</td>
-</tr>
-</table><br/>
-<p><h2>Setting name: 'vpn'</h2></p>
-<table cellspacing=10 border=0 cellpadding=2>
-<th align=left>Key Name</th>
-<th align=left>Value Type</th>
-<th align=left>Default Value</th>
-<th align=left>Value Description</th>
-<tr align=left valign=top>
-<td><strong>name</strong></td>
-<td>string</td>
-<td>vpn</td>
-<td>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.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>service-type</strong></td>
-<td>string</td>
-<td></td>
-<td>D-Bus service name of the VPN plugin that this setting uses to connect to its network.  i.e. org.freedesktop.NetworkManager.vpnc for the vpnc plugin.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>user-name</strong></td>
-<td>string</td>
-<td></td>
-<td>User name of the currently logged in user for connections provided by the user settings service.  This name is provided to the VPN plugin to use in lieu of a custom username provided by that VPN plugins specific configuration.  The VPN plugin itself decides which user name to use.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>data</strong></td>
-<td>dict of (string::string)</td>
-<td>[ ]</td>
-<td>Dictionary of key/value pairs of VPN plugin specific data.  Both keys and values must be strings.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>secrets</strong></td>
-<td>dict of (string::string)</td>
-<td>[ ]</td>
-<td>Dictionary of key/value pairs of VPN plugin specific secrets like passwords or private keys.  Both keys and values must be strings.</td>
-</tr>
-</table><br/>
-<p><h2>Setting name: '802-3-ethernet'</h2></p>
-<table cellspacing=10 border=0 cellpadding=2>
-<th align=left>Key Name</th>
-<th align=left>Value Type</th>
-<th align=left>Default Value</th>
-<th align=left>Value Description</th>
-<tr align=left valign=top>
-<td><strong>name</strong></td>
-<td>string</td>
-<td>802-3-ethernet</td>
-<td>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.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>port</strong></td>
-<td>string</td>
-<td></td>
-<td>Specific port type to use if multiple the device supports multiple attachment methods.  One of 'tp' (Twisted Pair), 'aui' (Attachment Unit Interface), 'bnc' (Thin Ethernet) or 'mii' (Media Independent Interface.  If the device supports only one port type, this setting is ignored.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>speed</strong></td>
-<td>uint32</td>
-<td>0</td>
-<td>If non-zero, request that the device use only the specified speed.  In Mbit/s, ie 100 == 100Mbit/s.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>duplex</strong></td>
-<td>string</td>
-<td></td>
-<td>If specified, request that the device only use the specified duplex mode.  Either 'half' or 'full'.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>auto-negotiate</strong></td>
-<td>boolean</td>
-<td>TRUE</td>
-<td>If TRUE, allow auto-negotiation of port speed and duplex mode.  If FALSE, do not allow auto-negotiation,in which case the 'speed' and 'duplex' properties should be set.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>mac-address</strong></td>
-<td>byte array</td>
-<td>[]</td>
-<td>If specified, this connection will only apply to the ethernet device whose permanent MAC address matches.  This property does not change the MAC address of the device (i.e. MAC spoofing).</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>cloned-mac-address</strong></td>
-<td>byte array</td>
-<td>[]</td>
-<td>If specified, request that the device use this MAC address instead of its permanent MAC address.  This is known as MAC cloning or spoofing.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>mtu</strong></td>
-<td>uint32</td>
-<td>0</td>
-<td>If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple Ethernet frames.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>s390-subchannels</strong></td>
-<td>GPtrArray_gchararray_</td>
-<td>[]</td>
-<td>Identifies specific subchannels that this network device uses for communcation with z/VM or s390 host.  Like the 'mac-address' property for non-z/VM devices, this property can be used to ensure this connection only applies to the network device that uses these subchannels. The list should contain exactly 3 strings, and each string may only be composed of hexadecimal characters and the period (.) character.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>s390-nettype</strong></td>
-<td>string</td>
-<td></td>
-<td>s390 network device type; one of 'qeth', 'lcs', or 'ctc', representing the different types of virtual network devices available on s390 systems.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>s390-options</strong></td>
-<td>dict of (string::string)</td>
-<td>[ ]</td>
-<td>Dictionary of key/value pairs of s390-specific device options.  Both keys and values must be strings.  Allowed keys include 'portno', 'layer2', 'portname', 'protocol', among others.</td>
-</tr>
-</table><br/>
-<p><h2>Setting name: '802-11-wireless'</h2></p>
-<table cellspacing=10 border=0 cellpadding=2>
-<th align=left>Key Name</th>
-<th align=left>Value Type</th>
-<th align=left>Default Value</th>
-<th align=left>Value Description</th>
-<tr align=left valign=top>
-<td><strong>name</strong></td>
-<td>string</td>
-<td>802-11-wireless</td>
-<td>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.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>ssid</strong></td>
-<td>byte array</td>
-<td>[]</td>
-<td>SSID of the WiFi network.  Must be specified.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>mode</strong></td>
-<td>string</td>
-<td></td>
-<td>WiFi network mode; one of 'infrastructure' or 'adhoc'.  If blank, infrastructure is assumed.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>band</strong></td>
-<td>string</td>
-<td></td>
-<td>802.11 frequency band of the network.  One of 'a' for 5GHz 802.11a or 'bg' for 2.4GHz 802.11.  This will lock associations to the WiFi network to the specific band, i.e. if 'a' is specified, the device will not associate with the same network in the 2.4GHz band even if the network's settings are compatible.  This setting depends on specific driver capability and may not work with all drivers.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>channel</strong></td>
-<td>uint32</td>
-<td>0</td>
-<td>Wireless channel to use for the WiFi connection.  The device will only join (or create for Ad-Hoc networks) a WiFi network on the specified channel.  Because channel numbers overlap between bands, this property also requires the 'band' property to be set.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>bssid</strong></td>
-<td>byte array</td>
-<td>[]</td>
-<td>If specified, directs the device to only associate with the given access point.  This capability is highly driver dependent and not supported by all devices.  Note: this property does not control the BSSID used when creating an Ad-Hoc network and is unlikely to in the future.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>rate</strong></td>
-<td>uint32</td>
-<td>0</td>
-<td>If non-zero, directs the device to only use the specified bitrate for communication with the access point.  Units are in Kb/s, ie 5500 = 5.5 Mbit/s.  This property is highly driver dependent and not all devices support setting a static bitrate.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>tx-power</strong></td>
-<td>uint32</td>
-<td>0</td>
-<td>If non-zero, directs the device to use the specified transmit power.  Units are dBm.  This property is highly driver dependent and not all devices support setting a static transmit power.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>mac-address</strong></td>
-<td>byte array</td>
-<td>[]</td>
-<td>If specified, this connection will only apply to the WiFi device whose permanent MAC address matches.  This property does not change the MAC address of the device (i.e. MAC spoofing).</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>cloned-mac-address</strong></td>
-<td>byte array</td>
-<td>[]</td>
-<td>If specified, request that the WiFi device use this MAC address instead of its permanent MAC address.  This is known as MAC cloning or spoofing.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>mtu</strong></td>
-<td>uint32</td>
-<td>0</td>
-<td>If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple Ethernet frames.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>seen-bssids</strong></td>
-<td>array of string</td>
-<td>[]</td>
-<td>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.  The settings service will usually populate this property by periodically asking NetworkManager what the device's current AP is while connected to the network (or monitoring the device's 'active-ap' property) and adding the current AP's BSSID to this list.  This list helps NetworkManager find hidden APs by matching up scan results with the BSSIDs in this list.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>security</strong></td>
-<td>string</td>
-<td></td>
-<td>If the wireless connection has any security restrictions, like 802.1x, WEP, or WPA, set this property to '802-11-wireless-security' and ensure the connection contains a valid 802-11-wireless-security setting.</td>
-</tr>
-</table><br/>
-<p><h2>Setting name: '802-11-wireless-security'</h2></p>
-<table cellspacing=10 border=0 cellpadding=2>
-<th align=left>Key Name</th>
-<th align=left>Value Type</th>
-<th align=left>Default Value</th>
-<th align=left>Value Description</th>
-<tr align=left valign=top>
-<td><strong>name</strong></td>
-<td>string</td>
-<td>802-11-wireless-security</td>
-<td>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.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>key-mgmt</strong></td>
-<td>string</td>
-<td></td>
-<td>Key management used for the connection.  One of 'none' (WEP), 'ieee8021x' (Dynamic WEP), 'wpa-none' (WPA-PSK Ad-Hoc), 'wpa-psk' (infrastructure WPA-PSK), or 'wpa-eap' (WPA-Enterprise).  This property must be set for any WiFi connection that uses security.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>wep-tx-keyidx</strong></td>
-<td>uint32</td>
-<td>0</td>
-<td>When static WEP is used (ie, key-mgmt = 'none') and a non-default WEP key index is used by the AP, put that WEP key index here.  Valid values are 0 (default key) through 3.  Note that some consumer access points (like the Linksys WRT54G) number the keys 1 - 4.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>auth-alg</strong></td>
-<td>string</td>
-<td></td>
-<td>When WEP is used (ie, key-mgmt = 'none' or 'ieee8021x') indicate the 802.11 authentication algorithm required by the AP here.  One of 'open' for Open System, 'shared' for Shared Key, or 'leap' for Cisco LEAP.  When using Cisco LEAP (ie, key-mgmt = 'ieee8021x' and auth-alg = 'leap') the 'leap-username' and 'leap-password' properties must be specified.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>proto</strong></td>
-<td>array of string</td>
-<td>[]</td>
-<td>List of strings specifying the allowed WPA protocol versions to use.  Each element may be one 'wpa' (allow WPA) or 'rsn' (allow WPA2/RSN).  If not specified, both WPA and RSN connections are allowed.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>pairwise</strong></td>
-<td>array of string</td>
-<td>[]</td>
-<td>If specified, will only connect to WPA networks that provide the specified pairwise encryption capabilities.  Each element may be one of 'wep40', 'wep104', 'tkip', or 'ccmp'.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>group</strong></td>
-<td>array of string</td>
-<td>[]</td>
-<td>If specified, will only connect to WPA networks that provide the specified group/multicast encryption capabilities.  Each element may be one of 'wep40', 'wep104', 'tkip', or 'ccmp'.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>leap-username</strong></td>
-<td>string</td>
-<td></td>
-<td>The login username for legacy LEAP connections (ie, key-mgmt = 'ieee8021x' and auth-alg = 'leap').</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>wep-key0</strong></td>
-<td>string</td>
-<td></td>
-<td>Index 0 WEP key.  This is the WEP key used in most networks.  See the 'wep-key-type' property for a description of how this key is interpreted.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>wep-key1</strong></td>
-<td>string</td>
-<td></td>
-<td>Index 1 WEP key.  This WEP index is not used by most networks.  See the 'wep-key-type' property for a description of how this key is interpreted.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>wep-key2</strong></td>
-<td>string</td>
-<td></td>
-<td>Index 2 WEP key.  This WEP index is not used by most networks.  See the 'wep-key-type' property for a description of how this key is interpreted.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>wep-key3</strong></td>
-<td>string</td>
-<td></td>
-<td>Index 3 WEP key.  This WEP index is not used by most networks.  See the 'wep-key-type' property for a description of how this key is interpreted.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>psk</strong></td>
-<td>string</td>
-<td></td>
-<td>Pre-Shared-Key for WPA networks.  If the key is 64-characters long, it must contain only hexadecimal characters and is interpreted as a hexadecimal WPA key.  Otherwise, the key must be between 8 and 63 ASCII characters (as specified in the 802.11i standard) and is interpreted as a WPA passphrase, and is hashed to derive the actual WPA-PSK used when connecting to the WiFi network.</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>leap-password</strong></td>
-<td>string</td>
-<td></td>
-<td>The login password for legacy LEAP connections (ie, key-mgmt = 'ieee8021x' and auth-alg = 'leap').</td>
-</tr>
-<tr align=left valign=top>
-<td><strong>wep-key-type</strong></td>
-<td>uint32</td>
-<td>0</td>
-<td>Controls the interpretation of WEP keys.  Allowed values are 1 (interpret WEP keys as hexadecimal or ASCII keys) or 2 (interpret WEP keys as WEP Passphrases).  If set to 1 and the keys are hexadecimal, they must be either 10 or 26 characters in length.  If set to 1 and the keys are ASCII keys, they must be either 5 or 13 characters in length.  If set to 2, the passphrase is hashed using  the de-facto MD5 method to derive the actual WEP key.</td>
-</tr>
-</table><br/>
-</body>
-</html>