Imported Upstream version 0.9.7.997 upstream/0.9.7.997

author: Michael Biebl <biebl@debian.org> 2013-02-09 03:16:54 +0100
committer: Michael Biebl <biebl@debian.org> 2013-02-09 03:16:54 +0100
commit: e17c5736fc3722ce51cb33f3edb203960125a4c1 (patch)
tree: 2b41ee92b307915e9d97f0ef2c012fc793653599 /docs
parent: 9c202e3e860b3be9e1f8882630b69affbb130102 (diff)
67 files changed, 514 insertions, 2200 deletions
diff --git a/docs/Makefile.in b/docs/Makefile.in
index 1f11c8ed..6eb2b23c 100644
--- a/docs/Makefile.in
+++ b/docs/Makefile.in
@@ -60,12 +60,11 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
 	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \
 	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \
 	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
-	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/vapigen.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -224,12 +223,6 @@ LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBM = @LIBM@
-LIBNL1_CFLAGS = @LIBNL1_CFLAGS@
-LIBNL1_LIBS = @LIBNL1_LIBS@
-LIBNL2_CFLAGS = @LIBNL2_CFLAGS@
-LIBNL2_LIBS = @LIBNL2_LIBS@
-LIBNL3_CFLAGS = @LIBNL3_CFLAGS@
-LIBNL3_LIBS = @LIBNL3_LIBS@
 LIBNL_CFLAGS = @LIBNL_CFLAGS@
 LIBNL_LIBS = @LIBNL_LIBS@
 LIBOBJS = @LIBOBJS@
diff --git a/docs/api/Makefile.am b/docs/api/Makefile.am
index ba98f168..d98dc786 100644
--- a/docs/api/Makefile.am
+++ b/docs/api/Makefile.am
@@ -1,30 +1,7 @@
-GENERATE_SETTINGS_SPEC_SOURCE = generate-settings-spec.c
-
 AUTOMAKE_OPTIONS = 1.7
 
 if ENABLE_DOC
 
-INCLUDES = \
-	-I$(top_srcdir)/include \
-	-I$(top_builddir)/include \
-	-I$(top_srcdir)/libnm-util \
-	-I$(top_builddir)/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)
 
@@ -43,9 +20,10 @@ spec.html: $(XMLS) $(OTHER_FILES) html-build.stamp
 	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)/$@
+# settings-spec.xml should *not* be DISTed because it must be regenerated
+# whenever the libnm-util source changes
+settings-spec.xml: $(top_builddir)/tools/generate-settings-spec $(top_builddir)/libnm-util/libnm-util.la
+	$(top_builddir)/tools/generate-settings-spec book $@
 
 all: $(GENERATED_FILES)
 
@@ -68,7 +46,6 @@ 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)
 
@@ -76,12 +53,12 @@ include $(top_srcdir)/gtk-doc.make
 
 ####################################
 
-EXTRA_DIST += $(GENERATED_FILES)
+EXTRA_DIST += spec.html
 CLEANFILES += $(GENERATED_FILES)
 
 else
 
-EXTRA_DIST = $(GENERATE_SETTINGS_SPEC_SOURCE)
+EXTRA_DIST =
 CLEANFILES =
 
 endif
diff --git a/docs/api/Makefile.in b/docs/api/Makefile.in
index 8266f3a5..d2123e44 100644
--- a/docs/api/Makefile.in
+++ b/docs/api/Makefile.in
@@ -20,7 +20,6 @@
 ####################################
 # Everything below here is generic #
 ####################################
-
 VPATH = @srcdir@
 am__make_dryrun = \
   { \
@@ -57,7 +56,6 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-@ENABLE_DOC_TRUE@noinst_PROGRAMS = generate-settings-spec$(EXEEXT)
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(srcdir)/version.xml.in $(top_srcdir)/gtk-doc.make
 subdir = docs/api
@@ -69,66 +67,30 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
 	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \
 	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \
 	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
-	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/vapigen.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
 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)
-@ENABLE_DOC_TRUE@am_generate_settings_spec_OBJECTS = $(am__objects_1)
-generate_settings_spec_OBJECTS = $(am_generate_settings_spec_OBJECTS)
-am__DEPENDENCIES_1 =
-@ENABLE_DOC_TRUE@generate_settings_spec_DEPENDENCIES =  \
-@ENABLE_DOC_TRUE@	$(top_builddir)/libnm-util/libnm-util.la \
-@ENABLE_DOC_TRUE@	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-AM_V_lt = $(am__v_lt_@AM_V@)
-am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-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_@AM_V@)
-am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-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_@AM_V@)
-am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD  " $@;
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 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_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+SOURCES =
+DIST_SOURCES =
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
-ETAGS = etags
-CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -228,12 +190,6 @@ LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBM = @LIBM@
-LIBNL1_CFLAGS = @LIBNL1_CFLAGS@
-LIBNL1_LIBS = @LIBNL1_LIBS@
-LIBNL2_CFLAGS = @LIBNL2_CFLAGS@
-LIBNL2_LIBS = @LIBNL2_LIBS@
-LIBNL3_CFLAGS = @LIBNL3_CFLAGS@
-LIBNL3_LIBS = @LIBNL3_LIBS@
 LIBNL_CFLAGS = @LIBNL_CFLAGS@
 LIBNL_LIBS = @LIBNL_LIBS@
 LIBOBJS = @LIBOBJS@
@@ -373,26 +329,7 @@ with_dhclient = @with_dhclient@
 with_dhcpcd = @with_dhcpcd@
 with_netconfig = @with_netconfig@
 with_resolvconf = @with_resolvconf@
-GENERATE_SETTINGS_SPEC_SOURCE = generate-settings-spec.c
 AUTOMAKE_OPTIONS = 1.7
-@ENABLE_DOC_TRUE@INCLUDES = \
-@ENABLE_DOC_TRUE@	-I$(top_srcdir)/include \
-@ENABLE_DOC_TRUE@	-I$(top_builddir)/include \
-@ENABLE_DOC_TRUE@	-I$(top_srcdir)/libnm-util \
-@ENABLE_DOC_TRUE@	-I$(top_builddir)/libnm-util
-
-@ENABLE_DOC_TRUE@generate_settings_spec_SOURCES = \
-@ENABLE_DOC_TRUE@	$(GENERATE_SETTINGS_SPEC_SOURCE)
-
-@ENABLE_DOC_TRUE@generate_settings_spec_CPPFLAGS = \
-@ENABLE_DOC_TRUE@	$(GLIB_CFLAGS) \
-@ENABLE_DOC_TRUE@	$(DBUS_CFLAGS)
-
-@ENABLE_DOC_TRUE@generate_settings_spec_LDADD = \
-@ENABLE_DOC_TRUE@	$(top_builddir)/libnm-util/libnm-util.la \
-@ENABLE_DOC_TRUE@	$(GLIB_LIBS) \
-@ENABLE_DOC_TRUE@	$(DBUS_LIBS)
-
 @ENABLE_DOC_TRUE@XSLTPROC = xsltproc --xinclude --nonet
 @ENABLE_DOC_TRUE@XMLS = $(wildcard $(top_srcdir)/introspection/nm-*.xml)
 @ENABLE_DOC_TRUE@OTHER_FILES = \
@@ -423,7 +360,6 @@ AUTOMAKE_OPTIONS = 1.7
 # Non-autogenerated SGML files to be included in $(DOC_MAIN_SGML_FILE)
 @ENABLE_DOC_TRUE@content_files = \
 @ENABLE_DOC_TRUE@	version.xml \
-@ENABLE_DOC_TRUE@	settings-spec.xml \
 @ENABLE_DOC_TRUE@	migrating-to-09.xml \
 @ENABLE_DOC_TRUE@	$(NULL)
 
@@ -447,12 +383,11 @@ AUTOMAKE_OPTIONS = 1.7
 @ENABLE_DOC_TRUE@	$(DOC_MODULE)-sections.txt	\
 @ENABLE_DOC_TRUE@	$(DOC_MODULE)-overrides.txt
 
-@ENABLE_DOC_FALSE@EXTRA_DIST = $(GENERATE_SETTINGS_SPEC_SOURCE) \
-@ENABLE_DOC_FALSE@	version.xml.in
+@ENABLE_DOC_FALSE@EXTRA_DIST = version.xml.in
 
 ####################################
-@ENABLE_DOC_TRUE@EXTRA_DIST = $(HTML_IMAGES) $(SETUP_FILES) \
-@ENABLE_DOC_TRUE@	$(GENERATED_FILES) version.xml.in
+@ENABLE_DOC_TRUE@EXTRA_DIST = $(HTML_IMAGES) $(SETUP_FILES) spec.html \
+@ENABLE_DOC_TRUE@	version.xml.in
 @ENABLE_DOC_TRUE@DOC_STAMPS = setup-build.stamp scan-build.stamp tmpl-build.stamp sgml-build.stamp \
 @ENABLE_DOC_TRUE@	html-build.stamp pdf-build.stamp \
 @ENABLE_DOC_TRUE@	tmpl.stamp sgml.stamp html.stamp pdf.stamp
@@ -483,7 +418,6 @@ AUTOMAKE_OPTIONS = 1.7
 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 \
@@ -518,118 +452,17 @@ $(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) $(EXTRA_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)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
-
-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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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:
 
-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
+CTAGS:
+
 @ENABLE_DOC_FALSE@dist-hook:
 
 distdir: $(DISTFILES)
@@ -668,7 +501,7 @@ distdir: $(DISTFILES)
 check-am: all-am
 check: check-am
 @ENABLE_DOC_FALSE@all-local:
-all-am: Makefile $(PROGRAMS) all-local
+all-am: Makefile all-local
 installdirs:
 install: install-am
 install-exec: install-exec-am
@@ -708,14 +541,11 @@ maintainer-clean-generic:
 @ENABLE_DOC_FALSE@clean-local:
 clean: clean-am
 
-clean-am: clean-generic clean-libtool clean-local clean-noinstPROGRAMS \
-	mostlyclean-am
+clean-am: clean-generic clean-libtool clean-local mostlyclean-am
 
 distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-local distclean-tags
+distclean-am: clean-am distclean-generic distclean-local
 
 dvi: dvi-am
 
@@ -758,15 +588,13 @@ 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
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
 
 pdf: pdf-am
 
@@ -780,20 +608,19 @@ 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 \
+.PHONY: all all-am all-local check check-am clean clean-generic \
+	clean-libtool clean-local dist-hook distclean \
+	distclean-generic distclean-libtool distclean-local 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
+	maintainer-clean-local mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-local
 
 
 @ENABLE_DOC_TRUE@spec.html: $(XMLS) $(OTHER_FILES) html-build.stamp
@@ -801,9 +628,10 @@ uninstall-am: uninstall-local
 @ENABLE_DOC_TRUE@	mkdir -p $(builddir)/html/
 @ENABLE_DOC_TRUE@	cp $@ $(builddir)/html/
 
-@ENABLE_DOC_TRUE@settings-spec.xml: generate-settings-spec $(top_builddir)/libnm-util/libnm-util.la
-@ENABLE_DOC_TRUE@	rm -f $(builddir)/$@
-@ENABLE_DOC_TRUE@	$(builddir)/generate-settings-spec $(builddir)/$@
+# settings-spec.xml should *not* be DISTed because it must be regenerated
+# whenever the libnm-util source changes
+@ENABLE_DOC_TRUE@settings-spec.xml: $(top_builddir)/tools/generate-settings-spec $(top_builddir)/libnm-util/libnm-util.la
+@ENABLE_DOC_TRUE@	$(top_builddir)/tools/generate-settings-spec book $@
 
 @ENABLE_DOC_TRUE@all: $(GENERATED_FILES)
 
diff --git a/docs/api/generate-settings-spec.c b/docs/api/generate-settings-spec.c
deleted file mode 100644
index b07bd345..00000000
--- a/docs/api/generate-settings-spec.c
+++ /dev/null
@@ -1,240 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/*
- * Dan Williams <dcbw@redhat.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301 USA.
- *
- * (C) Copyright 2009 - 2012 Red Hat, Inc.
- */
-
-#include <stdio.h>
-#include <errno.h>
-#include <unistd.h>
-#include <string.h>
-
-#include <glib.h>
-#include <dbus/dbus-glib.h>
-#include "config.h"
-
-#include <nm-setting-8021x.h>
-#include <nm-setting-adsl.h>
-#include <nm-setting-bluetooth.h>
-#include <nm-setting-cdma.h>
-#include <nm-setting-connection.h>
-#include <nm-setting-gsm.h>
-#include <nm-setting.h>
-#include <nm-setting-ip4-config.h>
-#include <nm-setting-ip6-config.h>
-#include <nm-setting-olpc-mesh.h>
-#include <nm-setting-ppp.h>
-#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>
-#include <nm-setting-infiniband.h>
-#include <nm-setting-bond.h>
-#include <nm-setting-bridge.h>
-#include <nm-setting-bridge-port.h>
-#include <nm-setting-vlan.h>
-
-#include <nm-utils.h>
-
-typedef NMSetting* (*SettingNewFunc) (void);
-
-static SettingNewFunc funcs[] = {
-	nm_setting_802_1x_new,
-	nm_setting_adsl_new,
-	nm_setting_bluetooth_new,
-	nm_setting_bond_new,
-	nm_setting_bridge_new,
-	nm_setting_bridge_port_new,
-	nm_setting_cdma_new,
-	nm_setting_connection_new,
-	nm_setting_gsm_new,
-	nm_setting_infiniband_new,
-	nm_setting_ip4_config_new,
-	nm_setting_ip6_config_new,
-	nm_setting_olpc_mesh_new,
-	nm_setting_ppp_new,
-	nm_setting_pppoe_new,
-	nm_setting_serial_new,
-	nm_setting_vlan_new,
-	nm_setting_vpn_new,
-	nm_setting_wimax_new,
-	nm_setting_wired_new,
-	nm_setting_wireless_new,
-	nm_setting_wireless_security_new,
-	NULL
-};
-
-typedef struct {
-	const char *gvalue_name;
-	const char *new_name;
-} TypeNameElement;
-
-static TypeNameElement name_map[] = {
-	{ "gchararray", "string" },
-	{ "GSList_gchararray_", "array of string" },
-	{ "GArray_guchar_", "byte array" },
-	{ "gboolean", "boolean" },
-	{ "guint64", "uint64" },
-	{ "gint", "int32" },
-	{ "guint", "uint32" },
-	{ "GArray_guint_", "array of uint32" },
-	{ "GPtrArray_GArray_guint__", "array of array of uint32" },
-	{ "GPtrArray_GArray_guchar__", "array of byte array" },
-	{ "GPtrArray_gchararray_", "array of string" },
-	{ "GHashTable_gchararray+gchararray_", "dict of (string::string)" },
-	{ "GPtrArray_GValueArray_GArray_guchar_+guint+GArray_guchar___", "array of (byte array, uint32, byte array)" },
-	{ "GPtrArray_GValueArray_GArray_guchar_+guint+GArray_guchar_+guint__", "array of (byte array, uint32, byte array, uint32)" },
-	{ NULL, NULL }
-};
-
-static void
-write_one_setting (FILE *f, SettingNewFunc func)
-{
-	NMSetting *s;
-	GParamSpec **props, **iter;
-	guint num;
-
-	s = func ();
-
-	/* write out section header */
-	(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));
-
-	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++) {
-			if (!strcmp (value_type, name_iter->gvalue_name)) {
-				value_type = name_iter->new_name;
-				break;
-			}
-		}
-
-		key_name = g_param_spec_get_name (*iter);
-		value_desc = g_param_spec_get_blurb (*iter);
-
-		g_value_init (&value, G_PARAM_SPEC_VALUE_TYPE (*iter));
-		g_param_value_set_default (*iter, &value);
-		default_value = g_strdup_value_contents (&value);
-		if (default_value && !strcmp (default_value, "NULL")) {
-			g_free (default_value);
-			default_value = NULL;
-		}
-
-		if (!strcmp (key_name, NM_SETTING_NAME)) {
-			g_free (default_value);
-			default_value = NULL;
-			g_object_get (G_OBJECT (s), NM_SETTING_NAME, &default_value, NULL);
-		}
-
-		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);
-	}
-
-	(void) fprintf (f,
-		"    </tbody>\n"
-		"  </tgroup>\n"
-		"</table>\n");
-
-	g_object_unref (s);
-}
-
-int
-main (int argc, char *argv[])
-{
-	GError *error = NULL;
-	FILE *f;
-	SettingNewFunc *fptr;
-
-	if (argc != 2) {
-		fprintf (stderr, "Usage: %s <output file>\n", argv[0]);
-		_exit (1);
-	}
-
-	g_type_init ();
-
-	if (!nm_utils_init (&error)) {
-		fprintf (stderr, "ERR: failed to initialize libnm-util: %s", error->message);
-		_exit (2);
-	}
-
-	f = fopen (argv[1], "w");
-	if (!f) {
-		fprintf (stderr, "ERR: could not create %s: %d\n", argv[1], errno);
-		_exit (3);
-	}
-
-	(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);
-
-	(void) fprintf (f,
-		"  </para>\n"
-		"</section>\n");
-
-	fclose (f);
-	_exit (0);
-}
-
diff --git a/docs/api/html/NetworkManager.devhelp2 b/docs/api/html/NetworkManager.devhelp2
index 22bace81..fd669a49 100644
--- a/docs/api/html/NetworkManager.devhelp2
+++ b/docs/api/html/NetworkManager.devhelp2
@@ -4,23 +4,23 @@
   <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#idp7117680"/>
+      <sub name="Configuration Settings" link="ref-settings.html#idp8828144"/>
       <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#idp9666048">
-        <sub name="Elimination of the User Settings Service" link="ref-migrating.html#idp9841232"/>
-        <sub name="User Secret Agents" link="ref-migrating.html#idp10473664"/>
-        <sub name="Settings Service Interface Changes" link="ref-migrating.html#idp4817488"/>
-        <sub name="Connection Object Interface Changes" link="ref-migrating.html#idp6496288"/>
-        <sub name="Permissions Methods Consolidation" link="ref-migrating.html#idp5738512"/>
-        <sub name="AddConnection Returns Object Path of New Connection" link="ref-migrating.html#idp10731168"/>
-        <sub name="Support for WiMAX Devices" link="ref-migrating.html#idp9702992"/>
-        <sub name="New Device States" link="ref-migrating.html#idp4780896"/>
-        <sub name="New Active Connection State" link="ref-migrating.html#idp8383824"/>
-        <sub name="Consolidated Modem Devices" link="ref-migrating.html#idp6851392"/>
-        <sub name="Secret Property Flags" link="ref-migrating.html#idp5982704"/>
-        <sub name="Deprecated Methods Removed" link="ref-migrating.html#idp10222192"/>
+      <sub name="Architecture and D-Bus API Changes in 0.9" link="ref-migrating.html#idp7369136">
+        <sub name="Elimination of the User Settings Service" link="ref-migrating.html#idp7191632"/>
+        <sub name="User Secret Agents" link="ref-migrating.html#idp5401424"/>
+        <sub name="Settings Service Interface Changes" link="ref-migrating.html#idp8019904"/>
+        <sub name="Connection Object Interface Changes" link="ref-migrating.html#idp5711808"/>
+        <sub name="Permissions Methods Consolidation" link="ref-migrating.html#idp9568320"/>
+        <sub name="AddConnection Returns Object Path of New Connection" link="ref-migrating.html#idp10489904"/>
+        <sub name="Support for WiMAX Devices" link="ref-migrating.html#idp8180400"/>
+        <sub name="New Device States" link="ref-migrating.html#idp6127200"/>
+        <sub name="New Active Connection State" link="ref-migrating.html#idp7405264"/>
+        <sub name="Consolidated Modem Devices" link="ref-migrating.html#idp7426304"/>
+        <sub name="Secret Property Flags" link="ref-migrating.html#idp8047760"/>
+        <sub name="Deprecated Methods Removed" link="ref-migrating.html#idp10077264"/>
       </sub>
     </sub>
     <sub name="Index" link="ix01.html"/>
diff --git a/docs/api/html/index.html b/docs/api/html/index.html
index 4ad09274..6557dbc8 100644
--- a/docs/api/html/index.html
+++ b/docs/api/html/index.html
@@ -14,11 +14,11 @@
 <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><p class="releaseinfo">Version 0.9.7.995
+<div><p class="releaseinfo">Version 0.9.7.997
 </p></div>
 <div><p class="copyright">Copyright © 2012 The NetworkManager Authors</p></div>
 <div><div class="legalnotice">
-<a name="idp475760"></a><p>
+<a name="idp201728"></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
@@ -46,25 +46,25 @@
 <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#idp7117680">Configuration Settings</a></span></dt>
+<dt><span class="section"><a href="ref-settings.html#idp8828144">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#idp9666048">Architecture and D-Bus API Changes in 0.9</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#idp7369136">Architecture and D-Bus API Changes in 0.9</a></span></dt>
 <dd><dl>
-<dt><span class="section"><a href="ref-migrating.html#idp9841232">Elimination of the User Settings Service</a></span></dt>
-<dt><span class="section"><a href="ref-migrating.html#idp10473664">User Secret Agents</a></span></dt>
-<dt><span class="section"><a href="ref-migrating.html#idp4817488">Settings Service Interface Changes</a></span></dt>
-<dt><span class="section"><a href="ref-migrating.html#idp6496288">Connection Object Interface Changes</a></span></dt>
-<dt><span class="section"><a href="ref-migrating.html#idp5738512">Permissions Methods Consolidation</a></span></dt>
-<dt><span class="section"><a href="ref-migrating.html#idp10731168">AddConnection Returns Object Path of New Connection</a></span></dt>
-<dt><span class="section"><a href="ref-migrating.html#idp9702992">Support for WiMAX Devices</a></span></dt>
-<dt><span class="section"><a href="ref-migrating.html#idp4780896">New Device States</a></span></dt>
-<dt><span class="section"><a href="ref-migrating.html#idp8383824">New Active Connection State</a></span></dt>
-<dt><span class="section"><a href="ref-migrating.html#idp6851392">Consolidated Modem Devices</a></span></dt>
-<dt><span class="section"><a href="ref-migrating.html#idp5982704">Secret Property Flags</a></span></dt>
-<dt><span class="section"><a href="ref-migrating.html#idp10222192">Deprecated Methods Removed</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#idp7191632">Elimination of the User Settings Service</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#idp5401424">User Secret Agents</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#idp8019904">Settings Service Interface Changes</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#idp5711808">Connection Object Interface Changes</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#idp9568320">Permissions Methods Consolidation</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#idp10489904">AddConnection Returns Object Path of New Connection</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#idp8180400">Support for WiMAX Devices</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#idp6127200">New Device States</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#idp7405264">New Active Connection State</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#idp7426304">Consolidated Modem Devices</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#idp8047760">Secret Property Flags</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#idp10077264">Deprecated Methods Removed</a></span></dt>
 </dl></dd>
 </dl></dd>
 <dt><span class="index"><a href="ix01.html">Index</a></span></dt>
diff --git a/docs/api/html/ix01.html b/docs/api/html/ix01.html
index ce62fb55..72dc9c03 100644
--- a/docs/api/html/ix01.html
+++ b/docs/api/html/ix01.html
@@ -21,7 +21,7 @@
 </tr></table>
 <div class="index">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="idp74000"></a>Index</h2></div></div></div>
+<a name="idp73872"></a>Index</h2></div></div></div>
 <div class="index"></div>
 </div>
 <div class="footer">
diff --git a/docs/api/html/ref-migrating.html b/docs/api/html/ref-migrating.html
index 665f9bfb..bfc66efb 100644
--- a/docs/api/html/ref-migrating.html
+++ b/docs/api/html/ref-migrating.html
@@ -23,20 +23,20 @@
 <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#idp9666048">Architecture and D-Bus API Changes in 0.9</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#idp7369136">Architecture and D-Bus API Changes in 0.9</a></span></dt>
 <dd><dl>
-<dt><span class="section"><a href="ref-migrating.html#idp9841232">Elimination of the User Settings Service</a></span></dt>
-<dt><span class="section"><a href="ref-migrating.html#idp10473664">User Secret Agents</a></span></dt>
-<dt><span class="section"><a href="ref-migrating.html#idp4817488">Settings Service Interface Changes</a></span></dt>
-<dt><span class="section"><a href="ref-migrating.html#idp6496288">Connection Object Interface Changes</a></span></dt>
-<dt><span class="section"><a href="ref-migrating.html#idp5738512">Permissions Methods Consolidation</a></span></dt>
-<dt><span class="section"><a href="ref-migrating.html#idp10731168">AddConnection Returns Object Path of New Connection</a></span></dt>
-<dt><span class="section"><a href="ref-migrating.html#idp9702992">Support for WiMAX Devices</a></span></dt>
-<dt><span class="section"><a href="ref-migrating.html#idp4780896">New Device States</a></span></dt>
-<dt><span class="section"><a href="ref-migrating.html#idp8383824">New Active Connection State</a></span></dt>
-<dt><span class="section"><a href="ref-migrating.html#idp6851392">Consolidated Modem Devices</a></span></dt>
-<dt><span class="section"><a href="ref-migrating.html#idp5982704">Secret Property Flags</a></span></dt>
-<dt><span class="section"><a href="ref-migrating.html#idp10222192">Deprecated Methods Removed</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#idp7191632">Elimination of the User Settings Service</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#idp5401424">User Secret Agents</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#idp8019904">Settings Service Interface Changes</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#idp5711808">Connection Object Interface Changes</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#idp9568320">Permissions Methods Consolidation</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#idp10489904">AddConnection Returns Object Path of New Connection</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#idp8180400">Support for WiMAX Devices</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#idp6127200">New Device States</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#idp7405264">New Active Connection State</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#idp7426304">Consolidated Modem Devices</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#idp8047760">Secret Property Flags</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#idp10077264">Deprecated Methods Removed</a></span></dt>
 </dl></dd>
 </dl></div>
 <p>
@@ -50,14 +50,14 @@
   </p>
 <div class="section">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="idp9666048"></a>Architecture and D-Bus API Changes in 0.9</h2></div></div></div>
+<a name="idp7369136"></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="idp9841232"></a>Elimination of the User Settings Service</h3></div></div></div>
+<a name="idp7191632"></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
@@ -103,7 +103,7 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="idp10473664"></a>User Secret Agents</h3></div></div></div>
+<a name="idp5401424"></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
@@ -152,7 +152,7 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="idp4817488"></a>Settings Service Interface Changes</h3></div></div></div>
+<a name="idp8019904"></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
@@ -190,7 +190,7 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="idp6496288"></a>Connection Object Interface Changes</h3></div></div></div>
+<a name="idp5711808"></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
@@ -224,7 +224,7 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="idp5738512"></a>Permissions Methods Consolidation</h3></div></div></div>
+<a name="idp9568320"></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
@@ -256,7 +256,7 @@
       are now string-based permissions.  The mapping is as follows:
       </p>
 <div class="table">
-<a name="idp8355952"></a><p class="title"><b>Table 23. </b></p>
+<a name="idp5069392"></a><p class="title"><b>Table 23. </b></p>
 <div class="table-contents"><table border="1">
 <colgroup>
 <col>
@@ -307,7 +307,7 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="idp10731168"></a>AddConnection Returns Object Path of New Connection</h3></div></div></div>
+<a name="idp10489904"></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>
@@ -325,7 +325,7 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="idp9702992"></a>Support for WiMAX Devices</h3></div></div></div>
+<a name="idp8180400"></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
@@ -348,7 +348,7 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="idp4780896"></a>New Device States</h3></div></div></div>
+<a name="idp6127200"></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.
@@ -363,7 +363,7 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="idp8383824"></a>New Active Connection State</h3></div></div></div>
+<a name="idp7405264"></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
@@ -379,7 +379,7 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="idp6851392"></a>Consolidated Modem Devices</h3></div></div></div>
+<a name="idp7426304"></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
@@ -415,7 +415,7 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="idp5982704"></a>Secret Property Flags</h3></div></div></div>
+<a name="idp8047760"></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
@@ -424,7 +424,7 @@
       following values:
       </p>
 <div class="table">
-<a name="idp10576448"></a><p class="title"><b>Table 24. </b></p>
+<a name="idp8048752"></a><p class="title"><b>Table 24. </b></p>
 <div class="table-contents"><table border="1">
 <colgroup>
 <col>
@@ -486,7 +486,7 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="idp10222192"></a>Deprecated Methods Removed</h3></div></div></div>
+<a name="idp10077264"></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
@@ -496,7 +496,7 @@
       their replacements:
       </p>
 <div class="table">
-<a name="idp9315120"></a><p class="title"><b>Table 25. </b></p>
+<a name="idp10079056"></a><p class="title"><b>Table 25. </b></p>
 <div class="table-contents"><table border="1">
 <colgroup>
 <col>
diff --git a/docs/api/html/ref-settings.html b/docs/api/html/ref-settings.html
index 8373c83b..bbf0f439 100644
--- a/docs/api/html/ref-settings.html
+++ b/docs/api/html/ref-settings.html
@@ -23,7 +23,7 @@
 <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#idp7117680">Configuration Settings</a></span></dt>
+<dt><span class="section"><a href="ref-settings.html#idp8828144">Configuration Settings</a></span></dt>
 <dt><span class="section"><a href="secrets-flags.html">Secret flag types</a></span></dt>
 </dl></div>
 <p>
@@ -35,11 +35,11 @@
     </p>
 <div class="section">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="idp7117680"></a>Configuration Settings</h2></div></div></div>
+<a name="idp8828144"></a>Configuration Settings</h2></div></div></div>
 <p>
 </p>
 <div class="table">
-<a name="idp6405792"></a><p class="title"><b>Table 1. 802-1x setting</b></p>
+<a name="idp8562544"></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>
@@ -246,7 +246,7 @@
 <p><br class="table-break">
 </p>
 <div class="table">
-<a name="idp6771136"></a><p class="title"><b>Table 2. adsl setting</b></p>
+<a name="idp7038016"></a><p class="title"><b>Table 2. adsl setting</b></p>
 <div class="table-contents"><table summary="adsl setting" border="1">
 <colgroup>
 <col>
@@ -315,7 +315,7 @@
 <p><br class="table-break">
 </p>
 <div class="table">
-<a name="idp6805376"></a><p class="title"><b>Table 3. bluetooth setting</b></p>
+<a name="idp7072256"></a><p class="title"><b>Table 3. bluetooth setting</b></p>
 <div class="table-contents"><table summary="bluetooth setting" border="1">
 <colgroup>
 <col>
@@ -354,7 +354,7 @@
 <p><br class="table-break">
 </p>
 <div class="table">
-<a name="idp10739632"></a><p class="title"><b>Table 4. bond setting</b></p>
+<a name="idp7088176"></a><p class="title"><b>Table 4. bond setting</b></p>
 <div class="table-contents"><table summary="bond setting" border="1">
 <colgroup>
 <col>
@@ -393,7 +393,7 @@
 <p><br class="table-break">
 </p>
 <div class="table">
-<a name="idp10753056"></a><p class="title"><b>Table 5. bridge setting</b></p>
+<a name="idp7104128"></a><p class="title"><b>Table 5. bridge setting</b></p>
 <div class="table-contents"><table summary="bridge setting" border="1">
 <colgroup>
 <col>
@@ -462,7 +462,7 @@
 <p><br class="table-break">
 </p>
 <div class="table">
-<a name="idp10781584"></a><p class="title"><b>Table 6. bridge-port setting</b></p>
+<a name="idp7138288"></a><p class="title"><b>Table 6. bridge-port setting</b></p>
 <div class="table-contents"><table summary="bridge-port setting" border="1">
 <colgroup>
 <col>
@@ -507,7 +507,7 @@
 <p><br class="table-break">
 </p>
 <div class="table">
-<a name="idp10798128"></a><p class="title"><b>Table 7. cdma setting</b></p>
+<a name="idp7158096"></a><p class="title"><b>Table 7. cdma setting</b></p>
 <div class="table-contents"><table summary="cdma setting" border="1">
 <colgroup>
 <col>
@@ -558,7 +558,7 @@
 <p><br class="table-break">
 </p>
 <div class="table">
-<a name="idp10818160"></a><p class="title"><b>Table 8. connection setting</b></p>
+<a name="idp10788432"></a><p class="title"><b>Table 8. connection setting</b></p>
 <div class="table-contents"><table summary="connection setting" border="1">
 <colgroup>
 <col>
@@ -651,7 +651,7 @@
 <p><br class="table-break">
 </p>
 <div class="table">
-<a name="idp10860896"></a><p class="title"><b>Table 9. gsm setting</b></p>
+<a name="idp10831168"></a><p class="title"><b>Table 9. gsm setting</b></p>
 <div class="table-contents"><table summary="gsm setting" border="1">
 <colgroup>
 <col>
@@ -744,7 +744,7 @@
 <p><br class="table-break">
 </p>
 <div class="table">
-<a name="idp10903840"></a><p class="title"><b>Table 10. infiniband setting</b></p>
+<a name="idp10877472"></a><p class="title"><b>Table 10. infiniband setting</b></p>
 <div class="table-contents"><table summary="infiniband setting" border="1">
 <colgroup>
 <col>
@@ -789,7 +789,7 @@
 <p><br class="table-break">
 </p>
 <div class="table">
-<a name="idp10920448"></a><p class="title"><b>Table 11. ipv4 setting</b></p>
+<a name="idp10898064"></a><p class="title"><b>Table 11. ipv4 setting</b></p>
 <div class="table-contents"><table summary="ipv4 setting" border="1">
 <colgroup>
 <col>
@@ -888,7 +888,7 @@
 <p><br class="table-break">
 </p>
 <div class="table">
-<a name="idp10968000"></a><p class="title"><b>Table 12. ipv6 setting</b></p>
+<a name="idp10956832"></a><p class="title"><b>Table 12. ipv6 setting</b></p>
 <div class="table-contents"><table summary="ipv6 setting" border="1">
 <colgroup>
 <col>
@@ -981,7 +981,7 @@
 <p><br class="table-break">
 </p>
 <div class="table">
-<a name="idp11018480"></a><p class="title"><b>Table 13. 802-11-olpc-mesh setting</b></p>
+<a name="idp11011936"></a><p class="title"><b>Table 13. 802-11-olpc-mesh setting</b></p>
 <div class="table-contents"><table summary="802-11-olpc-mesh setting" border="1">
 <colgroup>
 <col>
@@ -1026,7 +1026,7 @@
 <p><br class="table-break">
 </p>
 <div class="table">
-<a name="idp11039120"></a><p class="title"><b>Table 14. ppp setting</b></p>
+<a name="idp11032576"></a><p class="title"><b>Table 14. ppp setting</b></p>
 <div class="table-contents"><table summary="ppp setting" border="1">
 <colgroup>
 <col>
@@ -1161,7 +1161,7 @@
 <p><br class="table-break">
 </p>
 <div class="table">
-<a name="idp11119600"></a><p class="title"><b>Table 15. pppoe setting</b></p>
+<a name="idp11113056"></a><p class="title"><b>Table 15. pppoe setting</b></p>
 <div class="table-contents"><table summary="pppoe setting" border="1">
 <colgroup>
 <col>
@@ -1212,7 +1212,7 @@
 <p><br class="table-break">
 </p>
 <div class="table">
-<a name="idp11144352"></a><p class="title"><b>Table 16. serial setting</b></p>
+<a name="idp11137808"></a><p class="title"><b>Table 16. serial setting</b></p>
 <div class="table-contents"><table summary="serial setting" border="1">
 <colgroup>
 <col>
@@ -1269,7 +1269,7 @@
 <p><br class="table-break">
 </p>
 <div class="table">
-<a name="idp11172992"></a><p class="title"><b>Table 17. vlan setting</b></p>
+<a name="idp11166448"></a><p class="title"><b>Table 17. vlan setting</b></p>
 <div class="table-contents"><table summary="vlan setting" border="1">
 <colgroup>
 <col>
@@ -1332,7 +1332,7 @@
 <p><br class="table-break">
 </p>
 <div class="table">
-<a name="idp11205968"></a><p class="title"><b>Table 18. vpn setting</b></p>
+<a name="idp11199424"></a><p class="title"><b>Table 18. vpn setting</b></p>
 <div class="table-contents"><table summary="vpn setting" border="1">
 <colgroup>
 <col>
@@ -1383,7 +1383,7 @@
 <p><br class="table-break">
 </p>
 <div class="table">
-<a name="idp11230656"></a><p class="title"><b>Table 19. wimax setting</b></p>
+<a name="idp11224112"></a><p class="title"><b>Table 19. wimax setting</b></p>
 <div class="table-contents"><table summary="wimax setting" border="1">
 <colgroup>
 <col>
@@ -1422,7 +1422,7 @@
 <p><br class="table-break">
 </p>
 <div class="table">
-<a name="idp11247280"></a><p class="title"><b>Table 20. 802-3-ethernet setting</b></p>
+<a name="idp11240736"></a><p class="title"><b>Table 20. 802-3-ethernet setting</b></p>
 <div class="table-contents"><table summary="802-3-ethernet setting" border="1">
 <colgroup>
 <col>
@@ -1515,7 +1515,7 @@
 <p><br class="table-break">
 </p>
 <div class="table">
-<a name="idp11300128"></a><p class="title"><b>Table 21. 802-11-wireless setting</b></p>
+<a name="idp11293584"></a><p class="title"><b>Table 21. 802-11-wireless setting</b></p>
 <div class="table-contents"><table summary="802-11-wireless setting" border="1">
 <colgroup>
 <col>
@@ -1626,7 +1626,7 @@
 <p><br class="table-break">
 </p>
 <div class="table">
-<a name="idp11365504"></a><p class="title"><b>Table 22. 802-11-wireless-security setting</b></p>
+<a name="idp11358960"></a><p class="title"><b>Table 22. 802-11-wireless-security setting</b></p>
 <div class="table-contents"><table summary="802-11-wireless-security setting" border="1">
 <colgroup>
 <col>
diff --git a/docs/api/html/spec.html b/docs/api/html/spec.html
index 1ff031f6..c31bfc0b 100644
--- a/docs/api/html/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.9.7.995</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.7.997</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.9.7.995</h2><div>Copyright (C) 2008 - 2011 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.7.997</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
@@ -827,7 +827,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
         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>
+      <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><dt><code>NM_802_11_DEVICE_CAP_AP = 0x40</code></dt><dd>The device supports Access Point mode.</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
diff --git a/docs/api/settings-spec.xml b/docs/api/settings-spec.xml
deleted file mode 100644
index b0bf597b..00000000
--- a/docs/api/settings-spec.xml
+++ /dev/null
@@ -1,1592 +0,0 @@
-<?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>pac-file</screen></entry>
-        <entry><screen>string</screen></entry>
-        <entry><screen></screen></entry>
-        <entry>UTF-8 encoded file path containing PAC for EAP-FAST.</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>subject-match</screen></entry>
-        <entry><screen>string</screen></entry>
-        <entry><screen></screen></entry>
-        <entry>Substring to be matched against the subject of the certificate presented by the authentication server. When unset, no verification of the authentication server certificate's subject is performed.</entry>
-      </row>
-      <row>
-        <entry><screen>altsubject-matches</screen></entry>
-        <entry><screen>array of string</screen></entry>
-        <entry><screen>[]</screen></entry>
-        <entry>List of strings to be matched against the altSubjectName of the certificate presented by the authentication server. If the list is empty, no verification of the server certificate's altSubjectName is performed.</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-subject-match</screen></entry>
-        <entry><screen>string</screen></entry>
-        <entry><screen></screen></entry>
-        <entry>Substring to be matched against the subject of the certificate presented by the authentication server during the inner 'phase2' authentication. When unset, no verification of the authentication server certificate's subject is performed.</entry>
-      </row>
-      <row>
-        <entry><screen>phase2-altsubject-matches</screen></entry>
-        <entry><screen>array of string</screen></entry>
-        <entry><screen>[]</screen></entry>
-        <entry>List of strings to be matched against List of strings to be matched against the altSubjectName of the certificate presented by the authentication server during the inner 'phase 2' authentication. If the list is empty, no verification of the server certificate's altSubjectName is performed.</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-auth' 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>password-raw</screen></entry>
-        <entry><screen>byte array</screen></entry>
-        <entry><screen>[]</screen></entry>
-        <entry>Password used for EAP authentication methods as a byte array</entry>
-      </row>
-      <row>
-        <entry><screen>password-raw-flags</screen></entry>
-        <entry><screen>uint32</screen></entry>
-        <entry><screen>0</screen></entry>
-        <entry>Flags indicating how to handle the 802.1x password byte array. (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-auth' or 'phase2-autheap' property is set to 'tls'.  Key data is specified using a 'scheme'; two are currently supported: blob and path. When using the blob scheme and private keys, this property should be set to the key's encrypted PEM encoded data. When using private keys with the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string 'file://' and ending with a terminating 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>adsl 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>adsl</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>username</screen></entry>
-        <entry><screen>string</screen></entry>
-        <entry><screen></screen></entry>
-        <entry>Username used to authenticate with the pppoa 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 pppoa 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 ADSL password. (see <xref linkend="secrets-flags"/> for flag values)</entry>
-      </row>
-      <row>
-        <entry><screen>protocol</screen></entry>
-        <entry><screen>string</screen></entry>
-        <entry><screen></screen></entry>
-        <entry>ADSL connection protocol.</entry>
-      </row>
-      <row>
-        <entry><screen>encapsulation</screen></entry>
-        <entry><screen>string</screen></entry>
-        <entry><screen></screen></entry>
-        <entry>Encapsulation of ADSL connection</entry>
-      </row>
-      <row>
-        <entry><screen>vpi</screen></entry>
-        <entry><screen>uint32</screen></entry>
-        <entry><screen>0</screen></entry>
-        <entry>VPI of ADSL connection</entry>
-      </row>
-      <row>
-        <entry><screen>vci</screen></entry>
-        <entry><screen>uint32</screen></entry>
-        <entry><screen>0</screen></entry>
-        <entry>VCI of ADSL connection</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>bond 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>bond</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>interface-name</screen></entry>
-        <entry><screen>string</screen></entry>
-        <entry><screen></screen></entry>
-        <entry>The name of the virtual in-kernel bonding network interface</entry>
-      </row>
-      <row>
-        <entry><screen>options</screen></entry>
-        <entry><screen>dict of (string::string)</screen></entry>
-        <entry><screen>[ ]</screen></entry>
-        <entry>Dictionary of key/value pairs of bonding options.  Both keys and values must be strings.  Option names must contain only alphanumeric characters (ie, [a-zA-Z0-9]).</entry>
-      </row>
-    </tbody>
-  </tgroup>
-</table>
-<table>
-  <title>bridge 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>bridge</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>interface-name</screen></entry>
-        <entry><screen>string</screen></entry>
-        <entry><screen></screen></entry>
-        <entry>The name of the virtual in-kernel bridging network interface</entry>
-      </row>
-      <row>
-        <entry><screen>stp</screen></entry>
-        <entry><screen>boolean</screen></entry>
-        <entry><screen>TRUE</screen></entry>
-        <entry>Controls whether Spanning Tree Protocol (STP) is enabled for this bridge.</entry>
-      </row>
-      <row>
-        <entry><screen>priority</screen></entry>
-        <entry><screen>uint32</screen></entry>
-        <entry><screen>128</screen></entry>
-        <entry>Sets the Spanning Tree Protocol (STP) priority for this bridge.  Lower values are 'better'; the lowest priority bridge will be elected the root bridge.</entry>
-      </row>
-      <row>
-        <entry><screen>forward-delay</screen></entry>
-        <entry><screen>uint32</screen></entry>
-        <entry><screen>15</screen></entry>
-        <entry>The Spanning Tree Protocol (STP) forwarding delay, in seconds.</entry>
-      </row>
-      <row>
-        <entry><screen>hello-time</screen></entry>
-        <entry><screen>uint32</screen></entry>
-        <entry><screen>2</screen></entry>
-        <entry>The Spanning Tree Protocol (STP) hello time, in seconds.</entry>
-      </row>
-      <row>
-        <entry><screen>max-age</screen></entry>
-        <entry><screen>uint32</screen></entry>
-        <entry><screen>20</screen></entry>
-        <entry>The Spanning Tree Protocol (STP) maximum message age, in seconds.</entry>
-      </row>
-      <row>
-        <entry><screen>ageing-time</screen></entry>
-        <entry><screen>uint32</screen></entry>
-        <entry><screen>300</screen></entry>
-        <entry>The ethernet MAC address aging time, in seconds.</entry>
-      </row>
-    </tbody>
-  </tgroup>
-</table>
-<table>
-  <title>bridge-port 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>bridge-port</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>priority</screen></entry>
-        <entry><screen>uint32</screen></entry>
-        <entry><screen>32</screen></entry>
-        <entry>The Spanning Tree Protocol (STP) priority of this bridge port</entry>
-      </row>
-      <row>
-        <entry><screen>path-cost</screen></entry>
-        <entry><screen>uint32</screen></entry>
-        <entry><screen>100</screen></entry>
-        <entry>The Spanning Tree Protocol (STP) port cost for destinations via this port.</entry>
-      </row>
-      <row>
-        <entry><screen>hairpin-mode</screen></entry>
-        <entry><screen>boolean</screen></entry>
-        <entry><screen>FALSE</screen></entry>
-        <entry>Enables or disabled 'hairpin mode' for the port, which allows frames to be sent back out through the port the frame was received on.</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>
-      <row>
-        <entry><screen>zone</screen></entry>
-        <entry><screen>string</screen></entry>
-        <entry><screen></screen></entry>
-        <entry>The trust level of a the connection.Free form case-insensitive string (for example "Home", "Work", "Public").  NULL or unspecified zone means the connection will be placed in the default zone as defined by the firewall.</entry>
-      </row>
-      <row>
-        <entry><screen>master</screen></entry>
-        <entry><screen>string</screen></entry>
-        <entry><screen></screen></entry>
-        <entry>Interface name of the master device or UUID of the master connection</entry>
-      </row>
-      <row>
-        <entry><screen>slave-type</screen></entry>
-        <entry><screen>string</screen></entry>
-        <entry><screen></screen></entry>
-        <entry>Setting name describing the type of slave this connection is (ie, 'bond') or NULL if this connection is not a slave.</entry>
-      </row>
-      <row>
-        <entry><screen>secondaries</screen></entry>
-        <entry><screen>array of string</screen></entry>
-        <entry><screen>[]</screen></entry>
-        <entry>List of connection UUIDs that should be activated when the base connection itself is activated.</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.  Many modems do not require PPP for connections to the mobile network and thus this property should be left blank, which allows NetworkManager to select the appropriate settings automatically.</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, 3: prefer 2G, 4: prefer 4G/LTE, 5: 4G/LTE only. 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>infiniband 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>infiniband</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>mac-address</screen></entry>
-        <entry><screen>byte array</screen></entry>
-        <entry><screen>[]</screen></entry>
-        <entry>If specified, this connection will only apply to the IPoIB 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>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 frames.</entry>
-      </row>
-      <row>
-        <entry><screen>transport-mode</screen></entry>
-        <entry><screen>string</screen></entry>
-        <entry><screen></screen></entry>
-        <entry>The IPoIB transport mode. Either 'datagram' or 'connected'.</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 upstream 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 customize 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>TRUE</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>dhcp-hostname</screen></entry>
-        <entry><screen>string</screen></entry>
-        <entry><screen></screen></entry>
-        <entry>The specified name will be sent to the DHCP server when acquiring a lease.</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>TRUE</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>
-      <row>
-        <entry><screen>ip6-privacy</screen></entry>
-        <entry><screen>int32</screen></entry>
-        <entry><screen>-1</screen></entry>
-        <entry>Configure IPv6 Privacy Extensions for SLAAC, described in RFC4941.  If enabled, it makes the kernel generate a temporary IPv6 address in addition to the public one generated from MAC address via modified EUI-64.  This enhances privacy, but could cause problems in some applications, on the other hand.  The permitted values are: 0: disabled, 1: enabled (prefer public address), 2: enabled (prefer temporary addresses).</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>vlan 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>vlan</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>interface-name</screen></entry>
-        <entry><screen>string</screen></entry>
-        <entry><screen></screen></entry>
-        <entry>If given, specifies the kernel name of the VLAN interface. If not given, a default name will be constructed from the interface described by the parent interface and the 'id' property, ex 'eth2.1'. The parent interface may be given by the 'parent' property or by a hardware address property, eg the 'wired' settings' 'mac-address' property.</entry>
-      </row>
-      <row>
-        <entry><screen>parent</screen></entry>
-        <entry><screen>string</screen></entry>
-        <entry><screen></screen></entry>
-        <entry>If given, specifies the parent interface name or parent connection UUID from which this VLAN interface should be created.  If this property is not specified, the connection must contain a hardware address in a hardware-specific setting, like the 'wired' settings' 'mac-address' property.</entry>
-      </row>
-      <row>
-        <entry><screen>id</screen></entry>
-        <entry><screen>uint32</screen></entry>
-        <entry><screen>0</screen></entry>
-        <entry>The VLAN indentifier the interface created by this connection should be assigned.</entry>
-      </row>
-      <row>
-        <entry><screen>flags</screen></entry>
-        <entry><screen>uint32</screen></entry>
-        <entry><screen>0</screen></entry>
-        <entry>One or more flags which control the behavior and features of the VLAN interface.  Flags include reordering of output packet headers (0x01), use of the GVRP protocol (0x02), and loose binding of the interface to its master device's operating state (0x04).</entry>
-      </row>
-      <row>
-        <entry><screen>ingress-priority-map</screen></entry>
-        <entry><screen>array of string</screen></entry>
-        <entry><screen>[]</screen></entry>
-        <entry>For incoming packets, a list of mappings from 802.1p priorities to Linux SKB priorities.  The mapping is given in the format 'from:to' where both 'from' and 'to' are unsigned integers, ie '7:3'.</entry>
-      </row>
-      <row>
-        <entry><screen>egress-priority-map</screen></entry>
-        <entry><screen>array of string</screen></entry>
-        <entry><screen>[]</screen></entry>
-        <entry>For outgoing packets, a list of mappings from Linux SKB priorities to 802.1p priorities.  The mapping is given in the format 'from:to' where both 'from' and 'to' are unsigned integers, ie '7:3'.</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>If the VPN connection requires a user name for authentication, that name should be provided here.  If the connection is available to more than one user, and the VPN requires each user to supply a different name, then leave this property empty.  If this property is empty, NetworkManager will automatically supply the username of the user which requested the VPN connection.</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>mac-address-blacklist</screen></entry>
-        <entry><screen>array of string</screen></entry>
-        <entry><screen>[]</screen></entry>
-        <entry>If specified, this connection will never apply to the ethernet device whose permanent MAC address matches an address in the list.  Each MAC address is in the standard hex-digits-and-colons notation (00:11:22:33:44:55).</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>array of string</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', 'adhoc' or 'ap'.  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>mac-address-blacklist</screen></entry>
-        <entry><screen>array of string</screen></entry>
-        <entry><screen>[]</screen></entry>
-        <entry>If specified, this connection will never apply to the WiFi device whose permanent MAC address matches an address in the list.  Each MAC address is in the standard hex-digits-and-colons notation (00:11:22:33:44:55).</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. NetworkManager internally tracks previously seen BSSIDs. The property is only meant for reading and reflects the BBSID list of NetworkManager. The changes you make to this property will not be preserved.</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>
-      <row>
-        <entry><screen>hidden</screen></entry>
-        <entry><screen>boolean</screen></entry>
-        <entry><screen>FALSE</screen></entry>
-        <entry>If TRUE, indicates this network is a non-broadcasting network that hides its SSID.  In this case various workarounds may take place, such as probe-scanning the SSID for more reliable network discovery.  However, these workarounds expose inherent insecurities with hidden SSID networks, and thus hidden SSID networks should be used with caution.</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
index 1ff031f6..c31bfc0b 100644
--- a/docs/api/spec.html
+++ b/docs/api/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.9.7.995</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.7.997</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.9.7.995</h2><div>Copyright (C) 2008 - 2011 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.7.997</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
@@ -827,7 +827,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
         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>
+      <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><dt><code>NM_802_11_DEVICE_CAP_AP = 0x40</code></dt><dd>The device supports Access Point mode.</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
diff --git a/docs/api/version.xml b/docs/api/version.xml
index fa572dcf..1517c785 100644
--- a/docs/api/version.xml
+++ b/docs/api/version.xml
@@ -1 +1 @@
-0.9.7.995
+0.9.7.997
diff --git a/docs/libnm-glib/Makefile.in b/docs/libnm-glib/Makefile.in
index d41fbdc9..af78a7d1 100644
--- a/docs/libnm-glib/Makefile.in
+++ b/docs/libnm-glib/Makefile.in
@@ -67,12 +67,11 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
 	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \
 	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \
 	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
-	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/vapigen.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -191,12 +190,6 @@ LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBM = @LIBM@
-LIBNL1_CFLAGS = @LIBNL1_CFLAGS@
-LIBNL1_LIBS = @LIBNL1_LIBS@
-LIBNL2_CFLAGS = @LIBNL2_CFLAGS@
-LIBNL2_LIBS = @LIBNL2_LIBS@
-LIBNL3_CFLAGS = @LIBNL3_CFLAGS@
-LIBNL3_LIBS = @LIBNL3_LIBS@
 LIBNL_CFLAGS = @LIBNL_CFLAGS@
 LIBNL_LIBS = @LIBNL_LIBS@
 LIBOBJS = @LIBOBJS@
diff --git a/docs/libnm-glib/html/NMClient.html b/docs/libnm-glib/html/NMClient.html
index cb771ba8..1cc0d3d7 100644
--- a/docs/libnm-glib/html/NMClient.html
+++ b/docs/libnm-glib/html/NMClient.html
@@ -90,6 +90,10 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.
 <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>);
 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 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-logging" title="nm_client_get_logging ()">nm_client_get_logging</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">char</span> **level</code></em>,
+                                                         <em class="parameter"><code><span class="type">char</span> **domains</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="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>);
 <a class="link" href="NMClient.html#NMClientPermissionResult" title="enum NMClientPermissionResult"><span class="returnvalue">NMClientPermissionResult</span></a> <a class="link" href="NMClient.html#nm-client-get-permission-result" title="nm_client_get_permission_result ()">nm_client_get_permission_result</a>
                                                         (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>,
@@ -105,6 +109,10 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMCli
                                                          <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="NMClient.html" title="NMClient"><span class="returnvalue">NMClient</span></a> *          <a class="link" href="NMClient.html#nm-client-new-finish" title="nm_client_new_finish ()">nm_client_new_finish</a>                (<em class="parameter"><code><a href="http://library.gnome.org/devel/gio/unstable/GAsyncResult.html"><span class="type">GAsyncResult</span></a> *result</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="NMClient.html#nm-client-set-logging" title="nm_client_set_logging ()">nm_client_set_logging</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> *level</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *domains</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#nm-client-sleep" title="nm_client_sleep ()">nm_client_sleep</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> sleep_</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>);
@@ -710,6 +718,48 @@ containing all the <a class="link" href="NMDevice.html" title="NMDevice"><span c
 </div>
 <hr>
 <div class="refsect2">
+<a name="nm-client-get-logging"></a><h3>nm_client_get_logging ()</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_logging               (<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">char</span> **level</code></em>,
+                                                         <em class="parameter"><code><span class="type">char</span> **domains</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>
+Gets NetworkManager current logging level and domains.
+</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>level</code></em> :</span></p></td>
+<td>return location for logging level string. <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>domains</code></em> :</span></p></td>
+<td>return location for log domains string. The string is
+a list of domains separated by ",". <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>error</code></em> :</span></p></td>
+<td>return location for a <a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a>, or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.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>
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> on success, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> otherwise</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<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>
@@ -948,6 +998,48 @@ Gets the result of an <a class="link" href="NMClient.html#nm-client-new-async" t
 </div>
 <hr>
 <div class="refsect2">
+<a name="nm-client-set-logging"></a><h3>nm_client_set_logging ()</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_set_logging               (<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> *level</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *domains</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>
+Sets NetworkManager logging level and/or domains.
+</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>level</code></em> :</span></p></td>
+<td>logging level to set (<a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> or an empty string for no change). <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>domains</code></em> :</span></p></td>
+<td>logging domains to set. The string should be a list of log
+domains separated by ",". (<a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> or an empty string for no change). <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>error</code></em> :</span></p></td>
+<td>return location for a <a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a>, or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.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>
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> on success, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> otherwise</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<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>
diff --git a/docs/libnm-glib/html/NMDeviceWifi.html b/docs/libnm-glib/html/NMDeviceWifi.html
index d4976feb..75e35bc6 100644
--- a/docs/libnm-glib/html/NMDeviceWifi.html
+++ b/docs/libnm-glib/html/NMDeviceWifi.html
@@ -48,6 +48,9 @@
 <pre class="synopsis">                    <a class="link" href="NMDeviceWifi.html#NMDeviceWifi-struct" title="NMDeviceWifi">NMDeviceWifi</a>;
                     <a class="link" href="NMDeviceWifi.html#NMDeviceWifiClass" title="NMDeviceWifiClass">NMDeviceWifiClass</a>;
 enum                <a class="link" href="NMDeviceWifi.html#NMDeviceWifiError" title="enum NMDeviceWifiError">NMDeviceWifiError</a>;
+<span class="returnvalue">void</span>                (<a class="link" href="NMDeviceWifi.html#NMDeviceWifiRequestScanFn" title="NMDeviceWifiRequestScanFn ()">*NMDeviceWifiRequestScanFn</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><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>);
 #define             <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>
 #define             <a class="link" href="NMDeviceWifi.html#NM-DEVICE-WIFI-BITRATE:CAPS" title="NM_DEVICE_WIFI_BITRATE">NM_DEVICE_WIFI_BITRATE</a>
 #define             <a class="link" href="NMDeviceWifi.html#NM-DEVICE-WIFI-CAPABILITIES:CAPS" title="NM_DEVICE_WIFI_CAPABILITIES">NM_DEVICE_WIFI_CAPABILITIES</a>
@@ -71,6 +74,9 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMDev
                                                         (<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/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>);
+<span class="returnvalue">void</span>                <a class="link" href="NMDeviceWifi.html#nm-device-wifi-request-scan-simple" title="nm_device_wifi_request_scan_simple ()">nm_device_wifi_request_scan_simple</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><a class="link" href="NMDeviceWifi.html#NMDeviceWifiRequestScanFn" title="NMDeviceWifiRequestScanFn ()"><span class="type">NMDeviceWifiRequestScanFn</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">
@@ -199,6 +205,15 @@ required by the connection
 </div>
 <hr>
 <div class="refsect2">
+<a name="NMDeviceWifiRequestScanFn"></a><h3>NMDeviceWifiRequestScanFn ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                (*NMDeviceWifiRequestScanFn)        (<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><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-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>
@@ -488,6 +503,38 @@ Creates a new <a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi"><spa
 </tbody>
 </table></div>
 </div>
+<hr>
+<div class="refsect2">
+<a name="nm-device-wifi-request-scan-simple"></a><h3>nm_device_wifi_request_scan_simple ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                nm_device_wifi_request_scan_simple  (<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><a class="link" href="NMDeviceWifi.html#NMDeviceWifiRequestScanFn" title="NMDeviceWifiRequestScanFn ()"><span class="type">NMDeviceWifiRequestScanFn</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 NM to scan for access points on the <a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi"><span class="type">NMDeviceWifi</span></a>. This function only
+instructs NM to perform scanning. Use <a class="link" href="NMDeviceWifi.html#nm-device-wifi-get-access-points" title="nm_device_wifi_get_access_points ()"><code class="function">nm_device_wifi_get_access_points()</code></a>
+to get available access points.
+</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="NMDeviceWifi.html" title="NMDeviceWifi"><span class="type">NMDeviceWifi</span></a>
+</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>
 </div>
 <div class="refsect1">
 <a name="NMDeviceWifi.property-details"></a><h2>Property Details</h2>
diff --git a/docs/libnm-glib/html/NMSecretAgent.html b/docs/libnm-glib/html/NMSecretAgent.html
index e18588c4..1e08bf50 100644
--- a/docs/libnm-glib/html/NMSecretAgent.html
+++ b/docs/libnm-glib/html/NMSecretAgent.html
@@ -356,7 +356,7 @@ To easily create the hash table to return the WiFi PSK, you could do
 something like this:
 </p>
 <div class="example">
-<a name="idp15748848"></a><p class="title"><b>Example 1. Creating a secrets hash</b></p>
+<a name="idp15030224"></a><p class="title"><b>Example 1. Creating a secrets hash</b></p>
 <div class="example-contents">
   <table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
     <tbody>
diff --git a/docs/libnm-glib/html/api-index-full.html b/docs/libnm-glib/html/api-index-full.html
index d344affc..812b7665 100644
--- a/docs/libnm-glib/html/api-index-full.html
+++ b/docs/libnm-glib/html/api-index-full.html
@@ -406,6 +406,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMClient.html#nm-client-get-logging" title="nm_client_get_logging ()">nm_client_get_logging</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>
@@ -450,6 +454,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMClient.html#nm-client-set-logging" title="nm_client_set_logging ()">nm_client_set_logging</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>
@@ -867,6 +875,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMDeviceWifi.html#NMDeviceWifiRequestScanFn" title="NMDeviceWifiRequestScanFn ()">NMDeviceWifiRequestScanFn</a>, user_function 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>
@@ -1463,6 +1475,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMDeviceWifi.html#nm-device-wifi-request-scan-simple" title="nm_device_wifi_request_scan_simple ()">nm_device_wifi_request_scan_simple</a>, function 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>
diff --git a/docs/libnm-glib/html/ch02.html b/docs/libnm-glib/html/ch02.html
index 2a334ea9..7a81d599 100644
--- a/docs/libnm-glib/html/ch02.html
+++ b/docs/libnm-glib/html/ch02.html
@@ -21,7 +21,7 @@
 </tr></table>
 <div class="chapter">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="idp66208"></a>libnm-glib API Reference</h2></div></div></div>
+<a name="idp189152"></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>
diff --git a/docs/libnm-glib/html/index.html b/docs/libnm-glib/html/index.html
index 339a581c..baaf92bf 100644
--- a/docs/libnm-glib/html/index.html
+++ b/docs/libnm-glib/html/index.html
@@ -15,14 +15,14 @@
 <div>
 <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">libnm-glib Reference Manual</p></th></tr></table></div>
 <div><p class="releaseinfo">
-      for libnm-glib 0.9.7.995
+      for libnm-glib 0.9.7.997
 
       The latest version of this documentation can be found on-line at
       <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 © 2012 The NetworkManager Authors</p></div>
 <div><div class="legalnotice">
-<a name="idp202848"></a><p>
+<a name="idp2576576"></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
diff --git a/docs/libnm-glib/html/index.sgml b/docs/libnm-glib/html/index.sgml
index 92276d7d..b7aee356 100644
--- a/docs/libnm-glib/html/index.sgml
+++ b/docs/libnm-glib/html/index.sgml
@@ -48,6 +48,7 @@
 <ANCHOR id="nm-client-get-device-by-iface" href="libnm-glib/NMClient.html#nm-client-get-device-by-iface">
 <ANCHOR id="nm-client-get-device-by-path" href="libnm-glib/NMClient.html#nm-client-get-device-by-path">
 <ANCHOR id="nm-client-get-devices" href="libnm-glib/NMClient.html#nm-client-get-devices">
+<ANCHOR id="nm-client-get-logging" href="libnm-glib/NMClient.html#nm-client-get-logging">
 <ANCHOR id="nm-client-get-manager-running" href="libnm-glib/NMClient.html#nm-client-get-manager-running">
 <ANCHOR id="nm-client-get-permission-result" href="libnm-glib/NMClient.html#nm-client-get-permission-result">
 <ANCHOR id="nm-client-get-state" href="libnm-glib/NMClient.html#nm-client-get-state">
@@ -57,6 +58,7 @@
 <ANCHOR id="nm-client-new" href="libnm-glib/NMClient.html#nm-client-new">
 <ANCHOR id="nm-client-new-async" href="libnm-glib/NMClient.html#nm-client-new-async">
 <ANCHOR id="nm-client-new-finish" href="libnm-glib/NMClient.html#nm-client-new-finish">
+<ANCHOR id="nm-client-set-logging" href="libnm-glib/NMClient.html#nm-client-set-logging">
 <ANCHOR id="nm-client-sleep" href="libnm-glib/NMClient.html#nm-client-sleep">
 <ANCHOR id="nm-client-wimax-get-enabled" href="libnm-glib/NMClient.html#nm-client-wimax-get-enabled">
 <ANCHOR id="nm-client-wimax-hardware-get-enabled" href="libnm-glib/NMClient.html#nm-client-wimax-hardware-get-enabled">
@@ -247,6 +249,7 @@
 <ANCHOR id="NM-DEVICE-WIFI-ERROR-MAC-MISMATCH:CAPS" href="libnm-glib/NMDeviceWifi.html#NM-DEVICE-WIFI-ERROR-MAC-MISMATCH:CAPS">
 <ANCHOR id="NM-DEVICE-WIFI-ERROR-MISSING-DEVICE-WPA-CAPS" href="libnm-glib/NMDeviceWifi.html#NM-DEVICE-WIFI-ERROR-MISSING-DEVICE-WPA-CAPS">
 <ANCHOR id="NM-DEVICE-WIFI-ERROR-MISSING-DEVICE-RSN-CAPS" href="libnm-glib/NMDeviceWifi.html#NM-DEVICE-WIFI-ERROR-MISSING-DEVICE-RSN-CAPS">
+<ANCHOR id="NMDeviceWifiRequestScanFn" href="libnm-glib/NMDeviceWifi.html#NMDeviceWifiRequestScanFn">
 <ANCHOR id="NM-DEVICE-WIFI-ACTIVE-ACCESS-POINT:CAPS" href="libnm-glib/NMDeviceWifi.html#NM-DEVICE-WIFI-ACTIVE-ACCESS-POINT:CAPS">
 <ANCHOR id="NM-DEVICE-WIFI-BITRATE:CAPS" href="libnm-glib/NMDeviceWifi.html#NM-DEVICE-WIFI-BITRATE:CAPS">
 <ANCHOR id="NM-DEVICE-WIFI-CAPABILITIES:CAPS" href="libnm-glib/NMDeviceWifi.html#NM-DEVICE-WIFI-CAPABILITIES:CAPS">
@@ -264,6 +267,7 @@
 <ANCHOR id="nm-device-wifi-get-mode" href="libnm-glib/NMDeviceWifi.html#nm-device-wifi-get-mode">
 <ANCHOR id="nm-device-wifi-get-permanent-hw-address" href="libnm-glib/NMDeviceWifi.html#nm-device-wifi-get-permanent-hw-address">
 <ANCHOR id="nm-device-wifi-new" href="libnm-glib/NMDeviceWifi.html#nm-device-wifi-new">
+<ANCHOR id="nm-device-wifi-request-scan-simple" href="libnm-glib/NMDeviceWifi.html#nm-device-wifi-request-scan-simple">
 <ANCHOR id="NMDeviceWifi.property-details" href="libnm-glib/NMDeviceWifi.html#NMDeviceWifi.property-details">
 <ANCHOR id="NMDeviceWifi--active-access-point" href="libnm-glib/NMDeviceWifi.html#NMDeviceWifi--active-access-point">
 <ANCHOR id="NMDeviceWifi--bitrate" href="libnm-glib/NMDeviceWifi.html#NMDeviceWifi--bitrate">
diff --git a/docs/libnm-glib/html/libnm-glib.devhelp2 b/docs/libnm-glib/html/libnm-glib.devhelp2
index 3cf09621..2358599b 100644
--- a/docs/libnm-glib/html/libnm-glib.devhelp2
+++ b/docs/libnm-glib/html/libnm-glib.devhelp2
@@ -63,6 +63,7 @@
     <keyword type="function" name="nm_client_get_device_by_iface ()" link="NMClient.html#nm-client-get-device-by-iface"/>
     <keyword type="function" name="nm_client_get_device_by_path ()" link="NMClient.html#nm-client-get-device-by-path"/>
     <keyword type="function" name="nm_client_get_devices ()" link="NMClient.html#nm-client-get-devices"/>
+    <keyword type="function" name="nm_client_get_logging ()" link="NMClient.html#nm-client-get-logging"/>
     <keyword type="function" name="nm_client_get_manager_running ()" link="NMClient.html#nm-client-get-manager-running"/>
     <keyword type="function" name="nm_client_get_permission_result ()" link="NMClient.html#nm-client-get-permission-result"/>
     <keyword type="function" name="nm_client_get_state ()" link="NMClient.html#nm-client-get-state"/>
@@ -72,6 +73,7 @@
     <keyword type="function" name="nm_client_new ()" link="NMClient.html#nm-client-new"/>
     <keyword type="function" name="nm_client_new_async ()" link="NMClient.html#nm-client-new-async"/>
     <keyword type="function" name="nm_client_new_finish ()" link="NMClient.html#nm-client-new-finish"/>
+    <keyword type="function" name="nm_client_set_logging ()" link="NMClient.html#nm-client-set-logging"/>
     <keyword type="function" name="nm_client_sleep ()" link="NMClient.html#nm-client-sleep"/>
     <keyword type="function" name="nm_client_wimax_get_enabled ()" link="NMClient.html#nm-client-wimax-get-enabled"/>
     <keyword type="function" name="nm_client_wimax_hardware_get_enabled ()" link="NMClient.html#nm-client-wimax-hardware-get-enabled"/>
@@ -214,6 +216,7 @@
     <keyword type="struct" name="NMDeviceWifi" link="NMDeviceWifi.html#NMDeviceWifi-struct"/>
     <keyword type="struct" name="NMDeviceWifiClass" link="NMDeviceWifi.html#NMDeviceWifiClass"/>
     <keyword type="enum" name="enum NMDeviceWifiError" link="NMDeviceWifi.html#NMDeviceWifiError"/>
+    <keyword type="function" name="NMDeviceWifiRequestScanFn ()" link="NMDeviceWifi.html#NMDeviceWifiRequestScanFn"/>
     <keyword type="macro" name="NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT" link="NMDeviceWifi.html#NM-DEVICE-WIFI-ACTIVE-ACCESS-POINT:CAPS"/>
     <keyword type="macro" name="NM_DEVICE_WIFI_BITRATE" link="NMDeviceWifi.html#NM-DEVICE-WIFI-BITRATE:CAPS"/>
     <keyword type="macro" name="NM_DEVICE_WIFI_CAPABILITIES" link="NMDeviceWifi.html#NM-DEVICE-WIFI-CAPABILITIES:CAPS"/>
@@ -231,6 +234,7 @@
     <keyword type="function" name="nm_device_wifi_get_mode ()" link="NMDeviceWifi.html#nm-device-wifi-get-mode"/>
     <keyword type="function" name="nm_device_wifi_get_permanent_hw_address ()" link="NMDeviceWifi.html#nm-device-wifi-get-permanent-hw-address"/>
     <keyword type="function" name="nm_device_wifi_new ()" link="NMDeviceWifi.html#nm-device-wifi-new"/>
+    <keyword type="function" name="nm_device_wifi_request_scan_simple ()" link="NMDeviceWifi.html#nm-device-wifi-request-scan-simple"/>
     <keyword type="property" name="The &quot;active-access-point&quot; property" link="NMDeviceWifi.html#NMDeviceWifi--active-access-point"/>
     <keyword type="property" name="The &quot;bitrate&quot; property" link="NMDeviceWifi.html#NMDeviceWifi--bitrate"/>
     <keyword type="property" name="The &quot;hw-address&quot; property" link="NMDeviceWifi.html#NMDeviceWifi--hw-address"/>
diff --git a/docs/libnm-glib/libnm-glib-sections.txt b/docs/libnm-glib/libnm-glib-sections.txt
index 84f897c4..edd05f0e 100644
--- a/docs/libnm-glib/libnm-glib-sections.txt
+++ b/docs/libnm-glib/libnm-glib-sections.txt
@@ -100,6 +100,7 @@ nm_client_get_active_connections
 nm_client_get_device_by_iface
 nm_client_get_device_by_path
 nm_client_get_devices
+nm_client_get_logging
 nm_client_get_manager_running
 nm_client_get_permission_result
 nm_client_get_state
@@ -109,6 +110,7 @@ nm_client_networking_set_enabled
 nm_client_new
 nm_client_new_async
 nm_client_new_finish
+nm_client_set_logging
 nm_client_sleep
 nm_client_wimax_get_enabled
 nm_client_wimax_hardware_get_enabled
@@ -415,6 +417,7 @@ nm_device_vlan_get_type
 NMDeviceWifi
 NMDeviceWifiClass
 NMDeviceWifiError
+NMDeviceWifiRequestScanFn
 NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT
 NM_DEVICE_WIFI_BITRATE
 NM_DEVICE_WIFI_CAPABILITIES
@@ -432,6 +435,7 @@ nm_device_wifi_get_hw_address
 nm_device_wifi_get_mode
 nm_device_wifi_get_permanent_hw_address
 nm_device_wifi_new
+nm_device_wifi_request_scan_simple
 <SUBSECTION Standard>
 NM_DEVICE_WIFI
 NM_DEVICE_WIFI_CLASS
diff --git a/docs/libnm-glib/tmpl/libnm_glib.sgml b/docs/libnm-glib/tmpl/libnm_glib.sgml
index 325e10cb..ed0710b9 100644
--- a/docs/libnm-glib/tmpl/libnm_glib.sgml
+++ b/docs/libnm-glib/tmpl/libnm_glib.sgml
@@ -9,11 +9,13 @@ libnm_glib
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/docs/libnm-glib/tmpl/nm-access-point.sgml b/docs/libnm-glib/tmpl/nm-access-point.sgml
index f869ab7c..41cade52 100644
--- a/docs/libnm-glib/tmpl/nm-access-point.sgml
+++ b/docs/libnm-glib/tmpl/nm-access-point.sgml
@@ -9,11 +9,13 @@ NMAccessPoint
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/docs/libnm-glib/tmpl/nm-active-connection.sgml b/docs/libnm-glib/tmpl/nm-active-connection.sgml
index 5bbb6b3b..40528ae9 100644
--- a/docs/libnm-glib/tmpl/nm-active-connection.sgml
+++ b/docs/libnm-glib/tmpl/nm-active-connection.sgml
@@ -9,11 +9,13 @@ NMActiveConnection
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/docs/libnm-glib/tmpl/nm-client.sgml b/docs/libnm-glib/tmpl/nm-client.sgml
index 773592de..c3443c40 100644
--- a/docs/libnm-glib/tmpl/nm-client.sgml
+++ b/docs/libnm-glib/tmpl/nm-client.sgml
@@ -9,11 +9,13 @@ NMClient
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
@@ -324,6 +326,18 @@ NMClient
 @Returns: 
 
 
+<!-- ##### FUNCTION nm_client_get_logging ##### -->
+<para>
+
+</para>
+
+@client: 
+@level: 
+@domains: 
+@error: 
+@Returns: 
+
+
 <!-- ##### FUNCTION nm_client_get_manager_running ##### -->
 <para>
 
@@ -408,6 +422,18 @@ NMClient
 @Returns: 
 
 
+<!-- ##### FUNCTION nm_client_set_logging ##### -->
+<para>
+
+</para>
+
+@client: 
+@level: 
+@domains: 
+@error: 
+@Returns: 
+
+
 <!-- ##### FUNCTION nm_client_sleep ##### -->
 <para>
 
diff --git a/docs/libnm-glib/tmpl/nm-device-adsl.sgml b/docs/libnm-glib/tmpl/nm-device-adsl.sgml
index 286483f0..286f2f41 100644
--- a/docs/libnm-glib/tmpl/nm-device-adsl.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-adsl.sgml
@@ -9,11 +9,13 @@ NMDeviceAdsl
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device-bond.sgml b/docs/libnm-glib/tmpl/nm-device-bond.sgml
index 16da4778..29c46c9a 100644
--- a/docs/libnm-glib/tmpl/nm-device-bond.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-bond.sgml
@@ -9,11 +9,13 @@ NMDeviceBond
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device-bridge.sgml b/docs/libnm-glib/tmpl/nm-device-bridge.sgml
index e82e2bcb..9d20554e 100644
--- a/docs/libnm-glib/tmpl/nm-device-bridge.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-bridge.sgml
@@ -9,11 +9,13 @@ NMDeviceBridge
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device-bt.sgml b/docs/libnm-glib/tmpl/nm-device-bt.sgml
index 26582065..e0b17425 100644
--- a/docs/libnm-glib/tmpl/nm-device-bt.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-bt.sgml
@@ -9,11 +9,13 @@ NMDeviceBt
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device-ethernet.sgml b/docs/libnm-glib/tmpl/nm-device-ethernet.sgml
index ea04914e..3f5735b5 100644
--- a/docs/libnm-glib/tmpl/nm-device-ethernet.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-ethernet.sgml
@@ -9,11 +9,13 @@ NMDeviceEthernet
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device-infiniband.sgml b/docs/libnm-glib/tmpl/nm-device-infiniband.sgml
index e94c6bae..94ad7b90 100644
--- a/docs/libnm-glib/tmpl/nm-device-infiniband.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-infiniband.sgml
@@ -9,11 +9,13 @@ NMDeviceInfiniband
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device-modem.sgml b/docs/libnm-glib/tmpl/nm-device-modem.sgml
index 259db939..e41c07ec 100644
--- a/docs/libnm-glib/tmpl/nm-device-modem.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-modem.sgml
@@ -9,11 +9,13 @@ NMDeviceModem
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device-olpc-mesh.sgml b/docs/libnm-glib/tmpl/nm-device-olpc-mesh.sgml
index a604a43a..20c63328 100644
--- a/docs/libnm-glib/tmpl/nm-device-olpc-mesh.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-olpc-mesh.sgml
@@ -9,11 +9,13 @@ NMDeviceOlpcMesh
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device-vlan.sgml b/docs/libnm-glib/tmpl/nm-device-vlan.sgml
index 5a58b7b2..30d839e0 100644
--- a/docs/libnm-glib/tmpl/nm-device-vlan.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-vlan.sgml
@@ -9,11 +9,13 @@ NMDeviceVlan
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device-wifi.sgml b/docs/libnm-glib/tmpl/nm-device-wifi.sgml
index 89ead82a..3b5def39 100644
--- a/docs/libnm-glib/tmpl/nm-device-wifi.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-wifi.sgml
@@ -9,11 +9,13 @@ NMDeviceWifi
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
@@ -100,6 +102,16 @@ NMDeviceWifi
 @NM_DEVICE_WIFI_ERROR_MISSING_DEVICE_WPA_CAPS: 
 @NM_DEVICE_WIFI_ERROR_MISSING_DEVICE_RSN_CAPS: 
 
+<!-- ##### USER_FUNCTION NMDeviceWifiRequestScanFn ##### -->
+<para>
+
+</para>
+
+@device: 
+@error: 
+@user_data: 
+
+
 <!-- ##### MACRO NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT ##### -->
 <para>
 
@@ -241,3 +253,13 @@ NMDeviceWifi
 @Returns: 
 
 
+<!-- ##### FUNCTION nm_device_wifi_request_scan_simple ##### -->
+<para>
+
+</para>
+
+@device: 
+@callback: 
+@user_data: 
+
+
diff --git a/docs/libnm-glib/tmpl/nm-device-wimax.sgml b/docs/libnm-glib/tmpl/nm-device-wimax.sgml
index 8d23e4da..d23d0231 100644
--- a/docs/libnm-glib/tmpl/nm-device-wimax.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-wimax.sgml
@@ -9,11 +9,13 @@ NMDeviceWimax
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device.sgml b/docs/libnm-glib/tmpl/nm-device.sgml
index 68df46f9..90be4054 100644
--- a/docs/libnm-glib/tmpl/nm-device.sgml
+++ b/docs/libnm-glib/tmpl/nm-device.sgml
@@ -9,11 +9,13 @@ NMDevice
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/docs/libnm-glib/tmpl/nm-dhcp4-config.sgml b/docs/libnm-glib/tmpl/nm-dhcp4-config.sgml
index 752a8b2c..cef5854d 100644
--- a/docs/libnm-glib/tmpl/nm-dhcp4-config.sgml
+++ b/docs/libnm-glib/tmpl/nm-dhcp4-config.sgml
@@ -9,11 +9,13 @@ NMDHCP4Config
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/docs/libnm-glib/tmpl/nm-dhcp6-config.sgml b/docs/libnm-glib/tmpl/nm-dhcp6-config.sgml
index d01ac192..2c113261 100644
--- a/docs/libnm-glib/tmpl/nm-dhcp6-config.sgml
+++ b/docs/libnm-glib/tmpl/nm-dhcp6-config.sgml
@@ -9,11 +9,13 @@ NMDHCP6Config
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/docs/libnm-glib/tmpl/nm-glib-enum-types.sgml b/docs/libnm-glib/tmpl/nm-glib-enum-types.sgml
index a60db68e..b81a00af 100644
--- a/docs/libnm-glib/tmpl/nm-glib-enum-types.sgml
+++ b/docs/libnm-glib/tmpl/nm-glib-enum-types.sgml
@@ -9,11 +9,13 @@ nm-glib-enum-types
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/docs/libnm-glib/tmpl/nm-glib-marshal.sgml b/docs/libnm-glib/tmpl/nm-glib-marshal.sgml
index dbe72434..2f3b0280 100644
--- a/docs/libnm-glib/tmpl/nm-glib-marshal.sgml
+++ b/docs/libnm-glib/tmpl/nm-glib-marshal.sgml
@@ -9,11 +9,13 @@ nm-glib-marshal
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/docs/libnm-glib/tmpl/nm-ip4-config.sgml b/docs/libnm-glib/tmpl/nm-ip4-config.sgml
index 0e33ca0b..e015c2af 100644
--- a/docs/libnm-glib/tmpl/nm-ip4-config.sgml
+++ b/docs/libnm-glib/tmpl/nm-ip4-config.sgml
@@ -9,11 +9,13 @@ NMIP4Config
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/docs/libnm-glib/tmpl/nm-ip6-config.sgml b/docs/libnm-glib/tmpl/nm-ip6-config.sgml
index f2e66b71..f098e022 100644
--- a/docs/libnm-glib/tmpl/nm-ip6-config.sgml
+++ b/docs/libnm-glib/tmpl/nm-ip6-config.sgml
@@ -9,11 +9,13 @@ NMIP6Config
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/docs/libnm-glib/tmpl/nm-object.sgml b/docs/libnm-glib/tmpl/nm-object.sgml
index aaf91b49..93b2441e 100644
--- a/docs/libnm-glib/tmpl/nm-object.sgml
+++ b/docs/libnm-glib/tmpl/nm-object.sgml
@@ -9,11 +9,13 @@ NMObject
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/docs/libnm-glib/tmpl/nm-remote-connection.sgml b/docs/libnm-glib/tmpl/nm-remote-connection.sgml
index 594371fd..628000c8 100644
--- a/docs/libnm-glib/tmpl/nm-remote-connection.sgml
+++ b/docs/libnm-glib/tmpl/nm-remote-connection.sgml
@@ -9,11 +9,13 @@ NMRemoteConnection
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/docs/libnm-glib/tmpl/nm-remote-settings.sgml b/docs/libnm-glib/tmpl/nm-remote-settings.sgml
index 3f24a06c..44b4d4fb 100644
--- a/docs/libnm-glib/tmpl/nm-remote-settings.sgml
+++ b/docs/libnm-glib/tmpl/nm-remote-settings.sgml
@@ -9,11 +9,13 @@ NMRemoteSettings
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/docs/libnm-glib/tmpl/nm-secret-agent.sgml b/docs/libnm-glib/tmpl/nm-secret-agent.sgml
index 428b7afd..9d23cbc5 100644
--- a/docs/libnm-glib/tmpl/nm-secret-agent.sgml
+++ b/docs/libnm-glib/tmpl/nm-secret-agent.sgml
@@ -9,11 +9,13 @@ NMSecretAgent
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/docs/libnm-glib/tmpl/nm-types.sgml b/docs/libnm-glib/tmpl/nm-types.sgml
index 1469192e..18babb0f 100644
--- a/docs/libnm-glib/tmpl/nm-types.sgml
+++ b/docs/libnm-glib/tmpl/nm-types.sgml
@@ -9,11 +9,13 @@ nm-types
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/docs/libnm-glib/tmpl/nm-vpn-connection.sgml b/docs/libnm-glib/tmpl/nm-vpn-connection.sgml
index fe3dcbe0..3086909a 100644
--- a/docs/libnm-glib/tmpl/nm-vpn-connection.sgml
+++ b/docs/libnm-glib/tmpl/nm-vpn-connection.sgml
@@ -9,11 +9,13 @@ NMVPNConnection
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/docs/libnm-glib/tmpl/nm-vpn-enum-types.sgml b/docs/libnm-glib/tmpl/nm-vpn-enum-types.sgml
index 83b976cd..0f800cac 100644
--- a/docs/libnm-glib/tmpl/nm-vpn-enum-types.sgml
+++ b/docs/libnm-glib/tmpl/nm-vpn-enum-types.sgml
@@ -9,11 +9,13 @@ nm-vpn-enum-types
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/docs/libnm-glib/tmpl/nm-vpn-plugin-ui-interface.sgml b/docs/libnm-glib/tmpl/nm-vpn-plugin-ui-interface.sgml
index faa7a8cb..f4c724a8 100644
--- a/docs/libnm-glib/tmpl/nm-vpn-plugin-ui-interface.sgml
+++ b/docs/libnm-glib/tmpl/nm-vpn-plugin-ui-interface.sgml
@@ -9,11 +9,13 @@ NMVpnPluginUiWidget
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/docs/libnm-glib/tmpl/nm-vpn-plugin-utils.sgml b/docs/libnm-glib/tmpl/nm-vpn-plugin-utils.sgml
index a35e6a9a..ed0ab40b 100644
--- a/docs/libnm-glib/tmpl/nm-vpn-plugin-utils.sgml
+++ b/docs/libnm-glib/tmpl/nm-vpn-plugin-utils.sgml
@@ -9,11 +9,13 @@ nm-vpn-plugin-utils
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/docs/libnm-glib/tmpl/nm-vpn-plugin.sgml b/docs/libnm-glib/tmpl/nm-vpn-plugin.sgml
index c04eb296..7ece0f79 100644
--- a/docs/libnm-glib/tmpl/nm-vpn-plugin.sgml
+++ b/docs/libnm-glib/tmpl/nm-vpn-plugin.sgml
@@ -9,11 +9,13 @@ NMVPNPlugin
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/docs/libnm-glib/tmpl/nm-wimax-nsp.sgml b/docs/libnm-glib/tmpl/nm-wimax-nsp.sgml
index 4dd298b7..f5dca7a3 100644
--- a/docs/libnm-glib/tmpl/nm-wimax-nsp.sgml
+++ b/docs/libnm-glib/tmpl/nm-wimax-nsp.sgml
@@ -9,11 +9,13 @@ NMWimaxNsp
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/docs/libnm-glib/version.xml b/docs/libnm-glib/version.xml
index fa572dcf..1517c785 100644
--- a/docs/libnm-glib/version.xml
+++ b/docs/libnm-glib/version.xml
@@ -1 +1 @@
-0.9.7.995
+0.9.7.997
diff --git a/docs/libnm-util/Makefile.in b/docs/libnm-util/Makefile.in
index 59d4179b..adddb718 100644
--- a/docs/libnm-util/Makefile.in
+++ b/docs/libnm-util/Makefile.in
@@ -67,12 +67,11 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
 	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \
 	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \
 	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
-	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/vapigen.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -191,12 +190,6 @@ LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBM = @LIBM@
-LIBNL1_CFLAGS = @LIBNL1_CFLAGS@
-LIBNL1_LIBS = @LIBNL1_LIBS@
-LIBNL2_CFLAGS = @LIBNL2_CFLAGS@
-LIBNL2_LIBS = @LIBNL2_LIBS@
-LIBNL3_CFLAGS = @LIBNL3_CFLAGS@
-LIBNL3_LIBS = @LIBNL3_LIBS@
 LIBNL_CFLAGS = @LIBNL_CFLAGS@
 LIBNL_LIBS = @LIBNL_LIBS@
 LIBOBJS = @LIBOBJS@
diff --git a/docs/libnm-util/html/api-index-full.html b/docs/libnm-util/html/api-index-full.html
index 807aea99..b3f8aa63 100644
--- a/docs/libnm-util/html/api-index-full.html
+++ b/docs/libnm-util/html/api-index-full.html
@@ -4198,6 +4198,10 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="libnm-util-nm-utils.html#nm-utils-wep-key-valid" title="nm_utils_wep_key_valid ()">nm_utils_wep_key_valid</a>, function in <a class="link" href="libnm-util-nm-utils.html" title="nm-utils">nm-utils</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="libnm-util-nm-utils.html#nm-utils-wifi-channel-to-freq" title="nm_utils_wifi_channel_to_freq ()">nm_utils_wifi_channel_to_freq</a>, function in <a class="link" href="libnm-util-nm-utils.html" title="nm-utils">nm-utils</a>
 </dt>
 <dd></dd>
@@ -4213,6 +4217,10 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 <a class="link" href="libnm-util-nm-utils.html#nm-utils-wifi-is-channel-valid" title="nm_utils_wifi_is_channel_valid ()">nm_utils_wifi_is_channel_valid</a>, function in <a class="link" href="libnm-util-nm-utils.html" title="nm-utils">nm-utils</a>
 </dt>
 <dd></dd>
+<dt>
+<a class="link" href="libnm-util-nm-utils.html#nm-utils-wpa-psk-valid" title="nm_utils_wpa_psk_valid ()">nm_utils_wpa_psk_valid</a>, function in <a class="link" href="libnm-util-nm-utils.html" title="nm-utils">nm-utils</a>
+</dt>
+<dd></dd>
 <a name="idxV"></a><h3 class="title">V</h3>
 <dt>
 <a class="link" href="NMSettingVlan.html#NMVlanFlags-enum" title="enum NMVlanFlags">NMVlanFlags</a>, enum in <a class="link" href="NMSettingVlan.html" title="NMSettingVlan">NMSettingVlan</a>
diff --git a/docs/libnm-util/html/ch01.html b/docs/libnm-util/html/ch01.html
index cba034e1..5d0f3520 100644
--- a/docs/libnm-util/html/ch01.html
+++ b/docs/libnm-util/html/ch01.html
@@ -21,7 +21,7 @@
 </tr></table>
 <div class="chapter">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="idp3785600"></a>libnm-util API Reference</h2></div></div></div>
+<a name="idp4128192"></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>
diff --git a/docs/libnm-util/html/index.html b/docs/libnm-util/html/index.html
index 1da1ad01..9c0b5194 100644
--- a/docs/libnm-util/html/index.html
+++ b/docs/libnm-util/html/index.html
@@ -15,14 +15,14 @@
 <div>
 <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">libnm-util Reference Manual</p></th></tr></table></div>
 <div><p class="releaseinfo">
-      for libnm-util 0.9.7.995
+      for libnm-util 0.9.7.997
 
       The latest version of this documentation can be found on-line at
       <a class="ulink" href="http://projects.gnome.org/NetworkManager/developers/libnm-util/09/" target="_top">http://projects.gnome.org/NetworkManager/developers/libnm-util/09/</a>.
     </p></div>
 <div><p class="copyright">Copyright © 2012 The NetworkManager Authors</p></div>
 <div><div class="legalnotice">
-<a name="idp3543120"></a><p>
+<a name="idp3523760"></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
diff --git a/docs/libnm-util/html/index.sgml b/docs/libnm-util/html/index.sgml
index 330e08a9..604f2d9b 100644
--- a/docs/libnm-util/html/index.sgml
+++ b/docs/libnm-util/html/index.sgml
@@ -1416,10 +1416,12 @@
 <ANCHOR id="nm-utils-ssid-to-utf8" href="libnm-util/libnm-util-nm-utils.html#nm-utils-ssid-to-utf8">
 <ANCHOR id="nm-utils-uuid-generate" href="libnm-util/libnm-util-nm-utils.html#nm-utils-uuid-generate">
 <ANCHOR id="nm-utils-uuid-generate-from-string" href="libnm-util/libnm-util-nm-utils.html#nm-utils-uuid-generate-from-string">
+<ANCHOR id="nm-utils-wep-key-valid" href="libnm-util/libnm-util-nm-utils.html#nm-utils-wep-key-valid">
 <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-freq-to-channel" href="libnm-util/libnm-util-nm-utils.html#nm-utils-wifi-freq-to-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="nm-utils-wpa-psk-valid" href="libnm-util/libnm-util-nm-utils.html#nm-utils-wpa-psk-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-inout" href="libnm-util/annotation-glossary.html#annotation-glossterm-inout">
diff --git a/docs/libnm-util/html/libnm-util-nm-utils.html b/docs/libnm-util/html/libnm-util-nm-utils.html
index eaa3def1..a70bc744 100644
--- a/docs/libnm-util/html/libnm-util-nm-utils.html
+++ b/docs/libnm-util/html/libnm-util-nm-utils.html
@@ -102,6 +102,8 @@ const <span class="returnvalue">char</span> *        <a class="link" href="libnm
 <span class="returnvalue">char</span> *              <a class="link" href="libnm-util-nm-utils.html#nm-utils-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>);
 <span class="returnvalue">char</span> *              <a class="link" href="libnm-util-nm-utils.html#nm-utils-uuid-generate" title="nm_utils_uuid_generate ()">nm_utils_uuid_generate</a>              (<em class="parameter"><code><span class="type">void</span></code></em>);
 <span class="returnvalue">char</span> *              <a class="link" href="libnm-util-nm-utils.html#nm-utils-uuid-generate-from-string" title="nm_utils_uuid_generate_from_string ()">nm_utils_uuid_generate_from_string</a>  (<em class="parameter"><code>const <span class="type">char</span> *s</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-wep-key-valid" title="nm_utils_wep_key_valid ()">nm_utils_wep_key_valid</a>              (<em class="parameter"><code>const <span class="type">char</span> *key</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html#NMWepKeyType"><span class="type">NMWepKeyType</span></a> wep_type</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-util-nm-utils.html#nm-utils-wifi-channel-to-freq" title="nm_utils_wifi_channel_to_freq ()">nm_utils_wifi_channel_to_freq</a>       (<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>);
 <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-util-nm-utils.html#nm-utils-wifi-find-next-channel" title="nm_utils_wifi_find_next_channel ()">nm_utils_wifi_find_next_channel</a>     (<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>,
@@ -110,6 +112,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#guint32"><span class="returnvalue">guint32</span></a>             <a class="link" href="libnm-util-nm-utils.html#nm-utils-wifi-freq-to-channel" title="nm_utils_wifi_freq_to_channel ()">nm_utils_wifi_freq_to_channel</a>       (<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>);
 <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-wifi-is-channel-valid" title="nm_utils_wifi_is_channel_valid ()">nm_utils_wifi_is_channel_valid</a>      (<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>);
+<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-wpa-psk-valid" title="nm_utils_wpa_psk_valid ()">nm_utils_wpa_psk_valid</a>              (<em class="parameter"><code>const <span class="type">char</span> *psk</code></em>);
 </pre>
 </div>
 <div class="refsect1">
@@ -1154,6 +1157,33 @@ object's <a class="link" href="NMSettingConnection.html#NMSettingConnection--id"
 </div>
 <hr>
 <div class="refsect2">
+<a name="nm-utils-wep-key-valid"></a><h3>nm_utils_wep_key_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_wep_key_valid              (<em class="parameter"><code>const <span class="type">char</span> *key</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html#NMWepKeyType"><span class="type">NMWepKeyType</span></a> wep_type</code></em>);</pre>
+<p>
+Checks if <em class="parameter"><code>key</code></em> is a valid WEP key
+</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>a string that might be a WEP key</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>wep_type</code></em> :</span></p></td>
+<td>the <a class="link" href="NMSettingWirelessSecurity.html#NMWepKeyType"><span class="type">NMWepKeyType</span></a> type of the WEP key</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if <em class="parameter"><code>key</code></em> is a WEP key, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if not</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
 <a name="nm-utils-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>
@@ -1258,6 +1288,28 @@ Utility function to verify WiFi channel validity.
 </tbody>
 </table></div>
 </div>
+<hr>
+<div class="refsect2">
+<a name="nm-utils-wpa-psk-valid"></a><h3>nm_utils_wpa_psk_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_wpa_psk_valid              (<em class="parameter"><code>const <span class="type">char</span> *psk</code></em>);</pre>
+<p>
+Checks if <em class="parameter"><code>psk</code></em> is a valid WPA PSK
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>psk</code></em> :</span></p></td>
+<td>a string that might be a WPA PSK</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if <em class="parameter"><code>psk</code></em> is a WPA PSK, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if not</td>
+</tr>
+</tbody>
+</table></div>
+</div>
 </div>
 </div>
 <div class="footer">
diff --git a/docs/libnm-util/html/libnm-util.devhelp2 b/docs/libnm-util/html/libnm-util.devhelp2
index 468cd5ea..ead35c07 100644
--- a/docs/libnm-util/html/libnm-util.devhelp2
+++ b/docs/libnm-util/html/libnm-util.devhelp2
@@ -1075,10 +1075,12 @@
     <keyword type="function" name="nm_utils_ssid_to_utf8 ()" link="libnm-util-nm-utils.html#nm-utils-ssid-to-utf8"/>
     <keyword type="function" name="nm_utils_uuid_generate ()" link="libnm-util-nm-utils.html#nm-utils-uuid-generate"/>
     <keyword type="function" name="nm_utils_uuid_generate_from_string ()" link="libnm-util-nm-utils.html#nm-utils-uuid-generate-from-string"/>
+    <keyword type="function" name="nm_utils_wep_key_valid ()" link="libnm-util-nm-utils.html#nm-utils-wep-key-valid"/>
     <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_freq_to_channel ()" link="libnm-util-nm-utils.html#nm-utils-wifi-freq-to-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="function" name="nm_utils_wpa_psk_valid ()" link="libnm-util-nm-utils.html#nm-utils-wpa-psk-valid"/>
     <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_CONNECTION_ERROR_CONNECTION_TYPE_INVALID" link="NMConnection.html#NM-CONNECTION-ERROR-CONNECTION-TYPE-INVALID:CAPS"/>
diff --git a/docs/libnm-util/libnm-util-sections.txt b/docs/libnm-util/libnm-util-sections.txt
index 7515e23a..ad93832e 100644
--- a/docs/libnm-util/libnm-util-sections.txt
+++ b/docs/libnm-util/libnm-util-sections.txt
@@ -1172,10 +1172,12 @@ nm_utils_slist_free
 nm_utils_ssid_to_utf8
 nm_utils_uuid_generate
 nm_utils_uuid_generate_from_string
+nm_utils_wep_key_valid
 nm_utils_wifi_channel_to_freq
 nm_utils_wifi_find_next_channel
 nm_utils_wifi_freq_to_channel
 nm_utils_wifi_is_channel_valid
+nm_utils_wpa_psk_valid
 </SECTION>
 
 <SECTION>
diff --git a/docs/libnm-util/tmpl/nm-utils.sgml b/docs/libnm-util/tmpl/nm-utils.sgml
index d148c444..c2bf6f99 100644
--- a/docs/libnm-util/tmpl/nm-utils.sgml
+++ b/docs/libnm-util/tmpl/nm-utils.sgml
@@ -365,6 +365,16 @@ nm-utils
 @Returns: 
 
 
+<!-- ##### FUNCTION nm_utils_wep_key_valid ##### -->
+<para>
+
+</para>
+
+@key: 
+@wep_type: 
+@Returns: 
+
+
 <!-- ##### FUNCTION nm_utils_wifi_channel_to_freq ##### -->
 <para>
 
@@ -405,3 +415,12 @@ nm-utils
 @Returns: 
 
 
+<!-- ##### FUNCTION nm_utils_wpa_psk_valid ##### -->
+<para>
+
+</para>
+
+@psk: 
+@Returns: 
+
+
diff --git a/docs/libnm-util/version.xml b/docs/libnm-util/version.xml
index fa572dcf..1517c785 100644
--- a/docs/libnm-util/version.xml
+++ b/docs/libnm-util/version.xml
@@ -1 +1 @@
-0.9.7.995
+0.9.7.997
author	Michael Biebl <biebl@debian.org>	2013-02-09 03:16:54 +0100
committer	Michael Biebl <biebl@debian.org>	2013-02-09 03:16:54 +0100
commit	e17c5736fc3722ce51cb33f3edb203960125a4c1 (patch)
tree	2b41ee92b307915e9d97f0ef2c012fc793653599 /docs
parent	9c202e3e860b3be9e1f8882630b69affbb130102 (diff)