New upstream version 1.5.90 upstream/1.5.90

author: Michael Biebl <biebl@debian.org> 2017-01-17 20:25:09 +0100
committer: Michael Biebl <biebl@debian.org> 2017-01-17 20:25:09 +0100
commit: 58f8be580039b0575b197b9573a1c92745d96d30 (patch)
tree: 2c226233f623a0dcb529be0eb8cdf97e4a2ae0c0 /introspection
parent: 45cb5bb3c0e6edb887cf69b417fcaf7053814a9b (diff)
74 files changed, 163 insertions, 6345 deletions
diff --git a/introspection/Makefile.am b/introspection/Makefile.am
deleted file mode 100644
index 27b54e5d..00000000
--- a/introspection/Makefile.am
+++ /dev/null
@@ -1,180 +0,0 @@
-noinst_LTLIBRARIES = \
-	libnmdbus.la
-
-# gdbus-codegen 2.38 will emit code that requires glib 2.38, which
-# will then cause availability warnings if we define
-# GLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_32.
-#
-# This is fixed in GLib 2.40 (it emits code that takes
-# GLIB_VERSION_MAX_ALLOWED into account), so this workaround can go
-# away when we depend on that.
-AM_CPPFLAGS = $(filter-out -DGLIB_VERSION_MAX_ALLOWED%,$(GLIB_CFLAGS))
-
-nodist_libnmdbus_la_SOURCES = \
-	nmdbus-access-point.c \
-	nmdbus-access-point.h \
-	nmdbus-active-connection.c \
-	nmdbus-active-connection.h \
-	nmdbus-agent-manager.c \
-	nmdbus-agent-manager.h \
-	nmdbus-checkpoint.c \
-	nmdbus-checkpoint.h \
-	nmdbus-device-adsl.c \
-	nmdbus-device-adsl.h \
-	nmdbus-device-bond.c \
-	nmdbus-device-bond.h \
-	nmdbus-device-bridge.c \
-	nmdbus-device-bridge.h \
-	nmdbus-device-bt.c \
-	nmdbus-device-bt.h \
-	nmdbus-device-ethernet.c \
-	nmdbus-device-ethernet.h \
-	nmdbus-device.c \
-	nmdbus-device.h \
-	nmdbus-device-generic.c \
-	nmdbus-device-generic.h \
-	nmdbus-device-infiniband.c \
-	nmdbus-device-infiniband.h \
-	nmdbus-device-ip-tunnel.c \
-	nmdbus-device-ip-tunnel.h \
-	nmdbus-device-macvlan.c \
-	nmdbus-device-macvlan.h \
-	nmdbus-device-modem.c \
-	nmdbus-device-modem.h \
-	nmdbus-device-olpc-mesh.c \
-	nmdbus-device-olpc-mesh.h \
-	nmdbus-device-statistics.c \
-	nmdbus-device-statistics.h \
-	nmdbus-device-team.c \
-	nmdbus-device-team.h \
-	nmdbus-device-tun.c \
-	nmdbus-device-tun.h \
-	nmdbus-device-veth.c \
-	nmdbus-device-veth.h \
-	nmdbus-device-vlan.c \
-	nmdbus-device-vlan.h \
-	nmdbus-device-vxlan.c \
-	nmdbus-device-vxlan.h \
-	nmdbus-device-wifi.c \
-	nmdbus-device-wifi.h \
-	nmdbus-device-wimax.c \
-	nmdbus-device-wimax.h \
-	nmdbus-dhcp4-config.c \
-	nmdbus-dhcp4-config.h \
-	nmdbus-dhcp6-config.c \
-	nmdbus-dhcp6-config.h \
-	nmdbus-ip4-config.c \
-	nmdbus-ip4-config.h \
-	nmdbus-ip6-config.c \
-	nmdbus-ip6-config.h \
-	nmdbus-manager.c \
-	nmdbus-manager.h \
-	nmdbus-ppp-manager.c \
-	nmdbus-ppp-manager.h \
-	nmdbus-secret-agent.c \
-	nmdbus-secret-agent.h \
-	nmdbus-settings-connection.c \
-	nmdbus-settings-connection.h \
-	nmdbus-settings.c \
-	nmdbus-settings.h \
-	nmdbus-vpn-connection.c \
-	nmdbus-vpn-connection.h \
-	nmdbus-vpn-plugin.c \
-	nmdbus-vpn-plugin.h
-
-DBUS_INTERFACE_DOCS = \
-	nmdbus-access-point-org.freedesktop.NetworkManager.AccessPoint.xml \
-	nmdbus-active-connection-org.freedesktop.NetworkManager.Connection.Active.xml \
-	nmdbus-checkpoint-org.freedesktop.NetworkManager.Checkpoint.xml \
-	nmdbus-device-team-org.freedesktop.NetworkManager.Device.Team.xml \
-	nmdbus-dhcp6-config-org.freedesktop.NetworkManager.DHCP6Config.xml \
-	nmdbus-device-wifi-org.freedesktop.NetworkManager.Device.Wireless.xml \
-	nmdbus-manager-org.freedesktop.NetworkManager.xml \
-	nmdbus-vpn-connection-org.freedesktop.NetworkManager.VPN.Connection.xml \
-	nmdbus-secret-agent-org.freedesktop.NetworkManager.SecretAgent.xml \
-	nmdbus-device-org.freedesktop.NetworkManager.Device.xml \
-	nmdbus-vpn-plugin-org.freedesktop.NetworkManager.VPN.Plugin.xml \
-	nmdbus-device-bt-org.freedesktop.NetworkManager.Device.Bluetooth.xml \
-	nmdbus-device-vxlan-org.freedesktop.NetworkManager.Device.Vxlan.xml \
-	nmdbus-settings-connection-org.freedesktop.NetworkManager.Settings.Connection.xml \
-	nmdbus-device-bond-org.freedesktop.NetworkManager.Device.Bond.xml \
-	nmdbus-device-macvlan-org.freedesktop.NetworkManager.Device.Macvlan.xml \
-	nmdbus-ppp-manager-org.freedesktop.NetworkManager.PPP.xml \
-	nmdbus-device-vlan-org.freedesktop.NetworkManager.Device.Vlan.xml \
-	nmdbus-device-adsl-org.freedesktop.NetworkManager.Device.Adsl.xml \
-	nmdbus-agent-manager-org.freedesktop.NetworkManager.AgentManager.xml \
-	nmdbus-device-wimax-org.freedesktop.NetworkManager.Device.WiMax.xml \
-	nmdbus-device-ip-tunnel-org.freedesktop.NetworkManager.Device.IPTunnel.xml \
-	nmdbus-device-tun-org.freedesktop.NetworkManager.Device.Tun.xml \
-	nmdbus-device-bridge-org.freedesktop.NetworkManager.Device.Bridge.xml \
-	nmdbus-device-olpc-mesh-org.freedesktop.NetworkManager.Device.OlpcMesh.xml \
-	nmdbus-dhcp4-config-org.freedesktop.NetworkManager.DHCP4Config.xml \
-	nmdbus-device-generic-org.freedesktop.NetworkManager.Device.Generic.xml \
-	nmdbus-device-infiniband-org.freedesktop.NetworkManager.Device.Infiniband.xml \
-	nmdbus-device-modem-org.freedesktop.NetworkManager.Device.Modem.xml \
-	nmdbus-ip6-config-org.freedesktop.NetworkManager.IP6Config.xml \
-	nmdbus-device-veth-org.freedesktop.NetworkManager.Device.Veth.xml \
-	nmdbus-settings-org.freedesktop.NetworkManager.Settings.xml \
-	nmdbus-device-ethernet-org.freedesktop.NetworkManager.Device.Wired.xml \
-	nmdbus-ip4-config-org.freedesktop.NetworkManager.IP4Config.xml \
-	nmdbus-device-statistics-org.freedesktop.NetworkManager.Device.Statistics.xml
-
-define _make_nmdbus_rule
-$(1): $(patsubst nmdbus-%.c,nm-%.xml,$(1))
-	$$(AM_V_GEN) gdbus-codegen \
-		--generate-c-code $$(basename $$@) \
-		--generate-docbook $$(basename $$@) \
-		--c-namespace NMDBus \
-		--interface-prefix org.freedesktop.NetworkManager \
-		$$<
-
-$(filter $(basename $(1))-org.freedesktop.NetworkManager.%,$(DBUS_INTERFACE_DOCS)): $(1)
-	@true
-
-$(basename $(1)).h: $(1)
-	@true
-endef
-
-$(foreach f,$(filter %.c,$(nodist_libnmdbus_la_SOURCES)),$(eval $(call _make_nmdbus_rule,$f)))
-
-BUILT_SOURCES = $(nodist_libnmdbus_la_SOURCES) $(DBUS_INTERFACE_DOCS)
-
-CLEANFILES = $(BUILT_SOURCES)
-
-EXTRA_DIST = \
-	nm-access-point.xml \
-	nm-active-connection.xml \
-	nm-agent-manager.xml \
-	nm-checkpoint.xml \
-	nm-device-adsl.xml \
-	nm-device-bond.xml \
-	nm-device-bridge.xml \
-	nm-device-bt.xml \
-	nm-device-ethernet.xml \
-	nm-device-generic.xml \
-	nm-device-infiniband.xml \
-	nm-device-ip-tunnel.xml \
-	nm-device-macvlan.xml \
-	nm-device-modem.xml \
-	nm-device-olpc-mesh.xml \
-	nm-device-statistics.xml \
-	nm-device-team.xml \
-	nm-device-tun.xml \
-	nm-device-veth.xml \
-	nm-device-vlan.xml \
-	nm-device-vxlan.xml \
-	nm-device-wifi.xml \
-	nm-device-wimax.xml \
-	nm-device.xml \
-	nm-dhcp4-config.xml \
-	nm-dhcp6-config.xml \
-	nm-ip4-config.xml \
-	nm-ip6-config.xml \
-	nm-manager.xml \
-	nm-ppp-manager.xml \
-	nm-secret-agent.xml \
-	nm-settings-connection.xml \
-	nm-settings.xml \
-	nm-vpn-connection.xml \
-	nm-vpn-plugin.xml \
-	nm-wimax-nsp.xml
diff --git a/introspection/Makefile.in b/introspection/Makefile.in
deleted file mode 100644
index 1c737972..00000000
--- a/introspection/Makefile.in
+++ /dev/null
@@ -1,981 +0,0 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
-}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = introspection
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/attributes.m4 \
-	$(top_srcdir)/m4/ax_lib_readline.m4 \
-	$(top_srcdir)/m4/compiler_options.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/git-sha-record.m4 \
-	$(top_srcdir)/m4/gnome-code-coverage.m4 \
-	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
-	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \
-	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/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)
-DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-LTLIBRARIES = $(noinst_LTLIBRARIES)
-libnmdbus_la_LIBADD =
-nodist_libnmdbus_la_OBJECTS = nmdbus-access-point.lo \
-	nmdbus-active-connection.lo nmdbus-agent-manager.lo \
-	nmdbus-checkpoint.lo nmdbus-device-adsl.lo \
-	nmdbus-device-bond.lo nmdbus-device-bridge.lo \
-	nmdbus-device-bt.lo nmdbus-device-ethernet.lo nmdbus-device.lo \
-	nmdbus-device-generic.lo nmdbus-device-infiniband.lo \
-	nmdbus-device-ip-tunnel.lo nmdbus-device-macvlan.lo \
-	nmdbus-device-modem.lo nmdbus-device-olpc-mesh.lo \
-	nmdbus-device-statistics.lo nmdbus-device-team.lo \
-	nmdbus-device-tun.lo nmdbus-device-veth.lo \
-	nmdbus-device-vlan.lo nmdbus-device-vxlan.lo \
-	nmdbus-device-wifi.lo nmdbus-device-wimax.lo \
-	nmdbus-dhcp4-config.lo nmdbus-dhcp6-config.lo \
-	nmdbus-ip4-config.lo nmdbus-ip6-config.lo nmdbus-manager.lo \
-	nmdbus-ppp-manager.lo nmdbus-secret-agent.lo \
-	nmdbus-settings-connection.lo nmdbus-settings.lo \
-	nmdbus-vpn-connection.lo nmdbus-vpn-plugin.lo
-libnmdbus_la_OBJECTS = $(nodist_libnmdbus_la_OBJECTS)
-AM_V_lt = $(am__v_lt_@AM_V@)
-am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-am__v_lt_1 = 
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-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_CC_1 = 
-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_CCLD_1 = 
-SOURCES = $(nodist_libnmdbus_la_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
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates.  Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
-  BEGIN { nonempty = 0; } \
-  { items[$$0] = 1; nonempty = 1; } \
-  END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique.  This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
-  list='$(am__tagged_files)'; \
-  unique=`for i in $$list; do \
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-  done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
-am__DIST_COMMON = $(srcdir)/Makefile.in \
-	$(top_srcdir)/build-aux/depcomp
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALL_LINGUAS = @ALL_LINGUAS@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_TESTS_FD_REDIRECT = @AM_TESTS_FD_REDIRECT@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BLUEZ5_CFLAGS = @BLUEZ5_CFLAGS@
-BLUEZ5_LIBS = @BLUEZ5_LIBS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
-CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
-CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DBUS_CFLAGS = @DBUS_CFLAGS@
-DBUS_LIBS = @DBUS_LIBS@
-DBUS_SYS_DIR = @DBUS_SYS_DIR@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DHCLIENT_PATH = @DHCLIENT_PATH@
-DHCPCD_PATH = @DHCPCD_PATH@
-DISTRO_NETWORK_SERVICE = @DISTRO_NETWORK_SERVICE@
-DLLTOOL = @DLLTOOL@
-DL_LIBS = @DL_LIBS@
-DNSMASQ_PATH = @DNSMASQ_PATH@
-DNSSEC_TRIGGER_SCRIPT = @DNSSEC_TRIGGER_SCRIPT@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GENHTML = @GENHTML@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
-GLIB_LIBS = @GLIB_LIBS@
-GLIB_MAKEFILE = @GLIB_MAKEFILE@
-GLIB_MKENUMS = @GLIB_MKENUMS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
-GNUTLS_LIBS = @GNUTLS_LIBS@
-GREP = @GREP@
-GTKDOC_CHECK = @GTKDOC_CHECK@
-GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
-GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
-GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
-GTKDOC_MKPDF = @GTKDOC_MKPDF@
-GTKDOC_REBASE = @GTKDOC_REBASE@
-GUDEV_CFLAGS = @GUDEV_CFLAGS@
-GUDEV_LIBS = @GUDEV_LIBS@
-HTML_DIR = @HTML_DIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
-INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
-INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
-INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
-INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
-INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
-INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
-INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
-INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
-INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
-INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
-IPTABLES_PATH = @IPTABLES_PATH@
-JANSSON_CFLAGS = @JANSSON_CFLAGS@
-JANSSON_LIBS = @JANSSON_LIBS@
-KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
-LCOV = @LCOV@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBAUDIT_CFLAGS = @LIBAUDIT_CFLAGS@
-LIBAUDIT_LIBS = @LIBAUDIT_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBM = @LIBM@
-LIBNDP_CFLAGS = @LIBNDP_CFLAGS@
-LIBNDP_LIBS = @LIBNDP_LIBS@
-LIBNL_CFLAGS = @LIBNL_CFLAGS@
-LIBNL_LIBS = @LIBNL_LIBS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
-LIBSOUP_LIBS = @LIBSOUP_LIBS@
-LIBSYSTEMD_CFLAGS = @LIBSYSTEMD_CFLAGS@
-LIBSYSTEMD_LIBS = @LIBSYSTEMD_LIBS@
-LIBTEAMDCTL_CFLAGS = @LIBTEAMDCTL_CFLAGS@
-LIBTEAMDCTL_LIBS = @LIBTEAMDCTL_LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LOG_DRIVER = @LOG_DRIVER@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-MM_GLIB_CFLAGS = @MM_GLIB_CFLAGS@
-MM_GLIB_LIBS = @MM_GLIB_LIBS@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-NEWT_CFLAGS = @NEWT_CFLAGS@
-NEWT_LIBS = @NEWT_LIBS@
-NM = @NM@
-NMEDIT = @NMEDIT@
-NM_CONFIG_DEFAULT_AUTH_POLKIT_TEXT = @NM_CONFIG_DEFAULT_AUTH_POLKIT_TEXT@
-NM_CONFIG_DEFAULT_DNS_RC_MANAGER = @NM_CONFIG_DEFAULT_DNS_RC_MANAGER@
-NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT = @NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT@
-NM_CONFIG_LOGGING_BACKEND_DEFAULT_TEXT = @NM_CONFIG_LOGGING_BACKEND_DEFAULT_TEXT@
-NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
-NM_MICRO_VERSION = @NM_MICRO_VERSION@
-NM_MINOR_VERSION = @NM_MINOR_VERSION@
-NM_MODIFY_SYSTEM_POLICY = @NM_MODIFY_SYSTEM_POLICY@
-NM_VERSION = @NM_VERSION@
-NSS_CFLAGS = @NSS_CFLAGS@
-NSS_LIBS = @NSS_LIBS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PERL = @PERL@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-POLKIT_CFLAGS = @POLKIT_CFLAGS@
-POLKIT_LIBS = @POLKIT_LIBS@
-POSUB = @POSUB@
-PPPD_PATH = @PPPD_PATH@
-PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
-QT_CFLAGS = @QT_CFLAGS@
-QT_LIBS = @QT_LIBS@
-RANLIB = @RANLIB@
-READLINE_LIBS = @READLINE_LIBS@
-SANITIZERS = @SANITIZERS@
-SANITIZER_ENV = @SANITIZER_ENV@
-SED = @SED@
-SELINUX_CFLAGS = @SELINUX_CFLAGS@
-SELINUX_LIBS = @SELINUX_LIBS@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SYSTEMD_200_CFLAGS = @SYSTEMD_200_CFLAGS@
-SYSTEMD_200_LIBS = @SYSTEMD_200_LIBS@
-SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
-SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
-SYSTEMD_JOURNAL_CFLAGS = @SYSTEMD_JOURNAL_CFLAGS@
-SYSTEMD_JOURNAL_LIBS = @SYSTEMD_JOURNAL_LIBS@
-SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
-SYSTEMD_LOGIN_LIBS = @SYSTEMD_LOGIN_LIBS@
-SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
-UDEV_DIR = @UDEV_DIR@
-USE_NLS = @USE_NLS@
-UUID_CFLAGS = @UUID_CFLAGS@
-UUID_LIBS = @UUID_LIBS@
-VALGRIND_RULES = @VALGRIND_RULES@
-VAPIGEN = @VAPIGEN@
-VAPIGEN_MAKEFILE = @VAPIGEN_MAKEFILE@
-VAPIGEN_VAPIDIR = @VAPIGEN_VAPIDIR@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-intltool__v_merge_options_ = @intltool__v_merge_options_@
-intltool__v_merge_options_0 = @intltool__v_merge_options_0@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-nmbinary = @nmbinary@
-nmconfdir = @nmconfdir@
-nmdatadir = @nmdatadir@
-nmlibdir = @nmlibdir@
-nmrundir = @nmrundir@
-nmstatedir = @nmstatedir@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-runstatedir = @runstatedir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-subdirs = @subdirs@
-sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-with_dhclient = @with_dhclient@
-with_dhcpcd = @with_dhcpcd@
-with_netconfig = @with_netconfig@
-with_resolvconf = @with_resolvconf@
-with_valgrind = @with_valgrind@
-noinst_LTLIBRARIES = \
-	libnmdbus.la
-
-
-# gdbus-codegen 2.38 will emit code that requires glib 2.38, which
-# will then cause availability warnings if we define
-# GLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_32.
-#
-# This is fixed in GLib 2.40 (it emits code that takes
-# GLIB_VERSION_MAX_ALLOWED into account), so this workaround can go
-# away when we depend on that.
-AM_CPPFLAGS = $(filter-out -DGLIB_VERSION_MAX_ALLOWED%,$(GLIB_CFLAGS))
-nodist_libnmdbus_la_SOURCES = \
-	nmdbus-access-point.c \
-	nmdbus-access-point.h \
-	nmdbus-active-connection.c \
-	nmdbus-active-connection.h \
-	nmdbus-agent-manager.c \
-	nmdbus-agent-manager.h \
-	nmdbus-checkpoint.c \
-	nmdbus-checkpoint.h \
-	nmdbus-device-adsl.c \
-	nmdbus-device-adsl.h \
-	nmdbus-device-bond.c \
-	nmdbus-device-bond.h \
-	nmdbus-device-bridge.c \
-	nmdbus-device-bridge.h \
-	nmdbus-device-bt.c \
-	nmdbus-device-bt.h \
-	nmdbus-device-ethernet.c \
-	nmdbus-device-ethernet.h \
-	nmdbus-device.c \
-	nmdbus-device.h \
-	nmdbus-device-generic.c \
-	nmdbus-device-generic.h \
-	nmdbus-device-infiniband.c \
-	nmdbus-device-infiniband.h \
-	nmdbus-device-ip-tunnel.c \
-	nmdbus-device-ip-tunnel.h \
-	nmdbus-device-macvlan.c \
-	nmdbus-device-macvlan.h \
-	nmdbus-device-modem.c \
-	nmdbus-device-modem.h \
-	nmdbus-device-olpc-mesh.c \
-	nmdbus-device-olpc-mesh.h \
-	nmdbus-device-statistics.c \
-	nmdbus-device-statistics.h \
-	nmdbus-device-team.c \
-	nmdbus-device-team.h \
-	nmdbus-device-tun.c \
-	nmdbus-device-tun.h \
-	nmdbus-device-veth.c \
-	nmdbus-device-veth.h \
-	nmdbus-device-vlan.c \
-	nmdbus-device-vlan.h \
-	nmdbus-device-vxlan.c \
-	nmdbus-device-vxlan.h \
-	nmdbus-device-wifi.c \
-	nmdbus-device-wifi.h \
-	nmdbus-device-wimax.c \
-	nmdbus-device-wimax.h \
-	nmdbus-dhcp4-config.c \
-	nmdbus-dhcp4-config.h \
-	nmdbus-dhcp6-config.c \
-	nmdbus-dhcp6-config.h \
-	nmdbus-ip4-config.c \
-	nmdbus-ip4-config.h \
-	nmdbus-ip6-config.c \
-	nmdbus-ip6-config.h \
-	nmdbus-manager.c \
-	nmdbus-manager.h \
-	nmdbus-ppp-manager.c \
-	nmdbus-ppp-manager.h \
-	nmdbus-secret-agent.c \
-	nmdbus-secret-agent.h \
-	nmdbus-settings-connection.c \
-	nmdbus-settings-connection.h \
-	nmdbus-settings.c \
-	nmdbus-settings.h \
-	nmdbus-vpn-connection.c \
-	nmdbus-vpn-connection.h \
-	nmdbus-vpn-plugin.c \
-	nmdbus-vpn-plugin.h
-
-DBUS_INTERFACE_DOCS = \
-	nmdbus-access-point-org.freedesktop.NetworkManager.AccessPoint.xml \
-	nmdbus-active-connection-org.freedesktop.NetworkManager.Connection.Active.xml \
-	nmdbus-checkpoint-org.freedesktop.NetworkManager.Checkpoint.xml \
-	nmdbus-device-team-org.freedesktop.NetworkManager.Device.Team.xml \
-	nmdbus-dhcp6-config-org.freedesktop.NetworkManager.DHCP6Config.xml \
-	nmdbus-device-wifi-org.freedesktop.NetworkManager.Device.Wireless.xml \
-	nmdbus-manager-org.freedesktop.NetworkManager.xml \
-	nmdbus-vpn-connection-org.freedesktop.NetworkManager.VPN.Connection.xml \
-	nmdbus-secret-agent-org.freedesktop.NetworkManager.SecretAgent.xml \
-	nmdbus-device-org.freedesktop.NetworkManager.Device.xml \
-	nmdbus-vpn-plugin-org.freedesktop.NetworkManager.VPN.Plugin.xml \
-	nmdbus-device-bt-org.freedesktop.NetworkManager.Device.Bluetooth.xml \
-	nmdbus-device-vxlan-org.freedesktop.NetworkManager.Device.Vxlan.xml \
-	nmdbus-settings-connection-org.freedesktop.NetworkManager.Settings.Connection.xml \
-	nmdbus-device-bond-org.freedesktop.NetworkManager.Device.Bond.xml \
-	nmdbus-device-macvlan-org.freedesktop.NetworkManager.Device.Macvlan.xml \
-	nmdbus-ppp-manager-org.freedesktop.NetworkManager.PPP.xml \
-	nmdbus-device-vlan-org.freedesktop.NetworkManager.Device.Vlan.xml \
-	nmdbus-device-adsl-org.freedesktop.NetworkManager.Device.Adsl.xml \
-	nmdbus-agent-manager-org.freedesktop.NetworkManager.AgentManager.xml \
-	nmdbus-device-wimax-org.freedesktop.NetworkManager.Device.WiMax.xml \
-	nmdbus-device-ip-tunnel-org.freedesktop.NetworkManager.Device.IPTunnel.xml \
-	nmdbus-device-tun-org.freedesktop.NetworkManager.Device.Tun.xml \
-	nmdbus-device-bridge-org.freedesktop.NetworkManager.Device.Bridge.xml \
-	nmdbus-device-olpc-mesh-org.freedesktop.NetworkManager.Device.OlpcMesh.xml \
-	nmdbus-dhcp4-config-org.freedesktop.NetworkManager.DHCP4Config.xml \
-	nmdbus-device-generic-org.freedesktop.NetworkManager.Device.Generic.xml \
-	nmdbus-device-infiniband-org.freedesktop.NetworkManager.Device.Infiniband.xml \
-	nmdbus-device-modem-org.freedesktop.NetworkManager.Device.Modem.xml \
-	nmdbus-ip6-config-org.freedesktop.NetworkManager.IP6Config.xml \
-	nmdbus-device-veth-org.freedesktop.NetworkManager.Device.Veth.xml \
-	nmdbus-settings-org.freedesktop.NetworkManager.Settings.xml \
-	nmdbus-device-ethernet-org.freedesktop.NetworkManager.Device.Wired.xml \
-	nmdbus-ip4-config-org.freedesktop.NetworkManager.IP4Config.xml \
-	nmdbus-device-statistics-org.freedesktop.NetworkManager.Device.Statistics.xml
-
-BUILT_SOURCES = $(nodist_libnmdbus_la_SOURCES) $(DBUS_INTERFACE_DOCS)
-CLEANFILES = $(BUILT_SOURCES)
-EXTRA_DIST = \
-	nm-access-point.xml \
-	nm-active-connection.xml \
-	nm-agent-manager.xml \
-	nm-checkpoint.xml \
-	nm-device-adsl.xml \
-	nm-device-bond.xml \
-	nm-device-bridge.xml \
-	nm-device-bt.xml \
-	nm-device-ethernet.xml \
-	nm-device-generic.xml \
-	nm-device-infiniband.xml \
-	nm-device-ip-tunnel.xml \
-	nm-device-macvlan.xml \
-	nm-device-modem.xml \
-	nm-device-olpc-mesh.xml \
-	nm-device-statistics.xml \
-	nm-device-team.xml \
-	nm-device-tun.xml \
-	nm-device-veth.xml \
-	nm-device-vlan.xml \
-	nm-device-vxlan.xml \
-	nm-device-wifi.xml \
-	nm-device-wimax.xml \
-	nm-device.xml \
-	nm-dhcp4-config.xml \
-	nm-dhcp6-config.xml \
-	nm-ip4-config.xml \
-	nm-ip6-config.xml \
-	nm-manager.xml \
-	nm-ppp-manager.xml \
-	nm-secret-agent.xml \
-	nm-settings-connection.xml \
-	nm-settings.xml \
-	nm-vpn-connection.xml \
-	nm-vpn-plugin.xml \
-	nm-wimax-nsp.xml
-
-all: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu introspection/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu introspection/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-clean-noinstLTLIBRARIES:
-	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-	@list='$(noinst_LTLIBRARIES)'; \
-	locs=`for p in $$list; do echo $$p; done | \
-	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
-	      sort -u`; \
-	test -z "$$locs" || { \
-	  echo rm -f $${locs}; \
-	  rm -f $${locs}; \
-	}
-
-libnmdbus.la: $(libnmdbus_la_OBJECTS) $(libnmdbus_la_DEPENDENCIES) $(EXTRA_libnmdbus_la_DEPENDENCIES) 
-	$(AM_V_CCLD)$(LINK)  $(libnmdbus_la_OBJECTS) $(libnmdbus_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-access-point.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-active-connection.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-agent-manager.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-checkpoint.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-device-adsl.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-device-bond.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-device-bridge.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-device-bt.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-device-ethernet.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-device-generic.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-device-infiniband.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-device-ip-tunnel.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-device-macvlan.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-device-modem.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-device-olpc-mesh.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-device-statistics.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-device-team.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-device-tun.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-device-veth.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-device-vlan.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-device-vxlan.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-device-wifi.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-device-wimax.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-device.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-dhcp4-config.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-dhcp6-config.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-ip4-config.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-ip6-config.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-manager.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-ppp-manager.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-secret-agent.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-settings-connection.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-settings.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-vpn-connection.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-vpn-plugin.Plo@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 -o $@ $<
-
-.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 -o $@ `$(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 $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-ID: $(am__tagged_files)
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-am
-TAGS: tags
-
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	set x; \
-	here=`pwd`; \
-	$(am__define_uniq_tagged_files); \
-	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-am
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	$(am__define_uniq_tagged_files); \
-	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"
-cscopelist: cscopelist-am
-
-cscopelist-am: $(am__tagged_files)
-	list='$(am__tagged_files)'; \
-	case "$(srcdir)" in \
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
-	  *) sdir=$(subdir)/$(srcdir) ;; \
-	esac; \
-	for i in $$list; do \
-	  if test -f "$$i"; then \
-	    echo "$(subdir)/$$i"; \
-	  else \
-	    echo "$$sdir/$$i"; \
-	  fi; \
-	done >> $(top_builddir)/cscope.files
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) check-am
-all-am: Makefile $(LTLIBRARIES)
-installdirs:
-install: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: all check install install-am install-strip
-
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \
-	ctags-am distclean distclean-compile distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags tags-am uninstall uninstall-am
-
-.PRECIOUS: Makefile
-
-
-define _make_nmdbus_rule
-$(1): $(patsubst nmdbus-%.c,nm-%.xml,$(1))
-	$$(AM_V_GEN) gdbus-codegen \
-		--generate-c-code $$(basename $$@) \
-		--generate-docbook $$(basename $$@) \
-		--c-namespace NMDBus \
-		--interface-prefix org.freedesktop.NetworkManager \
-		$$<
-
-$(filter $(basename $(1))-org.freedesktop.NetworkManager.%,$(DBUS_INTERFACE_DOCS)): $(1)
-	@true
-
-$(basename $(1)).h: $(1)
-	@true
-endef
-
-$(foreach f,$(filter %.c,$(nodist_libnmdbus_la_SOURCES)),$(eval $(call _make_nmdbus_rule,$f)))
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/introspection/nmdbus-access-point-org.freedesktop.NetworkManager.AccessPoint.xml b/introspection/nmdbus-access-point-org.freedesktop.NetworkManager.AccessPoint.xml
deleted file mode 100644
index 41816641..00000000
--- a/introspection/nmdbus-access-point-org.freedesktop.NetworkManager.AccessPoint.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-]>
-<refentry id="gdbus-org.freedesktop.NetworkManager.AccessPoint">
-  <refmeta>    <refentrytitle role="top_of_page" id="gdbus-interface-org-freedesktop-NetworkManager-AccessPoint.top_of_page">org.freedesktop.NetworkManager.AccessPoint</refentrytitle>
-  <indexterm zone="gdbus-interface-org-freedesktop-NetworkManager-AccessPoint.top_of_page"><primary sortas=".AccessPoint">org.freedesktop.NetworkManager.AccessPoint</primary></indexterm>
-  </refmeta>  <refnamediv>    <refname>org.freedesktop.NetworkManager.AccessPoint</refname>    <refpurpose></refpurpose>  </refnamediv>  <refsect1 role="signal_proto">
-    <title role="signal_proto.title">Signals</title>
-    <synopsis>
-<link linkend="gdbus-signal-org-freedesktop-NetworkManager-AccessPoint.PropertiesChanged">PropertiesChanged</link> (a{sv} properties);
-</synopsis>
-  </refsect1>
-  <refsect1 role="properties">
-    <title role="properties.title">Properties</title>
-    <synopsis>
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-AccessPoint.Flags">Flags</link>       readable   u
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-AccessPoint.WpaFlags">WpaFlags</link>    readable   u
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-AccessPoint.RsnFlags">RsnFlags</link>    readable   u
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-AccessPoint.Ssid">Ssid</link>        readable   ay
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-AccessPoint.Frequency">Frequency</link>   readable   u
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-AccessPoint.HwAddress">HwAddress</link>   readable   s
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-AccessPoint.Mode">Mode</link>        readable   u
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-AccessPoint.MaxBitrate">MaxBitrate</link>  readable   u
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-AccessPoint.Strength">Strength</link>    readable   y
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-AccessPoint.LastSeen">LastSeen</link>    readable   i
-</synopsis>
-  </refsect1>
-<refsect1 role="desc" id="gdbus-interface-org-freedesktop-NetworkManager-AccessPoint">
-  <title role="desc.title">Description</title>
-  <para></para>
-</refsect1>
-<refsect1 role="details" id="gdbus-signals-org.freedesktop.NetworkManager.AccessPoint">
-  <title role="details.title">Signal Details</title>
-<refsect2 role="signal" id="gdbus-signal-org-freedesktop-NetworkManager-AccessPoint.PropertiesChanged">
-  <title>The "PropertiesChanged" signal</title>
-  <indexterm zone="gdbus-signal-org-freedesktop-NetworkManager-AccessPoint.PropertiesChanged"><primary sortas=".AccessPoint::PropertiesChanged">org.freedesktop.NetworkManager.AccessPoint::PropertiesChanged</primary></indexterm>
-<programlisting>
-PropertiesChanged (a{sv} properties);
-</programlisting>
-<para>        DEPRECATED. Use the standard "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" instead which exists since version NetworkManager 1.2.0.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>a{sv} <parameter>properties</parameter></literal>:</term>
-  <listitem><para>A dictionary mapping property names to variant boxed values</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-</refsect1>
-<refsect1 role="details" id="gdbus-properties-org.freedesktop.NetworkManager.AccessPoint">
-  <title role="details.title">Property Details</title>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-AccessPoint.Flags">
-  <title>The "Flags" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-AccessPoint.Flags"><primary sortas=".AccessPoint:Flags">org.freedesktop.NetworkManager.AccessPoint:Flags</primary></indexterm>
-<programlisting>
-Flags  readable   u
-</programlisting>
-<para>        Flags describing the capabilities of the access point.
-</para><para>        Returns: <link linkend="NM80211ApFlags">NM80211ApFlags</link>
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-AccessPoint.WpaFlags">
-  <title>The "WpaFlags" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-AccessPoint.WpaFlags"><primary sortas=".AccessPoint:WpaFlags">org.freedesktop.NetworkManager.AccessPoint:WpaFlags</primary></indexterm>
-<programlisting>
-WpaFlags  readable   u
-</programlisting>
-<para>        Flags describing the access point's capabilities according to WPA (Wifi
-        Protected Access).
-</para><para>        Returns: <link linkend="NM80211ApSecurityFlags">NM80211ApSecurityFlags</link>
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-AccessPoint.RsnFlags">
-  <title>The "RsnFlags" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-AccessPoint.RsnFlags"><primary sortas=".AccessPoint:RsnFlags">org.freedesktop.NetworkManager.AccessPoint:RsnFlags</primary></indexterm>
-<programlisting>
-RsnFlags  readable   u
-</programlisting>
-<para>        Flags describing the access point's capabilities according to the RSN
-        (Robust Secure Network) protocol.
-</para><para>        Returns: <link linkend="NM80211ApSecurityFlags">NM80211ApSecurityFlags</link>
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-AccessPoint.Ssid">
-  <title>The "Ssid" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-AccessPoint.Ssid"><primary sortas=".AccessPoint:Ssid">org.freedesktop.NetworkManager.AccessPoint:Ssid</primary></indexterm>
-<programlisting>
-Ssid  readable   ay
-</programlisting>
-<para>        The Service Set Identifier identifying the access point.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-AccessPoint.Frequency">
-  <title>The "Frequency" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-AccessPoint.Frequency"><primary sortas=".AccessPoint:Frequency">org.freedesktop.NetworkManager.AccessPoint:Frequency</primary></indexterm>
-<programlisting>
-Frequency  readable   u
-</programlisting>
-<para>        The radio channel frequency in use by the access point, in MHz.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-AccessPoint.HwAddress">
-  <title>The "HwAddress" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-AccessPoint.HwAddress"><primary sortas=".AccessPoint:HwAddress">org.freedesktop.NetworkManager.AccessPoint:HwAddress</primary></indexterm>
-<programlisting>
-HwAddress  readable   s
-</programlisting>
-<para>        The hardware address (BSSID) of the access point.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-AccessPoint.Mode">
-  <title>The "Mode" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-AccessPoint.Mode"><primary sortas=".AccessPoint:Mode">org.freedesktop.NetworkManager.AccessPoint:Mode</primary></indexterm>
-<programlisting>
-Mode  readable   u
-</programlisting>
-<para>        Describes the operating mode of the access point.
-</para><para>        Returns: <link linkend="NM80211Mode">NM80211Mode</link>
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-AccessPoint.MaxBitrate">
-  <title>The "MaxBitrate" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-AccessPoint.MaxBitrate"><primary sortas=".AccessPoint:MaxBitrate">org.freedesktop.NetworkManager.AccessPoint:MaxBitrate</primary></indexterm>
-<programlisting>
-MaxBitrate  readable   u
-</programlisting>
-<para>        The maximum bitrate this access point is capable of, in kilobits/second
-        (Kb/s).
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-AccessPoint.Strength">
-  <title>The "Strength" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-AccessPoint.Strength"><primary sortas=".AccessPoint:Strength">org.freedesktop.NetworkManager.AccessPoint:Strength</primary></indexterm>
-<programlisting>
-Strength  readable   y
-</programlisting>
-<para>        The current signal quality of the access point, in percent.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-AccessPoint.LastSeen">
-  <title>The "LastSeen" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-AccessPoint.LastSeen"><primary sortas=".AccessPoint:LastSeen">org.freedesktop.NetworkManager.AccessPoint:LastSeen</primary></indexterm>
-<programlisting>
-LastSeen  readable   i
-</programlisting>
-<para>        The timestamp (in CLOCK_BOOTTIME seconds) for the last time the access
-        point was found in scan results. A value of -1 means the access point has
-        never been found in scan results.
-</para>
-</refsect2>
-</refsect1>
-</refentry>
-
diff --git a/introspection/nmdbus-active-connection-org.freedesktop.NetworkManager.Connection.Active.xml b/introspection/nmdbus-active-connection-org.freedesktop.NetworkManager.Connection.Active.xml
deleted file mode 100644
index 36bbe0c2..00000000
--- a/introspection/nmdbus-active-connection-org.freedesktop.NetworkManager.Connection.Active.xml
+++ /dev/null
@@ -1,226 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-]>
-<refentry id="gdbus-org.freedesktop.NetworkManager.Connection.Active">
-  <refmeta>    <refentrytitle role="top_of_page" id="gdbus-interface-org-freedesktop-NetworkManager-Connection-Active.top_of_page">org.freedesktop.NetworkManager.Connection.Active</refentrytitle>
-  <indexterm zone="gdbus-interface-org-freedesktop-NetworkManager-Connection-Active.top_of_page"><primary sortas="ActiveConnection">org.freedesktop.NetworkManager.Connection.Active</primary></indexterm>
-  </refmeta>  <refnamediv>    <refname>org.freedesktop.NetworkManager.Connection.Active</refname>    <refpurpose></refpurpose>  </refnamediv>  <refsect1 role="signal_proto">
-    <title role="signal_proto.title">Signals</title>
-    <synopsis>
-<link linkend="gdbus-signal-org-freedesktop-NetworkManager-Connection-Active.PropertiesChanged">PropertiesChanged</link> (a{sv} properties);
-</synopsis>
-  </refsect1>
-  <refsect1 role="properties">
-    <title role="properties.title">Properties</title>
-    <synopsis>
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Connection">Connection</link>      readable   o
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Connection-Active.SpecificObject">SpecificObject</link>  readable   o
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Id">Id</link>              readable   s
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Uuid">Uuid</link>            readable   s
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Type">Type</link>            readable   s
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Devices">Devices</link>         readable   ao
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Connection-Active.State">State</link>           readable   u
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Default">Default</link>         readable   b
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Ip4Config">Ip4Config</link>       readable   o
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Dhcp4Config">Dhcp4Config</link>     readable   o
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Default6">Default6</link>        readable   b
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Ip6Config">Ip6Config</link>       readable   o
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Dhcp6Config">Dhcp6Config</link>     readable   o
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Vpn">Vpn</link>             readable   b
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Master">Master</link>          readable   o
-</synopsis>
-  </refsect1>
-<refsect1 role="desc" id="gdbus-interface-org-freedesktop-NetworkManager-Connection-Active">
-  <title role="desc.title">Description</title>
-  <para>      Objects that implement the Connection.Active interface represent an
-      attempt to connect to a network using the details provided by a Connection
-      object. The Connection.Active object tracks the life-cycle of the
-      connection attempt and if successful indicates whether the connected
-      network is the "default" or preferred network for access. NetworkManager
-      has the concept of connections, which can be thought of as settings, a
-      profile or a configuration that can be applied on a networking device.
-      Such settings-connections are exposed as D-Bus object and the
-      active-connection expresses this relationship between device and
-      settings-connection. At any time a settings-connection can only be
-      activated on one device and vice versa. However, during activation and
-      deactivation multiple active-connections can reference the same device or
-      settings-connection as they are waiting to be activated or to be
-      deactivated.
-</para>
-</refsect1>
-<refsect1 role="details" id="gdbus-signals-org.freedesktop.NetworkManager.Connection.Active">
-  <title role="details.title">Signal Details</title>
-<refsect2 role="signal" id="gdbus-signal-org-freedesktop-NetworkManager-Connection-Active.PropertiesChanged">
-  <title>The "PropertiesChanged" signal</title>
-  <indexterm zone="gdbus-signal-org-freedesktop-NetworkManager-Connection-Active.PropertiesChanged"><primary sortas="ActiveConnection::PropertiesChanged">org.freedesktop.NetworkManager.Connection.Active::PropertiesChanged</primary></indexterm>
-<programlisting>
-PropertiesChanged (a{sv} properties);
-</programlisting>
-<para>        DEPRECATED. Use the standard "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" instead which exists since version NetworkManager 1.2.0.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>a{sv} <parameter>properties</parameter></literal>:</term>
-  <listitem><para>A dictionary mapping property names to variant boxed values</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-</refsect1>
-<refsect1 role="details" id="gdbus-properties-org.freedesktop.NetworkManager.Connection.Active">
-  <title role="details.title">Property Details</title>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Connection">
-  <title>The "Connection" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Connection"><primary sortas="ActiveConnection:Connection">org.freedesktop.NetworkManager.Connection.Active:Connection</primary></indexterm>
-<programlisting>
-Connection  readable   o
-</programlisting>
-<para>        The path of the connection.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Connection-Active.SpecificObject">
-  <title>The "SpecificObject" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Connection-Active.SpecificObject"><primary sortas="ActiveConnection:SpecificObject">org.freedesktop.NetworkManager.Connection.Active:SpecificObject</primary></indexterm>
-<programlisting>
-SpecificObject  readable   o
-</programlisting>
-<para>        A specific object associated with the active connection. This property
-        reflects the specific object used during connection activation, and will
-        not change over the lifetime of the ActiveConnection once set.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Id">
-  <title>The "Id" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Id"><primary sortas="ActiveConnection:Id">org.freedesktop.NetworkManager.Connection.Active:Id</primary></indexterm>
-<programlisting>
-Id  readable   s
-</programlisting>
-<para>        The ID of the connection, provided as a convenience so that clients do not
-        have to retrieve all connection details.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Uuid">
-  <title>The "Uuid" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Uuid"><primary sortas="ActiveConnection:Uuid">org.freedesktop.NetworkManager.Connection.Active:Uuid</primary></indexterm>
-<programlisting>
-Uuid  readable   s
-</programlisting>
-<para>        The UUID of the connection, provided as a convenience so that clients do
-        not have to retrieve all connection details.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Type">
-  <title>The "Type" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Type"><primary sortas="ActiveConnection:Type">org.freedesktop.NetworkManager.Connection.Active:Type</primary></indexterm>
-<programlisting>
-Type  readable   s
-</programlisting>
-<para>        The type of the connection, provided as a convenience so that clients do
-        not have to retrieve all connection details.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Devices">
-  <title>The "Devices" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Devices"><primary sortas="ActiveConnection:Devices">org.freedesktop.NetworkManager.Connection.Active:Devices</primary></indexterm>
-<programlisting>
-Devices  readable   ao
-</programlisting>
-<para>        Array of object paths representing devices which are part of this active
-        connection.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Connection-Active.State">
-  <title>The "State" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Connection-Active.State"><primary sortas="ActiveConnection:State">org.freedesktop.NetworkManager.Connection.Active:State</primary></indexterm>
-<programlisting>
-State  readable   u
-</programlisting>
-<para>        The state of this active connection.
-</para><para>        Returns: <link linkend="NMActiveConnectionState">NMActiveConnectionState</link>
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Default">
-  <title>The "Default" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Default"><primary sortas="ActiveConnection:Default">org.freedesktop.NetworkManager.Connection.Active:Default</primary></indexterm>
-<programlisting>
-Default  readable   b
-</programlisting>
-<para>        Whether this active connection is the default IPv4 connection, i.e.
-        whether it currently owns the default IPv4 route.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Ip4Config">
-  <title>The "Ip4Config" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Ip4Config"><primary sortas="ActiveConnection:Ip4Config">org.freedesktop.NetworkManager.Connection.Active:Ip4Config</primary></indexterm>
-<programlisting>
-Ip4Config  readable   o
-</programlisting>
-<para>        Object path of the Ip4Config object describing the configuration of the
-        connection. Only valid when the connection is in the
-        NM_ACTIVE_CONNECTION_STATE_ACTIVATED state.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Dhcp4Config">
-  <title>The "Dhcp4Config" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Dhcp4Config"><primary sortas="ActiveConnection:Dhcp4Config">org.freedesktop.NetworkManager.Connection.Active:Dhcp4Config</primary></indexterm>
-<programlisting>
-Dhcp4Config  readable   o
-</programlisting>
-<para>        Object path of the Dhcp4Config object describing the DHCP options returned
-        by the DHCP server (assuming the connection used DHCP). Only valid when
-        the connection is in the NM_ACTIVE_CONNECTION_STATE_ACTIVATED state.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Default6">
-  <title>The "Default6" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Default6"><primary sortas="ActiveConnection:Default6">org.freedesktop.NetworkManager.Connection.Active:Default6</primary></indexterm>
-<programlisting>
-Default6  readable   b
-</programlisting>
-<para>        Whether this active connection is the default IPv6 connection, i.e.
-        whether it currently owns the default IPv6 route.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Ip6Config">
-  <title>The "Ip6Config" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Ip6Config"><primary sortas="ActiveConnection:Ip6Config">org.freedesktop.NetworkManager.Connection.Active:Ip6Config</primary></indexterm>
-<programlisting>
-Ip6Config  readable   o
-</programlisting>
-<para>        Object path of the Ip6Config object describing the configuration of the
-        connection. Only valid when the connection is in the
-        NM_ACTIVE_CONNECTION_STATE_ACTIVATED state.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Dhcp6Config">
-  <title>The "Dhcp6Config" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Dhcp6Config"><primary sortas="ActiveConnection:Dhcp6Config">org.freedesktop.NetworkManager.Connection.Active:Dhcp6Config</primary></indexterm>
-<programlisting>
-Dhcp6Config  readable   o
-</programlisting>
-<para>        Object path of the Dhcp6Config object describing the DHCP options returned
-        by the DHCP server (assuming the connection used DHCP). Only valid when
-        the connection is in the NM_ACTIVE_CONNECTION_STATE_ACTIVATED state.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Vpn">
-  <title>The "Vpn" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Vpn"><primary sortas="ActiveConnection:Vpn">org.freedesktop.NetworkManager.Connection.Active:Vpn</primary></indexterm>
-<programlisting>
-Vpn  readable   b
-</programlisting>
-<para>        Whether this active connection is also a VPN connection.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Master">
-  <title>The "Master" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Master"><primary sortas="ActiveConnection:Master">org.freedesktop.NetworkManager.Connection.Active:Master</primary></indexterm>
-<programlisting>
-Master  readable   o
-</programlisting>
-<para>        The path to the master device if the connection is a slave.
-</para>
-</refsect2>
-</refsect1>
-</refentry>
-
diff --git a/introspection/nmdbus-agent-manager-org.freedesktop.NetworkManager.AgentManager.xml b/introspection/nmdbus-agent-manager-org.freedesktop.NetworkManager.AgentManager.xml
deleted file mode 100644
index 2f074cbe..00000000
--- a/introspection/nmdbus-agent-manager-org.freedesktop.NetworkManager.AgentManager.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-]>
-<refentry id="gdbus-org.freedesktop.NetworkManager.AgentManager">
-  <refmeta>    <refentrytitle role="top_of_page" id="gdbus-interface-org-freedesktop-NetworkManager-AgentManager.top_of_page">org.freedesktop.NetworkManager.AgentManager</refentrytitle>
-  <indexterm zone="gdbus-interface-org-freedesktop-NetworkManager-AgentManager.top_of_page"><primary sortas=".AgentManager">org.freedesktop.NetworkManager.AgentManager</primary></indexterm>
-  </refmeta>  <refnamediv>    <refname>org.freedesktop.NetworkManager.AgentManager</refname>    <refpurpose></refpurpose>  </refnamediv>  <refsynopsisdiv role="synopsis">
-    <title role="synopsis.title">Methods</title>
-    <synopsis>
-<link linkend="gdbus-method-org-freedesktop-NetworkManager-AgentManager.Register">Register</link>                 (IN  s identifier);
-<link linkend="gdbus-method-org-freedesktop-NetworkManager-AgentManager.RegisterWithCapabilities">RegisterWithCapabilities</link> (IN  s identifier,
-                          IN  u capabilities);
-<link linkend="gdbus-method-org-freedesktop-NetworkManager-AgentManager.Unregister">Unregister</link>               ();
-</synopsis>
-  </refsynopsisdiv>
-<refsect1 role="desc" id="gdbus-interface-org-freedesktop-NetworkManager-AgentManager">
-  <title role="desc.title">Description</title>
-  <para></para>
-</refsect1>
-<refsect1 role="details" id="gdbus-methods-org.freedesktop.NetworkManager.AgentManager">
-  <title role="details.title">Method Details</title>
-<refsect2 role="method" id="gdbus-method-org-freedesktop-NetworkManager-AgentManager.Register">
-  <title>The Register() method</title>
-  <indexterm zone="gdbus-method-org-freedesktop-NetworkManager-AgentManager.Register"><primary sortas=".AgentManager.Register">org.freedesktop.NetworkManager.AgentManager.Register()</primary></indexterm>
-<programlisting>
-Register (IN  s identifier);
-</programlisting>
-<para>        Called by secret Agents to register their ability to provide and save
-        network secrets.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>IN s <parameter>identifier</parameter></literal>:</term>
-  <listitem><para>Identifies this agent; only one agent in each user session may use the same identifier. Identifier formatting follows the same rules as D-Bus bus names with the exception that the ':' character is not allowed. The valid set of characters is "[A-Z][a-z][0-9]_-." and the identifier is limited in length to 255 characters with a minimum of 3 characters. An example valid identifier is 'org.gnome.nm-applet' (without quotes).</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-<refsect2 role="method" id="gdbus-method-org-freedesktop-NetworkManager-AgentManager.RegisterWithCapabilities">
-  <title>The RegisterWithCapabilities() method</title>
-  <indexterm zone="gdbus-method-org-freedesktop-NetworkManager-AgentManager.RegisterWithCapabilities"><primary sortas=".AgentManager.RegisterWithCapabilities">org.freedesktop.NetworkManager.AgentManager.RegisterWithCapabilities()</primary></indexterm>
-<programlisting>
-RegisterWithCapabilities (IN  s identifier,
-                          IN  u capabilities);
-</programlisting>
-<para>        Like Register() but indicates agent capabilities to NetworkManager.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>IN s <parameter>identifier</parameter></literal>:</term>
-  <listitem><para>See the Register() method's identifier argument.</para></listitem>
-</varlistentry>
-<varlistentry>
-  <term><literal>IN u <parameter>capabilities</parameter></literal>:</term>
-  <listitem><para>(<link linkend="NMSecretAgentCapabilities">NMSecretAgentCapabilities</link>) Indicates various agent capabilities to NetworkManager.</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-<refsect2 role="method" id="gdbus-method-org-freedesktop-NetworkManager-AgentManager.Unregister">
-  <title>The Unregister() method</title>
-  <indexterm zone="gdbus-method-org-freedesktop-NetworkManager-AgentManager.Unregister"><primary sortas=".AgentManager.Unregister">org.freedesktop.NetworkManager.AgentManager.Unregister()</primary></indexterm>
-<programlisting>
-Unregister ();
-</programlisting>
-<para>        Called by secret Agents to notify NetworkManager that they will no longer
-        handle requests for network secrets. Agents are automatically unregistered
-        when they disconnect from D-Bus.
-</para>
-</refsect2>
-</refsect1>
-</refentry>
-
diff --git a/introspection/nmdbus-device-adsl-org.freedesktop.NetworkManager.Device.Adsl.xml b/introspection/nmdbus-device-adsl-org.freedesktop.NetworkManager.Device.Adsl.xml
deleted file mode 100644
index b1e12b2f..00000000
--- a/introspection/nmdbus-device-adsl-org.freedesktop.NetworkManager.Device.Adsl.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-]>
-<refentry id="gdbus-org.freedesktop.NetworkManager.Device.Adsl">
-  <refmeta>    <refentrytitle role="top_of_page" id="gdbus-interface-org-freedesktop-NetworkManager-Device-Adsl.top_of_page">org.freedesktop.NetworkManager.Device.Adsl</refentrytitle>
-  <indexterm zone="gdbus-interface-org-freedesktop-NetworkManager-Device-Adsl.top_of_page"><primary sortas=".Device.Adsl">org.freedesktop.NetworkManager.Device.Adsl</primary></indexterm>
-  </refmeta>  <refnamediv>    <refname>org.freedesktop.NetworkManager.Device.Adsl</refname>    <refpurpose></refpurpose>  </refnamediv>  <refsect1 role="signal_proto">
-    <title role="signal_proto.title">Signals</title>
-    <synopsis>
-<link linkend="gdbus-signal-org-freedesktop-NetworkManager-Device-Adsl.PropertiesChanged">PropertiesChanged</link> (a{sv} properties);
-</synopsis>
-  </refsect1>
-  <refsect1 role="properties">
-    <title role="properties.title">Properties</title>
-    <synopsis>
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-Adsl.Carrier">Carrier</link>  readable   b
-</synopsis>
-  </refsect1>
-<refsect1 role="desc" id="gdbus-interface-org-freedesktop-NetworkManager-Device-Adsl">
-  <title role="desc.title">Description</title>
-  <para></para>
-</refsect1>
-<refsect1 role="details" id="gdbus-signals-org.freedesktop.NetworkManager.Device.Adsl">
-  <title role="details.title">Signal Details</title>
-<refsect2 role="signal" id="gdbus-signal-org-freedesktop-NetworkManager-Device-Adsl.PropertiesChanged">
-  <title>The "PropertiesChanged" signal</title>
-  <indexterm zone="gdbus-signal-org-freedesktop-NetworkManager-Device-Adsl.PropertiesChanged"><primary sortas=".Device.Adsl::PropertiesChanged">org.freedesktop.NetworkManager.Device.Adsl::PropertiesChanged</primary></indexterm>
-<programlisting>
-PropertiesChanged (a{sv} properties);
-</programlisting>
-<para>        DEPRECATED. Use the standard "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" instead which exists since version NetworkManager 1.2.0.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>a{sv} <parameter>properties</parameter></literal>:</term>
-  <listitem><para>A dictionary mapping property names to variant boxed values</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-</refsect1>
-<refsect1 role="details" id="gdbus-properties-org.freedesktop.NetworkManager.Device.Adsl">
-  <title role="details.title">Property Details</title>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Adsl.Carrier">
-  <title>The "Carrier" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-Adsl.Carrier"><primary sortas=".Device.Adsl:Carrier">org.freedesktop.NetworkManager.Device.Adsl:Carrier</primary></indexterm>
-<programlisting>
-Carrier  readable   b
-</programlisting>
-<para>        Indicates whether the physical carrier is found.
-</para>
-</refsect2>
-</refsect1>
-</refentry>
-
diff --git a/introspection/nmdbus-device-bond-org.freedesktop.NetworkManager.Device.Bond.xml b/introspection/nmdbus-device-bond-org.freedesktop.NetworkManager.Device.Bond.xml
deleted file mode 100644
index b44af671..00000000
--- a/introspection/nmdbus-device-bond-org.freedesktop.NetworkManager.Device.Bond.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-]>
-<refentry id="gdbus-org.freedesktop.NetworkManager.Device.Bond">
-  <refmeta>    <refentrytitle role="top_of_page" id="gdbus-interface-org-freedesktop-NetworkManager-Device-Bond.top_of_page">org.freedesktop.NetworkManager.Device.Bond</refentrytitle>
-  <indexterm zone="gdbus-interface-org-freedesktop-NetworkManager-Device-Bond.top_of_page"><primary sortas=".Device.Bond">org.freedesktop.NetworkManager.Device.Bond</primary></indexterm>
-  </refmeta>  <refnamediv>    <refname>org.freedesktop.NetworkManager.Device.Bond</refname>    <refpurpose></refpurpose>  </refnamediv>  <refsect1 role="signal_proto">
-    <title role="signal_proto.title">Signals</title>
-    <synopsis>
-<link linkend="gdbus-signal-org-freedesktop-NetworkManager-Device-Bond.PropertiesChanged">PropertiesChanged</link> (a{sv} properties);
-</synopsis>
-  </refsect1>
-  <refsect1 role="properties">
-    <title role="properties.title">Properties</title>
-    <synopsis>
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-Bond.HwAddress">HwAddress</link>  readable   s
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-Bond.Carrier">Carrier</link>    readable   b
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-Bond.Slaves">Slaves</link>     readable   ao
-</synopsis>
-  </refsect1>
-<refsect1 role="desc" id="gdbus-interface-org-freedesktop-NetworkManager-Device-Bond">
-  <title role="desc.title">Description</title>
-  <para></para>
-</refsect1>
-<refsect1 role="details" id="gdbus-signals-org.freedesktop.NetworkManager.Device.Bond">
-  <title role="details.title">Signal Details</title>
-<refsect2 role="signal" id="gdbus-signal-org-freedesktop-NetworkManager-Device-Bond.PropertiesChanged">
-  <title>The "PropertiesChanged" signal</title>
-  <indexterm zone="gdbus-signal-org-freedesktop-NetworkManager-Device-Bond.PropertiesChanged"><primary sortas=".Device.Bond::PropertiesChanged">org.freedesktop.NetworkManager.Device.Bond::PropertiesChanged</primary></indexterm>
-<programlisting>
-PropertiesChanged (a{sv} properties);
-</programlisting>
-<para>        DEPRECATED. Use the standard "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" instead which exists since version NetworkManager 1.2.0.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>a{sv} <parameter>properties</parameter></literal>:</term>
-  <listitem><para>A dictionary mapping property names to variant boxed values</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-</refsect1>
-<refsect1 role="details" id="gdbus-properties-org.freedesktop.NetworkManager.Device.Bond">
-  <title role="details.title">Property Details</title>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Bond.HwAddress">
-  <title>The "HwAddress" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-Bond.HwAddress"><primary sortas=".Device.Bond:HwAddress">org.freedesktop.NetworkManager.Device.Bond:HwAddress</primary></indexterm>
-<programlisting>
-HwAddress  readable   s
-</programlisting>
-<para>        Hardware address of the device.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Bond.Carrier">
-  <title>The "Carrier" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-Bond.Carrier"><primary sortas=".Device.Bond:Carrier">org.freedesktop.NetworkManager.Device.Bond:Carrier</primary></indexterm>
-<programlisting>
-Carrier  readable   b
-</programlisting>
-<para>        Indicates whether the physical carrier is found (e.g. whether a cable is
-        plugged in or not).
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Bond.Slaves">
-  <title>The "Slaves" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-Bond.Slaves"><primary sortas=".Device.Bond:Slaves">org.freedesktop.NetworkManager.Device.Bond:Slaves</primary></indexterm>
-<programlisting>
-Slaves  readable   ao
-</programlisting>
-<para>        Array of object paths representing devices which are currently slaved to
-        this device.
-</para>
-</refsect2>
-</refsect1>
-</refentry>
-
diff --git a/introspection/nmdbus-device-bridge-org.freedesktop.NetworkManager.Device.Bridge.xml b/introspection/nmdbus-device-bridge-org.freedesktop.NetworkManager.Device.Bridge.xml
deleted file mode 100644
index 2e34b368..00000000
--- a/introspection/nmdbus-device-bridge-org.freedesktop.NetworkManager.Device.Bridge.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-]>
-<refentry id="gdbus-org.freedesktop.NetworkManager.Device.Bridge">
-  <refmeta>    <refentrytitle role="top_of_page" id="gdbus-interface-org-freedesktop-NetworkManager-Device-Bridge.top_of_page">org.freedesktop.NetworkManager.Device.Bridge</refentrytitle>
-  <indexterm zone="gdbus-interface-org-freedesktop-NetworkManager-Device-Bridge.top_of_page"><primary sortas=".Device.Bridge">org.freedesktop.NetworkManager.Device.Bridge</primary></indexterm>
-  </refmeta>  <refnamediv>    <refname>org.freedesktop.NetworkManager.Device.Bridge</refname>    <refpurpose></refpurpose>  </refnamediv>  <refsect1 role="signal_proto">
-    <title role="signal_proto.title">Signals</title>
-    <synopsis>
-<link linkend="gdbus-signal-org-freedesktop-NetworkManager-Device-Bridge.PropertiesChanged">PropertiesChanged</link> (a{sv} properties);
-</synopsis>
-  </refsect1>
-  <refsect1 role="properties">
-    <title role="properties.title">Properties</title>
-    <synopsis>
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-Bridge.HwAddress">HwAddress</link>  readable   s
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-Bridge.Carrier">Carrier</link>    readable   b
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-Bridge.Slaves">Slaves</link>     readable   ao
-</synopsis>
-  </refsect1>
-<refsect1 role="desc" id="gdbus-interface-org-freedesktop-NetworkManager-Device-Bridge">
-  <title role="desc.title">Description</title>
-  <para></para>
-</refsect1>
-<refsect1 role="details" id="gdbus-signals-org.freedesktop.NetworkManager.Device.Bridge">
-  <title role="details.title">Signal Details</title>
-<refsect2 role="signal" id="gdbus-signal-org-freedesktop-NetworkManager-Device-Bridge.PropertiesChanged">
-  <title>The "PropertiesChanged" signal</title>
-  <indexterm zone="gdbus-signal-org-freedesktop-NetworkManager-Device-Bridge.PropertiesChanged"><primary sortas=".Device.Bridge::PropertiesChanged">org.freedesktop.NetworkManager.Device.Bridge::PropertiesChanged</primary></indexterm>
-<programlisting>
-PropertiesChanged (a{sv} properties);
-</programlisting>
-<para>        DEPRECATED. Use the standard "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" instead which exists since version NetworkManager 1.2.0.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>a{sv} <parameter>properties</parameter></literal>:</term>
-  <listitem><para>A dictionary mapping property names to variant boxed values</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-</refsect1>
-<refsect1 role="details" id="gdbus-properties-org.freedesktop.NetworkManager.Device.Bridge">
-  <title role="details.title">Property Details</title>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Bridge.HwAddress">
-  <title>The "HwAddress" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-Bridge.HwAddress"><primary sortas=".Device.Bridge:HwAddress">org.freedesktop.NetworkManager.Device.Bridge:HwAddress</primary></indexterm>
-<programlisting>
-HwAddress  readable   s
-</programlisting>
-<para>        Hardware address of the device.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Bridge.Carrier">
-  <title>The "Carrier" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-Bridge.Carrier"><primary sortas=".Device.Bridge:Carrier">org.freedesktop.NetworkManager.Device.Bridge:Carrier</primary></indexterm>
-<programlisting>
-Carrier  readable   b
-</programlisting>
-<para>        Indicates whether the physical carrier is found (e.g. whether a cable is
-        plugged in or not).
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Bridge.Slaves">
-  <title>The "Slaves" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-Bridge.Slaves"><primary sortas=".Device.Bridge:Slaves">org.freedesktop.NetworkManager.Device.Bridge:Slaves</primary></indexterm>
-<programlisting>
-Slaves  readable   ao
-</programlisting>
-<para>        Array of object paths representing devices which are currently slaved to
-        this device.
-</para>
-</refsect2>
-</refsect1>
-</refentry>
-
diff --git a/introspection/nmdbus-device-bt-org.freedesktop.NetworkManager.Device.Bluetooth.xml b/introspection/nmdbus-device-bt-org.freedesktop.NetworkManager.Device.Bluetooth.xml
deleted file mode 100644
index ceb4f70c..00000000
--- a/introspection/nmdbus-device-bt-org.freedesktop.NetworkManager.Device.Bluetooth.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-]>
-<refentry id="gdbus-org.freedesktop.NetworkManager.Device.Bluetooth">
-  <refmeta>    <refentrytitle role="top_of_page" id="gdbus-interface-org-freedesktop-NetworkManager-Device-Bluetooth.top_of_page">org.freedesktop.NetworkManager.Device.Bluetooth</refentrytitle>
-  <indexterm zone="gdbus-interface-org-freedesktop-NetworkManager-Device-Bluetooth.top_of_page"><primary sortas=".Device.Bluetooth">org.freedesktop.NetworkManager.Device.Bluetooth</primary></indexterm>
-  </refmeta>  <refnamediv>    <refname>org.freedesktop.NetworkManager.Device.Bluetooth</refname>    <refpurpose></refpurpose>  </refnamediv>  <refsect1 role="signal_proto">
-    <title role="signal_proto.title">Signals</title>
-    <synopsis>
-<link linkend="gdbus-signal-org-freedesktop-NetworkManager-Device-Bluetooth.PropertiesChanged">PropertiesChanged</link> (a{sv} properties);
-</synopsis>
-  </refsect1>
-  <refsect1 role="properties">
-    <title role="properties.title">Properties</title>
-    <synopsis>
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-Bluetooth.HwAddress">HwAddress</link>       readable   s
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-Bluetooth.Name">Name</link>            readable   s
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-Bluetooth.BtCapabilities">BtCapabilities</link>  readable   u
-</synopsis>
-  </refsect1>
-<refsect1 role="desc" id="gdbus-interface-org-freedesktop-NetworkManager-Device-Bluetooth">
-  <title role="desc.title">Description</title>
-  <para></para>
-</refsect1>
-<refsect1 role="details" id="gdbus-signals-org.freedesktop.NetworkManager.Device.Bluetooth">
-  <title role="details.title">Signal Details</title>
-<refsect2 role="signal" id="gdbus-signal-org-freedesktop-NetworkManager-Device-Bluetooth.PropertiesChanged">
-  <title>The "PropertiesChanged" signal</title>
-  <indexterm zone="gdbus-signal-org-freedesktop-NetworkManager-Device-Bluetooth.PropertiesChanged"><primary sortas=".Device.Bluetooth::PropertiesChanged">org.freedesktop.NetworkManager.Device.Bluetooth::PropertiesChanged</primary></indexterm>
-<programlisting>
-PropertiesChanged (a{sv} properties);
-</programlisting>
-<para>        DEPRECATED. Use the standard "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" instead which exists since version NetworkManager 1.2.0.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>a{sv} <parameter>properties</parameter></literal>:</term>
-  <listitem><para>A dictionary mapping property names to variant boxed values</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-</refsect1>
-<refsect1 role="details" id="gdbus-properties-org.freedesktop.NetworkManager.Device.Bluetooth">
-  <title role="details.title">Property Details</title>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Bluetooth.HwAddress">
-  <title>The "HwAddress" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-Bluetooth.HwAddress"><primary sortas=".Device.Bluetooth:HwAddress">org.freedesktop.NetworkManager.Device.Bluetooth:HwAddress</primary></indexterm>
-<programlisting>
-HwAddress  readable   s
-</programlisting>
-<para>        Bluetooth hardware address of the device.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Bluetooth.Name">
-  <title>The "Name" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-Bluetooth.Name"><primary sortas=".Device.Bluetooth:Name">org.freedesktop.NetworkManager.Device.Bluetooth:Name</primary></indexterm>
-<programlisting>
-Name  readable   s
-</programlisting>
-<para>        Bluetooth name of the device.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Bluetooth.BtCapabilities">
-  <title>The "BtCapabilities" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-Bluetooth.BtCapabilities"><primary sortas=".Device.Bluetooth:BtCapabilities">org.freedesktop.NetworkManager.Device.Bluetooth:BtCapabilities</primary></indexterm>
-<programlisting>
-BtCapabilities  readable   u
-</programlisting>
-<para>        Bluetooth capabilities of the device (either DUN or NAP).
-</para><para>        Returns: <link linkend="NMBluetoothCapabilities">NMBluetoothCapabilities</link>
-</para>
-</refsect2>
-</refsect1>
-</refentry>
-
diff --git a/introspection/nmdbus-device-ethernet-org.freedesktop.NetworkManager.Device.Wired.xml b/introspection/nmdbus-device-ethernet-org.freedesktop.NetworkManager.Device.Wired.xml
deleted file mode 100644
index adf7e35a..00000000
--- a/introspection/nmdbus-device-ethernet-org.freedesktop.NetworkManager.Device.Wired.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-]>
-<refentry id="gdbus-org.freedesktop.NetworkManager.Device.Wired">
-  <refmeta>    <refentrytitle role="top_of_page" id="gdbus-interface-org-freedesktop-NetworkManager-Device-Wired.top_of_page">org.freedesktop.NetworkManager.Device.Wired</refentrytitle>
-  <indexterm zone="gdbus-interface-org-freedesktop-NetworkManager-Device-Wired.top_of_page"><primary sortas="DeviceEthernet">org.freedesktop.NetworkManager.Device.Wired</primary></indexterm>
-  </refmeta>  <refnamediv>    <refname>org.freedesktop.NetworkManager.Device.Wired</refname>    <refpurpose></refpurpose>  </refnamediv>  <refsect1 role="signal_proto">
-    <title role="signal_proto.title">Signals</title>
-    <synopsis>
-<link linkend="gdbus-signal-org-freedesktop-NetworkManager-Device-Wired.PropertiesChanged">PropertiesChanged</link> (a{sv} properties);
-</synopsis>
-  </refsect1>
-  <refsect1 role="properties">
-    <title role="properties.title">Properties</title>
-    <synopsis>
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-Wired.HwAddress">HwAddress</link>        readable   s
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-Wired.PermHwAddress">PermHwAddress</link>    readable   s
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-Wired.Speed">Speed</link>            readable   u
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-Wired.S390Subchannels">S390Subchannels</link>  readable   as
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-Wired.Carrier">Carrier</link>          readable   b
-</synopsis>
-  </refsect1>
-<refsect1 role="desc" id="gdbus-interface-org-freedesktop-NetworkManager-Device-Wired">
-  <title role="desc.title">Description</title>
-  <para></para>
-</refsect1>
-<refsect1 role="details" id="gdbus-signals-org.freedesktop.NetworkManager.Device.Wired">
-  <title role="details.title">Signal Details</title>
-<refsect2 role="signal" id="gdbus-signal-org-freedesktop-NetworkManager-Device-Wired.PropertiesChanged">
-  <title>The "PropertiesChanged" signal</title>
-  <indexterm zone="gdbus-signal-org-freedesktop-NetworkManager-Device-Wired.PropertiesChanged"><primary sortas="DeviceEthernet::PropertiesChanged">org.freedesktop.NetworkManager.Device.Wired::PropertiesChanged</primary></indexterm>
-<programlisting>
-PropertiesChanged (a{sv} properties);
-</programlisting>
-<para>        DEPRECATED. Use the standard "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" instead which exists since version NetworkManager 1.2.0.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>a{sv} <parameter>properties</parameter></literal>:</term>
-  <listitem><para>A dictionary mapping property names to variant boxed values</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-</refsect1>
-<refsect1 role="details" id="gdbus-properties-org.freedesktop.NetworkManager.Device.Wired">
-  <title role="details.title">Property Details</title>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Wired.HwAddress">
-  <title>The "HwAddress" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-Wired.HwAddress"><primary sortas="DeviceEthernet:HwAddress">org.freedesktop.NetworkManager.Device.Wired:HwAddress</primary></indexterm>
-<programlisting>
-HwAddress  readable   s
-</programlisting>
-<para>        Active hardware address of the device.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Wired.PermHwAddress">
-  <title>The "PermHwAddress" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-Wired.PermHwAddress"><primary sortas="DeviceEthernet:PermHwAddress">org.freedesktop.NetworkManager.Device.Wired:PermHwAddress</primary></indexterm>
-<programlisting>
-PermHwAddress  readable   s
-</programlisting>
-<para>        Permanent hardware address of the device.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Wired.Speed">
-  <title>The "Speed" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-Wired.Speed"><primary sortas="DeviceEthernet:Speed">org.freedesktop.NetworkManager.Device.Wired:Speed</primary></indexterm>
-<programlisting>
-Speed  readable   u
-</programlisting>
-<para>        Design speed of the device, in megabits/second (Mb/s).
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Wired.S390Subchannels">
-  <title>The "S390Subchannels" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-Wired.S390Subchannels"><primary sortas="DeviceEthernet:S390Subchannels">org.freedesktop.NetworkManager.Device.Wired:S390Subchannels</primary></indexterm>
-<programlisting>
-S390Subchannels  readable   as
-</programlisting>
-<para>        Array of S/390 subchannels for S/390 or z/Architecture devices.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Wired.Carrier">
-  <title>The "Carrier" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-Wired.Carrier"><primary sortas="DeviceEthernet:Carrier">org.freedesktop.NetworkManager.Device.Wired:Carrier</primary></indexterm>
-<programlisting>
-Carrier  readable   b
-</programlisting>
-<para>        Indicates whether the physical carrier is found (e.g. whether a cable is
-        plugged in or not).
-</para>
-</refsect2>
-</refsect1>
-</refentry>
-
diff --git a/introspection/nmdbus-device-generic-org.freedesktop.NetworkManager.Device.Generic.xml b/introspection/nmdbus-device-generic-org.freedesktop.NetworkManager.Device.Generic.xml
deleted file mode 100644
index ea7761f7..00000000
--- a/introspection/nmdbus-device-generic-org.freedesktop.NetworkManager.Device.Generic.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-]>
-<refentry id="gdbus-org.freedesktop.NetworkManager.Device.Generic">
-  <refmeta>    <refentrytitle role="top_of_page" id="gdbus-interface-org-freedesktop-NetworkManager-Device-Generic.top_of_page">org.freedesktop.NetworkManager.Device.Generic</refentrytitle>
-  <indexterm zone="gdbus-interface-org-freedesktop-NetworkManager-Device-Generic.top_of_page"><primary sortas=".Device.Generic">org.freedesktop.NetworkManager.Device.Generic</primary></indexterm>
-  </refmeta>  <refnamediv>    <refname>org.freedesktop.NetworkManager.Device.Generic</refname>    <refpurpose></refpurpose>  </refnamediv>  <refsect1 role="signal_proto">
-    <title role="signal_proto.title">Signals</title>
-    <synopsis>
-<link linkend="gdbus-signal-org-freedesktop-NetworkManager-Device-Generic.PropertiesChanged">PropertiesChanged</link> (a{sv} properties);
-</synopsis>
-  </refsect1>
-  <refsect1 role="properties">
-    <title role="properties.title">Properties</title>
-    <synopsis>
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-Generic.HwAddress">HwAddress</link>        readable   s
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-Generic.TypeDescription">TypeDescription</link>  readable   s
-</synopsis>
-  </refsect1>
-<refsect1 role="desc" id="gdbus-interface-org-freedesktop-NetworkManager-Device-Generic">
-  <title role="desc.title">Description</title>
-  <para></para>
-</refsect1>
-<refsect1 role="details" id="gdbus-signals-org.freedesktop.NetworkManager.Device.Generic">
-  <title role="details.title">Signal Details</title>
-<refsect2 role="signal" id="gdbus-signal-org-freedesktop-NetworkManager-Device-Generic.PropertiesChanged">
-  <title>The "PropertiesChanged" signal</title>
-  <indexterm zone="gdbus-signal-org-freedesktop-NetworkManager-Device-Generic.PropertiesChanged"><primary sortas=".Device.Generic::PropertiesChanged">org.freedesktop.NetworkManager.Device.Generic::PropertiesChanged</primary></indexterm>
-<programlisting>
-PropertiesChanged (a{sv} properties);
-</programlisting>
-<para>        DEPRECATED. Use the standard "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" instead which exists since version NetworkManager 1.2.0.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>a{sv} <parameter>properties</parameter></literal>:</term>
-  <listitem><para>A dictionary mapping property names to variant boxed values</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-</refsect1>
-<refsect1 role="details" id="gdbus-properties-org.freedesktop.NetworkManager.Device.Generic">
-  <title role="details.title">Property Details</title>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Generic.HwAddress">
-  <title>The "HwAddress" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-Generic.HwAddress"><primary sortas=".Device.Generic:HwAddress">org.freedesktop.NetworkManager.Device.Generic:HwAddress</primary></indexterm>
-<programlisting>
-HwAddress  readable   s
-</programlisting>
-<para>        Hardware address of the device.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Generic.TypeDescription">
-  <title>The "TypeDescription" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-Generic.TypeDescription"><primary sortas=".Device.Generic:TypeDescription">org.freedesktop.NetworkManager.Device.Generic:TypeDescription</primary></indexterm>
-<programlisting>
-TypeDescription  readable   s
-</programlisting>
-<para>        A (non-localized) description of the interface type, if known.
-</para>
-</refsect2>
-</refsect1>
-</refentry>
-
diff --git a/introspection/nmdbus-device-infiniband-org.freedesktop.NetworkManager.Device.Infiniband.xml b/introspection/nmdbus-device-infiniband-org.freedesktop.NetworkManager.Device.Infiniband.xml
deleted file mode 100644
index b48327a7..00000000
--- a/introspection/nmdbus-device-infiniband-org.freedesktop.NetworkManager.Device.Infiniband.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-]>
-<refentry id="gdbus-org.freedesktop.NetworkManager.Device.Infiniband">
-  <refmeta>    <refentrytitle role="top_of_page" id="gdbus-interface-org-freedesktop-NetworkManager-Device-Infiniband.top_of_page">org.freedesktop.NetworkManager.Device.Infiniband</refentrytitle>
-  <indexterm zone="gdbus-interface-org-freedesktop-NetworkManager-Device-Infiniband.top_of_page"><primary sortas=".Device.Infiniband">org.freedesktop.NetworkManager.Device.Infiniband</primary></indexterm>
-  </refmeta>  <refnamediv>    <refname>org.freedesktop.NetworkManager.Device.Infiniband</refname>    <refpurpose></refpurpose>  </refnamediv>  <refsect1 role="signal_proto">
-    <title role="signal_proto.title">Signals</title>
-    <synopsis>
-<link linkend="gdbus-signal-org-freedesktop-NetworkManager-Device-Infiniband.PropertiesChanged">PropertiesChanged</link> (a{sv} properties);
-</synopsis>
-  </refsect1>
-  <refsect1 role="properties">
-    <title role="properties.title">Properties</title>
-    <synopsis>
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-Infiniband.HwAddress">HwAddress</link>  readable   s
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-Infiniband.Carrier">Carrier</link>    readable   b
-</synopsis>
-  </refsect1>
-<refsect1 role="desc" id="gdbus-interface-org-freedesktop-NetworkManager-Device-Infiniband">
-  <title role="desc.title">Description</title>
-  <para></para>
-</refsect1>
-<refsect1 role="details" id="gdbus-signals-org.freedesktop.NetworkManager.Device.Infiniband">
-  <title role="details.title">Signal Details</title>
-<refsect2 role="signal" id="gdbus-signal-org-freedesktop-NetworkManager-Device-Infiniband.PropertiesChanged">
-  <title>The "PropertiesChanged" signal</title>
-  <indexterm zone="gdbus-signal-org-freedesktop-NetworkManager-Device-Infiniband.PropertiesChanged"><primary sortas=".Device.Infiniband::PropertiesChanged">org.freedesktop.NetworkManager.Device.Infiniband::PropertiesChanged</primary></indexterm>
-<programlisting>
-PropertiesChanged (a{sv} properties);
-</programlisting>
-<para>        DEPRECATED. Use the standard "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" instead which exists since version NetworkManager 1.2.0.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>a{sv} <parameter>properties</parameter></literal>:</term>
-  <listitem><para>A dictionary mapping property names to variant boxed values</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-</refsect1>
-<refsect1 role="details" id="gdbus-properties-org.freedesktop.NetworkManager.Device.Infiniband">
-  <title role="details.title">Property Details</title>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Infiniband.HwAddress">
-  <title>The "HwAddress" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-Infiniband.HwAddress"><primary sortas=".Device.Infiniband:HwAddress">org.freedesktop.NetworkManager.Device.Infiniband:HwAddress</primary></indexterm>
-<programlisting>
-HwAddress  readable   s
-</programlisting>
-<para>        Hardware address of the device.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Infiniband.Carrier">
-  <title>The "Carrier" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-Infiniband.Carrier"><primary sortas=".Device.Infiniband:Carrier">org.freedesktop.NetworkManager.Device.Infiniband:Carrier</primary></indexterm>
-<programlisting>
-Carrier  readable   b
-</programlisting>
-<para>        Indicates whether the physical carrier is found (e.g. whether a cable is
-        plugged in or not).
-</para>
-</refsect2>
-</refsect1>
-</refentry>
-
diff --git a/introspection/nmdbus-device-ip-tunnel-org.freedesktop.NetworkManager.Device.IPTunnel.xml b/introspection/nmdbus-device-ip-tunnel-org.freedesktop.NetworkManager.Device.IPTunnel.xml
deleted file mode 100644
index 9e25e3d4..00000000
--- a/introspection/nmdbus-device-ip-tunnel-org.freedesktop.NetworkManager.Device.IPTunnel.xml
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-]>
-<refentry id="gdbus-org.freedesktop.NetworkManager.Device.IPTunnel">
-  <refmeta>    <refentrytitle role="top_of_page" id="gdbus-interface-org-freedesktop-NetworkManager-Device-IPTunnel.top_of_page">org.freedesktop.NetworkManager.Device.IPTunnel</refentrytitle>
-  <indexterm zone="gdbus-interface-org-freedesktop-NetworkManager-Device-IPTunnel.top_of_page"><primary sortas=".Device.IPTunnel">org.freedesktop.NetworkManager.Device.IPTunnel</primary></indexterm>
-  </refmeta>  <refnamediv>    <refname>org.freedesktop.NetworkManager.Device.IPTunnel</refname>    <refpurpose></refpurpose>  </refnamediv>  <refsect1 role="signal_proto">
-    <title role="signal_proto.title">Signals</title>
-    <synopsis>
-<link linkend="gdbus-signal-org-freedesktop-NetworkManager-Device-IPTunnel.PropertiesChanged">PropertiesChanged</link> (a{sv} properties);
-</synopsis>
-  </refsect1>
-  <refsect1 role="properties">
-    <title role="properties.title">Properties</title>
-    <synopsis>
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-IPTunnel.Mode">Mode</link>                readable   u
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-IPTunnel.Parent">Parent</link>              readable   o
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-IPTunnel.Local">Local</link>               readable   s
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-IPTunnel.Remote">Remote</link>              readable   s
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-IPTunnel.Ttl">Ttl</link>                 readable   y
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-IPTunnel.Tos">Tos</link>                 readable   y
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-IPTunnel.PathMtuDiscovery">PathMtuDiscovery</link>    readable   b
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-IPTunnel.InputKey">InputKey</link>            readable   s
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-IPTunnel.OutputKey">OutputKey</link>           readable   s
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-IPTunnel.EncapsulationLimit">EncapsulationLimit</link>  readable   y
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-IPTunnel.FlowLabel">FlowLabel</link>           readable   u
-</synopsis>
-  </refsect1>
-<refsect1 role="desc" id="gdbus-interface-org-freedesktop-NetworkManager-Device-IPTunnel">
-  <title role="desc.title">Description</title>
-  <para></para>
-</refsect1>
-<refsect1 role="details" id="gdbus-signals-org.freedesktop.NetworkManager.Device.IPTunnel">
-  <title role="details.title">Signal Details</title>
-<refsect2 role="signal" id="gdbus-signal-org-freedesktop-NetworkManager-Device-IPTunnel.PropertiesChanged">
-  <title>The "PropertiesChanged" signal</title>
-  <indexterm zone="gdbus-signal-org-freedesktop-NetworkManager-Device-IPTunnel.PropertiesChanged"><primary sortas=".Device.IPTunnel::PropertiesChanged">org.freedesktop.NetworkManager.Device.IPTunnel::PropertiesChanged</primary></indexterm>
-<programlisting>
-PropertiesChanged (a{sv} properties);
-</programlisting>
-<para>        DEPRECATED. Use the standard "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" instead which exists since version NetworkManager 1.2.0.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>a{sv} <parameter>properties</parameter></literal>:</term>
-  <listitem><para>A dictionary mapping property names to variant boxed values</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-</refsect1>
-<refsect1 role="details" id="gdbus-properties-org.freedesktop.NetworkManager.Device.IPTunnel">
-  <title role="details.title">Property Details</title>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-IPTunnel.Mode">
-  <title>The "Mode" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-IPTunnel.Mode"><primary sortas=".Device.IPTunnel:Mode">org.freedesktop.NetworkManager.Device.IPTunnel:Mode</primary></indexterm>
-<programlisting>
-Mode  readable   u
-</programlisting>
-<para>        The tunneling mode.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-IPTunnel.Parent">
-  <title>The "Parent" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-IPTunnel.Parent"><primary sortas=".Device.IPTunnel:Parent">org.freedesktop.NetworkManager.Device.IPTunnel:Parent</primary></indexterm>
-<programlisting>
-Parent  readable   o
-</programlisting>
-<para>        The object path of the parent device.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-IPTunnel.Local">
-  <title>The "Local" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-IPTunnel.Local"><primary sortas=".Device.IPTunnel:Local">org.freedesktop.NetworkManager.Device.IPTunnel:Local</primary></indexterm>
-<programlisting>
-Local  readable   s
-</programlisting>
-<para>        The local endpoint of the tunnel.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-IPTunnel.Remote">
-  <title>The "Remote" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-IPTunnel.Remote"><primary sortas=".Device.IPTunnel:Remote">org.freedesktop.NetworkManager.Device.IPTunnel:Remote</primary></indexterm>
-<programlisting>
-Remote  readable   s
-</programlisting>
-<para>        The remote endpoint of the tunnel.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-IPTunnel.Ttl">
-  <title>The "Ttl" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-IPTunnel.Ttl"><primary sortas=".Device.IPTunnel:Ttl">org.freedesktop.NetworkManager.Device.IPTunnel:Ttl</primary></indexterm>
-<programlisting>
-Ttl  readable   y
-</programlisting>
-<para>        The TTL assigned to tunneled packets. 0 is a special value meaning that
-        packets inherit the TTL value
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-IPTunnel.Tos">
-  <title>The "Tos" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-IPTunnel.Tos"><primary sortas=".Device.IPTunnel:Tos">org.freedesktop.NetworkManager.Device.IPTunnel:Tos</primary></indexterm>
-<programlisting>
-Tos  readable   y
-</programlisting>
-<para>        The type of service (IPv4) or traffic class (IPv6) assigned to tunneled
-        packets.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-IPTunnel.PathMtuDiscovery">
-  <title>The "PathMtuDiscovery" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-IPTunnel.PathMtuDiscovery"><primary sortas=".Device.IPTunnel:PathMtuDiscovery">org.freedesktop.NetworkManager.Device.IPTunnel:PathMtuDiscovery</primary></indexterm>
-<programlisting>
-PathMtuDiscovery  readable   b
-</programlisting>
-<para>        Whether path MTU discovery is enabled on this tunnel.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-IPTunnel.InputKey">
-  <title>The "InputKey" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-IPTunnel.InputKey"><primary sortas=".Device.IPTunnel:InputKey">org.freedesktop.NetworkManager.Device.IPTunnel:InputKey</primary></indexterm>
-<programlisting>
-InputKey  readable   s
-</programlisting>
-<para>        The key used for incoming packets.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-IPTunnel.OutputKey">
-  <title>The "OutputKey" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-IPTunnel.OutputKey"><primary sortas=".Device.IPTunnel:OutputKey">org.freedesktop.NetworkManager.Device.IPTunnel:OutputKey</primary></indexterm>
-<programlisting>
-OutputKey  readable   s
-</programlisting>
-<para>        The key used for outgoing packets.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-IPTunnel.EncapsulationLimit">
-  <title>The "EncapsulationLimit" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-IPTunnel.EncapsulationLimit"><primary sortas=".Device.IPTunnel:EncapsulationLimit">org.freedesktop.NetworkManager.Device.IPTunnel:EncapsulationLimit</primary></indexterm>
-<programlisting>
-EncapsulationLimit  readable   y
-</programlisting>
-<para>        How many additional levels of encapsulation are permitted to be prepended
-        to packets. This property applies only to IPv6 tunnels.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-IPTunnel.FlowLabel">
-  <title>The "FlowLabel" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-IPTunnel.FlowLabel"><primary sortas=".Device.IPTunnel:FlowLabel">org.freedesktop.NetworkManager.Device.IPTunnel:FlowLabel</primary></indexterm>
-<programlisting>
-FlowLabel  readable   u
-</programlisting>
-<para>        The flow label to assign to tunnel packets. This property applies only to
-        IPv6 tunnels.
-</para>
-</refsect2>
-</refsect1>
-</refentry>
-
diff --git a/introspection/nmdbus-device-macvlan-org.freedesktop.NetworkManager.Device.Macvlan.xml b/introspection/nmdbus-device-macvlan-org.freedesktop.NetworkManager.Device.Macvlan.xml
deleted file mode 100644
index 644550fa..00000000
--- a/introspection/nmdbus-device-macvlan-org.freedesktop.NetworkManager.Device.Macvlan.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-]>
-<refentry id="gdbus-org.freedesktop.NetworkManager.Device.Macvlan">
-  <refmeta>    <refentrytitle role="top_of_page" id="gdbus-interface-org-freedesktop-NetworkManager-Device-Macvlan.top_of_page">org.freedesktop.NetworkManager.Device.Macvlan</refentrytitle>
-  <indexterm zone="gdbus-interface-org-freedesktop-NetworkManager-Device-Macvlan.top_of_page"><primary sortas=".Device.Macvlan">org.freedesktop.NetworkManager.Device.Macvlan</primary></indexterm>
-  </refmeta>  <refnamediv>    <refname>org.freedesktop.NetworkManager.Device.Macvlan</refname>    <refpurpose></refpurpose>  </refnamediv>  <refsect1 role="signal_proto">
-    <title role="signal_proto.title">Signals</title>
-    <synopsis>
-<link linkend="gdbus-signal-org-freedesktop-NetworkManager-Device-Macvlan.PropertiesChanged">PropertiesChanged</link> (a{sv} properties);
-</synopsis>
-  </refsect1>
-  <refsect1 role="properties">
-    <title role="properties.title">Properties</title>
-    <synopsis>
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-Macvlan.Parent">Parent</link>     readable   o
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-Macvlan.Mode">Mode</link>       readable   s
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-Macvlan.NoPromisc">NoPromisc</link>  readable   b
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-Macvlan.Tap">Tap</link>        readable   b
-</synopsis>
-  </refsect1>
-<refsect1 role="desc" id="gdbus-interface-org-freedesktop-NetworkManager-Device-Macvlan">
-  <title role="desc.title">Description</title>
-  <para></para>
-</refsect1>
-<refsect1 role="details" id="gdbus-signals-org.freedesktop.NetworkManager.Device.Macvlan">
-  <title role="details.title">Signal Details</title>
-<refsect2 role="signal" id="gdbus-signal-org-freedesktop-NetworkManager-Device-Macvlan.PropertiesChanged">
-  <title>The "PropertiesChanged" signal</title>
-  <indexterm zone="gdbus-signal-org-freedesktop-NetworkManager-Device-Macvlan.PropertiesChanged"><primary sortas=".Device.Macvlan::PropertiesChanged">org.freedesktop.NetworkManager.Device.Macvlan::PropertiesChanged</primary></indexterm>
-<programlisting>
-PropertiesChanged (a{sv} properties);
-</programlisting>
-<para>        DEPRECATED. Use the standard "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" instead which exists since version NetworkManager 1.2.0.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>a{sv} <parameter>properties</parameter></literal>:</term>
-  <listitem><para>A dictionary mapping property names to variant boxed values</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-</refsect1>
-<refsect1 role="details" id="gdbus-properties-org.freedesktop.NetworkManager.Device.Macvlan">
-  <title role="details.title">Property Details</title>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Macvlan.Parent">
-  <title>The "Parent" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-Macvlan.Parent"><primary sortas=".Device.Macvlan:Parent">org.freedesktop.NetworkManager.Device.Macvlan:Parent</primary></indexterm>
-<programlisting>
-Parent  readable   o
-</programlisting>
-<para>        The object path of the parent device.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Macvlan.Mode">
-  <title>The "Mode" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-Macvlan.Mode"><primary sortas=".Device.Macvlan:Mode">org.freedesktop.NetworkManager.Device.Macvlan:Mode</primary></indexterm>
-<programlisting>
-Mode  readable   s
-</programlisting>
-<para>        The macvlan mode, one of "private", "vepa", "bridge", or "passthru".
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Macvlan.NoPromisc">
-  <title>The "NoPromisc" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-Macvlan.NoPromisc"><primary sortas=".Device.Macvlan:NoPromisc">org.freedesktop.NetworkManager.Device.Macvlan:NoPromisc</primary></indexterm>
-<programlisting>
-NoPromisc  readable   b
-</programlisting>
-<para>        Whether the device is blocked from going into promiscuous mode.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Macvlan.Tap">
-  <title>The "Tap" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-Macvlan.Tap"><primary sortas=".Device.Macvlan:Tap">org.freedesktop.NetworkManager.Device.Macvlan:Tap</primary></indexterm>
-<programlisting>
-Tap  readable   b
-</programlisting>
-<para>        Whether the device is a macvtap.
-</para>
-</refsect2>
-</refsect1>
-</refentry>
-
diff --git a/introspection/nmdbus-device-modem-org.freedesktop.NetworkManager.Device.Modem.xml b/introspection/nmdbus-device-modem-org.freedesktop.NetworkManager.Device.Modem.xml
deleted file mode 100644
index 7841771d..00000000
--- a/introspection/nmdbus-device-modem-org.freedesktop.NetworkManager.Device.Modem.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-]>
-<refentry id="gdbus-org.freedesktop.NetworkManager.Device.Modem">
-  <refmeta>    <refentrytitle role="top_of_page" id="gdbus-interface-org-freedesktop-NetworkManager-Device-Modem.top_of_page">org.freedesktop.NetworkManager.Device.Modem</refentrytitle>
-  <indexterm zone="gdbus-interface-org-freedesktop-NetworkManager-Device-Modem.top_of_page"><primary sortas=".Device.Modem">org.freedesktop.NetworkManager.Device.Modem</primary></indexterm>
-  </refmeta>  <refnamediv>    <refname>org.freedesktop.NetworkManager.Device.Modem</refname>    <refpurpose></refpurpose>  </refnamediv>  <refsect1 role="signal_proto">
-    <title role="signal_proto.title">Signals</title>
-    <synopsis>
-<link linkend="gdbus-signal-org-freedesktop-NetworkManager-Device-Modem.PropertiesChanged">PropertiesChanged</link> (a{sv} properties);
-</synopsis>
-  </refsect1>
-  <refsect1 role="properties">
-    <title role="properties.title">Properties</title>
-    <synopsis>
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-Modem.ModemCapabilities">ModemCapabilities</link>    readable   u
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-Modem.CurrentCapabilities">CurrentCapabilities</link>  readable   u
-</synopsis>
-  </refsect1>
-<refsect1 role="desc" id="gdbus-interface-org-freedesktop-NetworkManager-Device-Modem">
-  <title role="desc.title">Description</title>
-  <para></para>
-</refsect1>
-<refsect1 role="details" id="gdbus-signals-org.freedesktop.NetworkManager.Device.Modem">
-  <title role="details.title">Signal Details</title>
-<refsect2 role="signal" id="gdbus-signal-org-freedesktop-NetworkManager-Device-Modem.PropertiesChanged">
-  <title>The "PropertiesChanged" signal</title>
-  <indexterm zone="gdbus-signal-org-freedesktop-NetworkManager-Device-Modem.PropertiesChanged"><primary sortas=".Device.Modem::PropertiesChanged">org.freedesktop.NetworkManager.Device.Modem::PropertiesChanged</primary></indexterm>
-<programlisting>
-PropertiesChanged (a{sv} properties);
-</programlisting>
-<para>        DEPRECATED. Use the standard "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" instead which exists since version NetworkManager 1.2.0.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>a{sv} <parameter>properties</parameter></literal>:</term>
-  <listitem><para>A dictionary mapping property names to variant boxed values</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-</refsect1>
-<refsect1 role="details" id="gdbus-properties-org.freedesktop.NetworkManager.Device.Modem">
-  <title role="details.title">Property Details</title>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Modem.ModemCapabilities">
-  <title>The "ModemCapabilities" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-Modem.ModemCapabilities"><primary sortas=".Device.Modem:ModemCapabilities">org.freedesktop.NetworkManager.Device.Modem:ModemCapabilities</primary></indexterm>
-<programlisting>
-ModemCapabilities  readable   u
-</programlisting>
-<para>        The generic family of access technologies the modem supports. Not all
-        capabilities are available at the same time however; some modems require a
-        firmware reload or other reinitialization to switch between eg CDMA/EVDO
-        and GSM/UMTS.
-</para><para>        Returns: <link linkend="NMDeviceModemCapabilities">NMDeviceModemCapabilities</link>
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Modem.CurrentCapabilities">
-  <title>The "CurrentCapabilities" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-Modem.CurrentCapabilities"><primary sortas=".Device.Modem:CurrentCapabilities">org.freedesktop.NetworkManager.Device.Modem:CurrentCapabilities</primary></indexterm>
-<programlisting>
-CurrentCapabilities  readable   u
-</programlisting>
-<para>        The generic family of access technologies the modem currently supports
-        without a firmware reload or reinitialization.
-</para><para>        Returns: <link linkend="NMDeviceModemCapabilities">NMDeviceModemCapabilities</link>
-</para>
-</refsect2>
-</refsect1>
-</refentry>
-
diff --git a/introspection/nmdbus-device-olpc-mesh-org.freedesktop.NetworkManager.Device.OlpcMesh.xml b/introspection/nmdbus-device-olpc-mesh-org.freedesktop.NetworkManager.Device.OlpcMesh.xml
deleted file mode 100644
index 9e6c36d2..00000000
--- a/introspection/nmdbus-device-olpc-mesh-org.freedesktop.NetworkManager.Device.OlpcMesh.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-]>
-<refentry id="gdbus-org.freedesktop.NetworkManager.Device.OlpcMesh">
-  <refmeta>    <refentrytitle role="top_of_page" id="gdbus-interface-org-freedesktop-NetworkManager-Device-OlpcMesh.top_of_page">org.freedesktop.NetworkManager.Device.OlpcMesh</refentrytitle>
-  <indexterm zone="gdbus-interface-org-freedesktop-NetworkManager-Device-OlpcMesh.top_of_page"><primary sortas=".Device.OlpcMesh">org.freedesktop.NetworkManager.Device.OlpcMesh</primary></indexterm>
-  </refmeta>  <refnamediv>    <refname>org.freedesktop.NetworkManager.Device.OlpcMesh</refname>    <refpurpose></refpurpose>  </refnamediv>  <refsect1 role="signal_proto">
-    <title role="signal_proto.title">Signals</title>
-    <synopsis>
-<link linkend="gdbus-signal-org-freedesktop-NetworkManager-Device-OlpcMesh.PropertiesChanged">PropertiesChanged</link> (a{sv} properties);
-</synopsis>
-  </refsect1>
-  <refsect1 role="properties">
-    <title role="properties.title">Properties</title>
-    <synopsis>
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-OlpcMesh.HwAddress">HwAddress</link>      readable   s
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-OlpcMesh.Companion">Companion</link>      readable   o
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-OlpcMesh.ActiveChannel">ActiveChannel</link>  readable   u
-</synopsis>
-  </refsect1>
-<refsect1 role="desc" id="gdbus-interface-org-freedesktop-NetworkManager-Device-OlpcMesh">
-  <title role="desc.title">Description</title>
-  <para></para>
-</refsect1>
-<refsect1 role="details" id="gdbus-signals-org.freedesktop.NetworkManager.Device.OlpcMesh">
-  <title role="details.title">Signal Details</title>
-<refsect2 role="signal" id="gdbus-signal-org-freedesktop-NetworkManager-Device-OlpcMesh.PropertiesChanged">
-  <title>The "PropertiesChanged" signal</title>
-  <indexterm zone="gdbus-signal-org-freedesktop-NetworkManager-Device-OlpcMesh.PropertiesChanged"><primary sortas=".Device.OlpcMesh::PropertiesChanged">org.freedesktop.NetworkManager.Device.OlpcMesh::PropertiesChanged</primary></indexterm>
-<programlisting>
-PropertiesChanged (a{sv} properties);
-</programlisting>
-<para>        DEPRECATED. Use the standard "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" instead which exists since version NetworkManager 1.2.0.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>a{sv} <parameter>properties</parameter></literal>:</term>
-  <listitem><para>A dictionary containing the FIXME: check changed parameters.</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-</refsect1>
-<refsect1 role="details" id="gdbus-properties-org.freedesktop.NetworkManager.Device.OlpcMesh">
-  <title role="details.title">Property Details</title>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-OlpcMesh.HwAddress">
-  <title>The "HwAddress" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-OlpcMesh.HwAddress"><primary sortas=".Device.OlpcMesh:HwAddress">org.freedesktop.NetworkManager.Device.OlpcMesh:HwAddress</primary></indexterm>
-<programlisting>
-HwAddress  readable   s
-</programlisting>
-<para>        The hardware address of the device.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-OlpcMesh.Companion">
-  <title>The "Companion" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-OlpcMesh.Companion"><primary sortas=".Device.OlpcMesh:Companion">org.freedesktop.NetworkManager.Device.OlpcMesh:Companion</primary></indexterm>
-<programlisting>
-Companion  readable   o
-</programlisting>
-<para>        The object path of the companion device.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-OlpcMesh.ActiveChannel">
-  <title>The "ActiveChannel" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-OlpcMesh.ActiveChannel"><primary sortas=".Device.OlpcMesh:ActiveChannel">org.freedesktop.NetworkManager.Device.OlpcMesh:ActiveChannel</primary></indexterm>
-<programlisting>
-ActiveChannel  readable   u
-</programlisting>
-<para>        The currently active channel.
-</para>
-</refsect2>
-</refsect1>
-</refentry>
-
diff --git a/introspection/nmdbus-device-org.freedesktop.NetworkManager.Device.xml b/introspection/nmdbus-device-org.freedesktop.NetworkManager.Device.xml
deleted file mode 100644
index 883c5d75..00000000
--- a/introspection/nmdbus-device-org.freedesktop.NetworkManager.Device.xml
+++ /dev/null
@@ -1,475 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-]>
-<refentry id="gdbus-org.freedesktop.NetworkManager.Device">
-  <refmeta>    <refentrytitle role="top_of_page" id="gdbus-interface-org-freedesktop-NetworkManager-Device.top_of_page">org.freedesktop.NetworkManager.Device</refentrytitle>
-  <indexterm zone="gdbus-interface-org-freedesktop-NetworkManager-Device.top_of_page"><primary sortas=".Device">org.freedesktop.NetworkManager.Device</primary></indexterm>
-  </refmeta>  <refnamediv>    <refname>org.freedesktop.NetworkManager.Device</refname>    <refpurpose></refpurpose>  </refnamediv>  <refsynopsisdiv role="synopsis">
-    <title role="synopsis.title">Methods</title>
-    <synopsis>
-<link linkend="gdbus-method-org-freedesktop-NetworkManager-Device.Reapply">Reapply</link>              (IN  a{sa{sv}} connection,
-                      IN  t         version_id,
-                      IN  u         flags);
-<link linkend="gdbus-method-org-freedesktop-NetworkManager-Device.GetAppliedConnection">GetAppliedConnection</link> (IN  u         flags,
-                      OUT a{sa{sv}} connection,
-                      OUT t         version_id);
-<link linkend="gdbus-method-org-freedesktop-NetworkManager-Device.Disconnect">Disconnect</link>           ();
-<link linkend="gdbus-method-org-freedesktop-NetworkManager-Device.Delete">Delete</link>               ();
-</synopsis>
-  </refsynopsisdiv>
-  <refsect1 role="signal_proto">
-    <title role="signal_proto.title">Signals</title>
-    <synopsis>
-<link linkend="gdbus-signal-org-freedesktop-NetworkManager-Device.StateChanged">StateChanged</link> (u new_state,
-              u old_state,
-              u reason);
-</synopsis>
-  </refsect1>
-  <refsect1 role="properties">
-    <title role="properties.title">Properties</title>
-    <synopsis>
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device.Udi">Udi</link>                   readable   s
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device.Interface">Interface</link>             readable   s
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device.IpInterface">IpInterface</link>           readable   s
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device.Driver">Driver</link>                readable   s
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device.DriverVersion">DriverVersion</link>         readable   s
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device.FirmwareVersion">FirmwareVersion</link>       readable   s
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device.Capabilities">Capabilities</link>          readable   u
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device.Ip4Address">Ip4Address</link>            readable   u
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device.State">State</link>                 readable   u
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device.StateReason">StateReason</link>           readable   (uu)
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device.ActiveConnection">ActiveConnection</link>      readable   o
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device.Ip4Config">Ip4Config</link>             readable   o
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device.Dhcp4Config">Dhcp4Config</link>           readable   o
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device.Ip6Config">Ip6Config</link>             readable   o
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device.Dhcp6Config">Dhcp6Config</link>           readable   o
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device.Managed">Managed</link>               readwrite  b
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device.Autoconnect">Autoconnect</link>           readwrite  b
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device.FirmwareMissing">FirmwareMissing</link>       readable   b
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device.NmPluginMissing">NmPluginMissing</link>       readable   b
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device.DeviceType">DeviceType</link>            readable   u
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device.AvailableConnections">AvailableConnections</link>  readable   ao
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device.PhysicalPortId">PhysicalPortId</link>        readable   s
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device.Mtu">Mtu</link>                   readable   u
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device.Metered">Metered</link>               readable   u
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device.LldpNeighbors">LldpNeighbors</link>         readable   aa{sv}
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device.Real">Real</link>                  readable   b
-</synopsis>
-  </refsect1>
-<refsect1 role="desc" id="gdbus-interface-org-freedesktop-NetworkManager-Device">
-  <title role="desc.title">Description</title>
-  <para></para>
-</refsect1>
-<refsect1 role="details" id="gdbus-methods-org.freedesktop.NetworkManager.Device">
-  <title role="details.title">Method Details</title>
-<refsect2 role="method" id="gdbus-method-org-freedesktop-NetworkManager-Device.Reapply">
-  <title>The Reapply() method</title>
-  <indexterm zone="gdbus-method-org-freedesktop-NetworkManager-Device.Reapply"><primary sortas=".Device.Reapply">org.freedesktop.NetworkManager.Device.Reapply()</primary></indexterm>
-<programlisting>
-Reapply (IN  a{sa{sv}} connection,
-         IN  t         version_id,
-         IN  u         flags);
-</programlisting>
-<para>        Attempts to update the configuration of a device without deactivating it.
-        NetworkManager has the concept of connections, which are profiles that
-        contain the configuration for a networking device. Those connections are
-        exposed via D-Bus as individual objects that can be created, modified and
-        deleted. When activating such a settings-connection on a device, the
-        settings-connection is cloned to become an applied-connection and used to
-        configure the device (see GetAppliedConnection). Subsequent modification
-        of the settings-connection don't propagate automatically to the device's
-        applied-connection (with exception of the firewall-zone and the metered
-        property). For the changes to take effect, you can either re-activate the
-        settings-connection, or call Reapply. The Reapply call allows you to
-        directly update the applied-connection and reconfigure the device. Reapply
-        can also be useful if the currently applied-connection is equal to the
-        connection that is about to be reapplied. This allows to reconfigure the
-        device and revert external changes like removing or adding an IP address
-        (which NetworkManager doesn't revert automatically because it is assumed
-        that the user made these changes intentionally outside of NetworkManager).
-        Reapply can make the applied-connection different from the
-        settings-connection, just like updating the settings-connection can make
-        them different.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>IN a{sa{sv}} <parameter>connection</parameter></literal>:</term>
-  <listitem><para>The optional connection settings that will be reapplied on the device. If empty, the currently active settings-connection will be used. The connection cannot arbitrarly differ from the current applied-connection otherwise the call will fail. Only certain changes are supported, like adding or removing IP addresses.</para></listitem>
-</varlistentry>
-<varlistentry>
-  <term><literal>IN t <parameter>version_id</parameter></literal>:</term>
-  <listitem><para>If non-zero, the current version id of the applied-connection must match. The current version id can be retrieved via GetAppliedConnection. This optional argument allows to catch concurrent modifications between the GetAppliedConnection call and Reapply.</para></listitem>
-</varlistentry>
-<varlistentry>
-  <term><literal>IN u <parameter>flags</parameter></literal>:</term>
-  <listitem><para>Flags which would modify the behavior of the Reapply call. There are no flags defined currently and the users should use the value of 0.</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-<refsect2 role="method" id="gdbus-method-org-freedesktop-NetworkManager-Device.GetAppliedConnection">
-  <title>The GetAppliedConnection() method</title>
-  <indexterm zone="gdbus-method-org-freedesktop-NetworkManager-Device.GetAppliedConnection"><primary sortas=".Device.GetAppliedConnection">org.freedesktop.NetworkManager.Device.GetAppliedConnection()</primary></indexterm>
-<programlisting>
-GetAppliedConnection (IN  u         flags,
-                      OUT a{sa{sv}} connection,
-                      OUT t         version_id);
-</programlisting>
-<para>        Get the currently applied connection on the device. This is a snapshot of
-        the last activated connection on the device, that is the configuration
-        that is currently applied on the device. Usually this is the same as
-        GetSettings of the referenced settings connection. However, it can differ
-        if the settings connection was subsequently modified or the applied
-        connection was modified by Reapply. The applied connection is set when
-        activating a device or when calling Reapply.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>IN u <parameter>flags</parameter></literal>:</term>
-  <listitem><para>Flags which would modify the behavior of the GetAppliedConnection call. There are no flags defined currently and the users should use the value of 0.</para></listitem>
-</varlistentry>
-<varlistentry>
-  <term><literal>OUT a{sa{sv}} <parameter>connection</parameter></literal>:</term>
-  <listitem><para>The effective connection settings that the connection has currently applied.</para></listitem>
-</varlistentry>
-<varlistentry>
-  <term><literal>OUT t <parameter>version_id</parameter></literal>:</term>
-  <listitem><para>The version-id of the currently applied connection. This can be specified during Reapply to avoid races where you first fetch the applied connection, modify it and try to reapply it. If the applied connection is modified in the meantime, the version_id gets incremented and Reapply will fail.</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-<refsect2 role="method" id="gdbus-method-org-freedesktop-NetworkManager-Device.Disconnect">
-  <title>The Disconnect() method</title>
-  <indexterm zone="gdbus-method-org-freedesktop-NetworkManager-Device.Disconnect"><primary sortas=".Device.Disconnect">org.freedesktop.NetworkManager.Device.Disconnect()</primary></indexterm>
-<programlisting>
-Disconnect ();
-</programlisting>
-<para>        Disconnects a device and prevents the device from automatically activating
-        further connections without user intervention.
-</para>
-</refsect2>
-<refsect2 role="method" id="gdbus-method-org-freedesktop-NetworkManager-Device.Delete">
-  <title>The Delete() method</title>
-  <indexterm zone="gdbus-method-org-freedesktop-NetworkManager-Device.Delete"><primary sortas=".Device.Delete">org.freedesktop.NetworkManager.Device.Delete()</primary></indexterm>
-<programlisting>
-Delete ();
-</programlisting>
-<para>        Deletes a software device from NetworkManager and removes the interface
-        from the system. The method returns an error when called for a hardware
-        device.
-</para>
-</refsect2>
-</refsect1>
-<refsect1 role="details" id="gdbus-signals-org.freedesktop.NetworkManager.Device">
-  <title role="details.title">Signal Details</title>
-<refsect2 role="signal" id="gdbus-signal-org-freedesktop-NetworkManager-Device.StateChanged">
-  <title>The "StateChanged" signal</title>
-  <indexterm zone="gdbus-signal-org-freedesktop-NetworkManager-Device.StateChanged"><primary sortas=".Device::StateChanged">org.freedesktop.NetworkManager.Device::StateChanged</primary></indexterm>
-<programlisting>
-StateChanged (u new_state,
-              u old_state,
-              u reason);
-</programlisting>
-<para></para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>u <parameter>new_state</parameter></literal>:</term>
-  <listitem><para>(<link linkend="NMDeviceState">NMDeviceState</link>) The new state of the device.</para></listitem>
-</varlistentry>
-<varlistentry>
-  <term><literal>u <parameter>old_state</parameter></literal>:</term>
-  <listitem><para>(<link linkend="NMDeviceState">NMDeviceState</link>) The previous state of the device.</para></listitem>
-</varlistentry>
-<varlistentry>
-  <term><literal>u <parameter>reason</parameter></literal>:</term>
-  <listitem><para>(<link linkend="NMDeviceStateReason">NMDeviceStateReason</link>) A reason for the state transition.</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-</refsect1>
-<refsect1 role="details" id="gdbus-properties-org.freedesktop.NetworkManager.Device">
-  <title role="details.title">Property Details</title>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device.Udi">
-  <title>The "Udi" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device.Udi"><primary sortas=".Device:Udi">org.freedesktop.NetworkManager.Device:Udi</primary></indexterm>
-<programlisting>
-Udi  readable   s
-</programlisting>
-<para>        Operating-system specific transient device hardware identifier. This is an
-        opaque string representing the underlying hardware for the device, and
-        shouldn't be used to keep track of individual devices. For some device
-        types (Bluetooth, Modems) it is an identifier used by the hardware service
-        (ie bluez or ModemManager) to refer to that device, and client programs
-        use it get additional information from those services which NM does not
-        provide. The Udi is not guaranteed to be consistent across reboots or
-        hotplugs of the hardware. If you're looking for a way to uniquely track
-        each device in your application, use the object path. If you're looking
-        for a way to track a specific piece of hardware across reboot or hotplug,
-        use a MAC address or USB serial number.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device.Interface">
-  <title>The "Interface" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device.Interface"><primary sortas=".Device:Interface">org.freedesktop.NetworkManager.Device:Interface</primary></indexterm>
-<programlisting>
-Interface  readable   s
-</programlisting>
-<para>        The name of the device's control (and often data) interface.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device.IpInterface">
-  <title>The "IpInterface" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device.IpInterface"><primary sortas=".Device:IpInterface">org.freedesktop.NetworkManager.Device:IpInterface</primary></indexterm>
-<programlisting>
-IpInterface  readable   s
-</programlisting>
-<para>        The name of the device's data interface when available. This property may
-        not refer to the actual data interface until the device has successfully
-        established a data connection, indicated by the device's State becoming
-        ACTIVATED.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device.Driver">
-  <title>The "Driver" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device.Driver"><primary sortas=".Device:Driver">org.freedesktop.NetworkManager.Device:Driver</primary></indexterm>
-<programlisting>
-Driver  readable   s
-</programlisting>
-<para>        The driver handling the device.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device.DriverVersion">
-  <title>The "DriverVersion" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device.DriverVersion"><primary sortas=".Device:DriverVersion">org.freedesktop.NetworkManager.Device:DriverVersion</primary></indexterm>
-<programlisting>
-DriverVersion  readable   s
-</programlisting>
-<para>        The version of the driver handling the device.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device.FirmwareVersion">
-  <title>The "FirmwareVersion" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device.FirmwareVersion"><primary sortas=".Device:FirmwareVersion">org.freedesktop.NetworkManager.Device:FirmwareVersion</primary></indexterm>
-<programlisting>
-FirmwareVersion  readable   s
-</programlisting>
-<para>        The firmware version for the device.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device.Capabilities">
-  <title>The "Capabilities" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device.Capabilities"><primary sortas=".Device:Capabilities">org.freedesktop.NetworkManager.Device:Capabilities</primary></indexterm>
-<programlisting>
-Capabilities  readable   u
-</programlisting>
-<para>        Flags describing the capabilities of the device.
-</para><para>        Returns: <link linkend="NMDeviceCapabilities">NMDeviceCapabilities</link>
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device.Ip4Address">
-  <title>The "Ip4Address" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device.Ip4Address"><primary sortas=".Device:Ip4Address">org.freedesktop.NetworkManager.Device:Ip4Address</primary></indexterm>
-<programlisting>
-Ip4Address  readable   u
-</programlisting>
-<para>        DEPRECATED; use the 'Addresses' property of the 'Ip4Config' object
-        instead.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device.State">
-  <title>The "State" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device.State"><primary sortas=".Device:State">org.freedesktop.NetworkManager.Device:State</primary></indexterm>
-<programlisting>
-State  readable   u
-</programlisting>
-<para>        The current state of the device.
-</para><para>        Returns: <link linkend="NMDeviceState">NMDeviceState</link>
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device.StateReason">
-  <title>The "StateReason" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device.StateReason"><primary sortas=".Device:StateReason">org.freedesktop.NetworkManager.Device:StateReason</primary></indexterm>
-<programlisting>
-StateReason  readable   (uu)
-</programlisting>
-<para>        The current state and reason for changing to that state.
-</para><para>        Returns: A tuple of  <link linkend="NMDeviceState">NMDeviceState</link> and  <link linkend="NMDeviceStateReason">NMDeviceStateReason</link>.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device.ActiveConnection">
-  <title>The "ActiveConnection" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device.ActiveConnection"><primary sortas=".Device:ActiveConnection">org.freedesktop.NetworkManager.Device:ActiveConnection</primary></indexterm>
-<programlisting>
-ActiveConnection  readable   o
-</programlisting>
-<para>        Object path of an ActiveConnection object that "owns" this device during
-        activation. The ActiveConnection object tracks the life-cycle of a
-        connection to a specific network and implements the
-        org.freedesktop.NetworkManager.Connection.Active D-Bus interface.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device.Ip4Config">
-  <title>The "Ip4Config" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device.Ip4Config"><primary sortas=".Device:Ip4Config">org.freedesktop.NetworkManager.Device:Ip4Config</primary></indexterm>
-<programlisting>
-Ip4Config  readable   o
-</programlisting>
-<para>        Object path of the Ip4Config object describing the configuration of the
-        device. Only valid when the device is in the NM_DEVICE_STATE_ACTIVATED
-        state.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device.Dhcp4Config">
-  <title>The "Dhcp4Config" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device.Dhcp4Config"><primary sortas=".Device:Dhcp4Config">org.freedesktop.NetworkManager.Device:Dhcp4Config</primary></indexterm>
-<programlisting>
-Dhcp4Config  readable   o
-</programlisting>
-<para>        Object path of the Dhcp4Config object describing the DHCP options returned
-        by the DHCP server. Only valid when the device is in the
-        NM_DEVICE_STATE_ACTIVATED state.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device.Ip6Config">
-  <title>The "Ip6Config" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device.Ip6Config"><primary sortas=".Device:Ip6Config">org.freedesktop.NetworkManager.Device:Ip6Config</primary></indexterm>
-<programlisting>
-Ip6Config  readable   o
-</programlisting>
-<para>        Object path of the Ip6Config object describing the configuration of the
-        device. Only valid when the device is in the NM_DEVICE_STATE_ACTIVATED
-        state.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device.Dhcp6Config">
-  <title>The "Dhcp6Config" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device.Dhcp6Config"><primary sortas=".Device:Dhcp6Config">org.freedesktop.NetworkManager.Device:Dhcp6Config</primary></indexterm>
-<programlisting>
-Dhcp6Config  readable   o
-</programlisting>
-<para>        Object path of the Dhcp6Config object describing the DHCP options returned
-        by the DHCP server. Only valid when the device is in the
-        NM_DEVICE_STATE_ACTIVATED state.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device.Managed">
-  <title>The "Managed" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device.Managed"><primary sortas=".Device:Managed">org.freedesktop.NetworkManager.Device:Managed</primary></indexterm>
-<programlisting>
-Managed  readwrite  b
-</programlisting>
-<para>        Whether or not this device is managed by NetworkManager. Setting this
-        property has a similar effect to configuring the device as unmanaged via
-        the keyfile.unmanaged-devices setting in NetworkManager.conf. Changes to
-        this value are not persistent and lost after NetworkManager restart.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device.Autoconnect">
-  <title>The "Autoconnect" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device.Autoconnect"><primary sortas=".Device:Autoconnect">org.freedesktop.NetworkManager.Device:Autoconnect</primary></indexterm>
-<programlisting>
-Autoconnect  readwrite  b
-</programlisting>
-<para>        If TRUE, indicates the device is allowed to autoconnect. If FALSE, manual
-        intervention is required before the device will automatically connect to a
-        known network, such as activating a connection using the device, or
-        setting this property to TRUE. This property cannot be set to TRUE for
-        default-unmanaged devices, since they never autoconnect.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device.FirmwareMissing">
-  <title>The "FirmwareMissing" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device.FirmwareMissing"><primary sortas=".Device:FirmwareMissing">org.freedesktop.NetworkManager.Device:FirmwareMissing</primary></indexterm>
-<programlisting>
-FirmwareMissing  readable   b
-</programlisting>
-<para>        If TRUE, indicates the device is likely missing firmware necessary for its
-        operation.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device.NmPluginMissing">
-  <title>The "NmPluginMissing" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device.NmPluginMissing"><primary sortas=".Device:NmPluginMissing">org.freedesktop.NetworkManager.Device:NmPluginMissing</primary></indexterm>
-<programlisting>
-NmPluginMissing  readable   b
-</programlisting>
-<para>        If TRUE, indicates the NetworkManager plugin for the device is likely
-        missing or misconfigured.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device.DeviceType">
-  <title>The "DeviceType" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device.DeviceType"><primary sortas=".Device:DeviceType">org.freedesktop.NetworkManager.Device:DeviceType</primary></indexterm>
-<programlisting>
-DeviceType  readable   u
-</programlisting>
-<para>        The general type of the network device; ie Ethernet, WiFi, etc.
-</para><para>        Returns: <link linkend="NMDeviceType">NMDeviceType</link>
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device.AvailableConnections">
-  <title>The "AvailableConnections" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device.AvailableConnections"><primary sortas=".Device:AvailableConnections">org.freedesktop.NetworkManager.Device:AvailableConnections</primary></indexterm>
-<programlisting>
-AvailableConnections  readable   ao
-</programlisting>
-<para>        An array of object paths of every configured connection that is currently
-        'available' through this device.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device.PhysicalPortId">
-  <title>The "PhysicalPortId" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device.PhysicalPortId"><primary sortas=".Device:PhysicalPortId">org.freedesktop.NetworkManager.Device:PhysicalPortId</primary></indexterm>
-<programlisting>
-PhysicalPortId  readable   s
-</programlisting>
-<para>        If non-empty, an (opaque) indicator of the physical network port
-        associated with the device. This can be used to recognize when two
-        seemingly-separate hardware devices are actually just different virtual
-        interfaces to the same physical port.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device.Mtu">
-  <title>The "Mtu" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device.Mtu"><primary sortas=".Device:Mtu">org.freedesktop.NetworkManager.Device:Mtu</primary></indexterm>
-<programlisting>
-Mtu  readable   u
-</programlisting>
-<para>        The device MTU (maximum transmission unit).
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device.Metered">
-  <title>The "Metered" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device.Metered"><primary sortas=".Device:Metered">org.freedesktop.NetworkManager.Device:Metered</primary></indexterm>
-<programlisting>
-Metered  readable   u
-</programlisting>
-<para>        Whether the amount of traffic flowing through the device is subject to
-        limitations, for example set by service providers.
-</para><para>        Returns: <link linkend="NMMetered">NMMetered</link>
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device.LldpNeighbors">
-  <title>The "LldpNeighbors" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device.LldpNeighbors"><primary sortas=".Device:LldpNeighbors">org.freedesktop.NetworkManager.Device:LldpNeighbors</primary></indexterm>
-<programlisting>
-LldpNeighbors  readable   aa{sv}
-</programlisting>
-<para>        Array of LLDP neighbors; each element is a dictionary mapping LLDP TLV
-        names to variant boxed values.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device.Real">
-  <title>The "Real" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device.Real"><primary sortas=".Device:Real">org.freedesktop.NetworkManager.Device:Real</primary></indexterm>
-<programlisting>
-Real  readable   b
-</programlisting>
-<para>        True if the device exists, or False for placeholder devices that do not
-        yet exist but could be automatically created by NetworkManager if one of
-        their AvailableConnections was activated.
-</para>
-</refsect2>
-</refsect1>
-</refentry>
-
diff --git a/introspection/nmdbus-device-statistics-org.freedesktop.NetworkManager.Device.Statistics.xml b/introspection/nmdbus-device-statistics-org.freedesktop.NetworkManager.Device.Statistics.xml
deleted file mode 100644
index 0c063ee0..00000000
--- a/introspection/nmdbus-device-statistics-org.freedesktop.NetworkManager.Device.Statistics.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-]>
-<refentry id="gdbus-org.freedesktop.NetworkManager.Device.Statistics">
-  <refmeta>    <refentrytitle role="top_of_page" id="gdbus-interface-org-freedesktop-NetworkManager-Device-Statistics.top_of_page">org.freedesktop.NetworkManager.Device.Statistics</refentrytitle>
-  <indexterm zone="gdbus-interface-org-freedesktop-NetworkManager-Device-Statistics.top_of_page"><primary sortas=".Device.Statistics">org.freedesktop.NetworkManager.Device.Statistics</primary></indexterm>
-  </refmeta>  <refnamediv>    <refname>org.freedesktop.NetworkManager.Device.Statistics</refname>    <refpurpose></refpurpose>  </refnamediv>  <refsect1 role="signal_proto">
-    <title role="signal_proto.title">Signals</title>
-    <synopsis>
-<link linkend="gdbus-signal-org-freedesktop-NetworkManager-Device-Statistics.PropertiesChanged">PropertiesChanged</link> (a{sv} properties);
-</synopsis>
-  </refsect1>
-  <refsect1 role="properties">
-    <title role="properties.title">Properties</title>
-    <synopsis>
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-Statistics.RefreshRateMs">RefreshRateMs</link>  readwrite  u
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-Statistics.TxBytes">TxBytes</link>        readable   t
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-Statistics.RxBytes">RxBytes</link>        readable   t
-</synopsis>
-  </refsect1>
-<refsect1 role="desc" id="gdbus-interface-org-freedesktop-NetworkManager-Device-Statistics">
-  <title role="desc.title">Description</title>
-  <para></para>
-</refsect1>
-<refsect1 role="details" id="gdbus-signals-org.freedesktop.NetworkManager.Device.Statistics">
-  <title role="details.title">Signal Details</title>
-<refsect2 role="signal" id="gdbus-signal-org-freedesktop-NetworkManager-Device-Statistics.PropertiesChanged">
-  <title>The "PropertiesChanged" signal</title>
-  <indexterm zone="gdbus-signal-org-freedesktop-NetworkManager-Device-Statistics.PropertiesChanged"><primary sortas=".Device.Statistics::PropertiesChanged">org.freedesktop.NetworkManager.Device.Statistics::PropertiesChanged</primary></indexterm>
-<programlisting>
-PropertiesChanged (a{sv} properties);
-</programlisting>
-<para>        DEPRECATED. Use the standard "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" instead which exists since version NetworkManager 1.2.0.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>a{sv} <parameter>properties</parameter></literal>:</term>
-  <listitem><para>A dictionary mapping property names to variant boxed values</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-</refsect1>
-<refsect1 role="details" id="gdbus-properties-org.freedesktop.NetworkManager.Device.Statistics">
-  <title role="details.title">Property Details</title>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Statistics.RefreshRateMs">
-  <title>The "RefreshRateMs" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-Statistics.RefreshRateMs"><primary sortas=".Device.Statistics:RefreshRateMs">org.freedesktop.NetworkManager.Device.Statistics:RefreshRateMs</primary></indexterm>
-<programlisting>
-RefreshRateMs  readwrite  u
-</programlisting>
-<para>        Refresh rate of the rest of properties of this interface. The properties
-        are guaranteed to be refreshed each RefreshRateMs milliseconds in case
-        the underlying counter has changed too.
-        If zero, there is no guaranteed refresh rate of the properties.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Statistics.TxBytes">
-  <title>The "TxBytes" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-Statistics.TxBytes"><primary sortas=".Device.Statistics:TxBytes">org.freedesktop.NetworkManager.Device.Statistics:TxBytes</primary></indexterm>
-<programlisting>
-TxBytes  readable   t
-</programlisting>
-<para>        Number of transmitted bytes
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Statistics.RxBytes">
-  <title>The "RxBytes" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-Statistics.RxBytes"><primary sortas=".Device.Statistics:RxBytes">org.freedesktop.NetworkManager.Device.Statistics:RxBytes</primary></indexterm>
-<programlisting>
-RxBytes  readable   t
-</programlisting>
-<para>        Number of received bytes
-</para>
-</refsect2>
-</refsect1>
-</refentry>
-
diff --git a/introspection/nmdbus-device-team-org.freedesktop.NetworkManager.Device.Team.xml b/introspection/nmdbus-device-team-org.freedesktop.NetworkManager.Device.Team.xml
deleted file mode 100644
index a97b633a..00000000
--- a/introspection/nmdbus-device-team-org.freedesktop.NetworkManager.Device.Team.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-]>
-<refentry id="gdbus-org.freedesktop.NetworkManager.Device.Team">
-  <refmeta>    <refentrytitle role="top_of_page" id="gdbus-interface-org-freedesktop-NetworkManager-Device-Team.top_of_page">org.freedesktop.NetworkManager.Device.Team</refentrytitle>
-  <indexterm zone="gdbus-interface-org-freedesktop-NetworkManager-Device-Team.top_of_page"><primary sortas=".Device.Team">org.freedesktop.NetworkManager.Device.Team</primary></indexterm>
-  </refmeta>  <refnamediv>    <refname>org.freedesktop.NetworkManager.Device.Team</refname>    <refpurpose></refpurpose>  </refnamediv>  <refsect1 role="signal_proto">
-    <title role="signal_proto.title">Signals</title>
-    <synopsis>
-<link linkend="gdbus-signal-org-freedesktop-NetworkManager-Device-Team.PropertiesChanged">PropertiesChanged</link> (a{sv} properties);
-</synopsis>
-  </refsect1>
-  <refsect1 role="properties">
-    <title role="properties.title">Properties</title>
-    <synopsis>
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-Team.HwAddress">HwAddress</link>  readable   s
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-Team.Carrier">Carrier</link>    readable   b
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-Team.Slaves">Slaves</link>     readable   ao
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-Team.Config">Config</link>     readable   s
-</synopsis>
-  </refsect1>
-<refsect1 role="desc" id="gdbus-interface-org-freedesktop-NetworkManager-Device-Team">
-  <title role="desc.title">Description</title>
-  <para></para>
-</refsect1>
-<refsect1 role="details" id="gdbus-signals-org.freedesktop.NetworkManager.Device.Team">
-  <title role="details.title">Signal Details</title>
-<refsect2 role="signal" id="gdbus-signal-org-freedesktop-NetworkManager-Device-Team.PropertiesChanged">
-  <title>The "PropertiesChanged" signal</title>
-  <indexterm zone="gdbus-signal-org-freedesktop-NetworkManager-Device-Team.PropertiesChanged"><primary sortas=".Device.Team::PropertiesChanged">org.freedesktop.NetworkManager.Device.Team::PropertiesChanged</primary></indexterm>
-<programlisting>
-PropertiesChanged (a{sv} properties);
-</programlisting>
-<para>        DEPRECATED. Use the standard "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" instead which exists since version NetworkManager 1.2.0.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>a{sv} <parameter>properties</parameter></literal>:</term>
-  <listitem><para>A dictionary mapping property names to variant boxed values</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-</refsect1>
-<refsect1 role="details" id="gdbus-properties-org.freedesktop.NetworkManager.Device.Team">
-  <title role="details.title">Property Details</title>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Team.HwAddress">
-  <title>The "HwAddress" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-Team.HwAddress"><primary sortas=".Device.Team:HwAddress">org.freedesktop.NetworkManager.Device.Team:HwAddress</primary></indexterm>
-<programlisting>
-HwAddress  readable   s
-</programlisting>
-<para>        Hardware address of the device.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Team.Carrier">
-  <title>The "Carrier" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-Team.Carrier"><primary sortas=".Device.Team:Carrier">org.freedesktop.NetworkManager.Device.Team:Carrier</primary></indexterm>
-<programlisting>
-Carrier  readable   b
-</programlisting>
-<para>        Indicates whether the physical carrier is found (e.g. whether a cable is
-        plugged in or not).
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Team.Slaves">
-  <title>The "Slaves" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-Team.Slaves"><primary sortas=".Device.Team:Slaves">org.freedesktop.NetworkManager.Device.Team:Slaves</primary></indexterm>
-<programlisting>
-Slaves  readable   ao
-</programlisting>
-<para>        Array of object paths representing devices which are currently slaved to
-        this device.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Team.Config">
-  <title>The "Config" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-Team.Config"><primary sortas=".Device.Team:Config">org.freedesktop.NetworkManager.Device.Team:Config</primary></indexterm>
-<programlisting>
-Config  readable   s
-</programlisting>
-<para>        The JSON configuration currently applied on the device.
-</para>
-</refsect2>
-</refsect1>
-</refentry>
-
diff --git a/introspection/nmdbus-device-tun-org.freedesktop.NetworkManager.Device.Tun.xml b/introspection/nmdbus-device-tun-org.freedesktop.NetworkManager.Device.Tun.xml
deleted file mode 100644
index e2d9f466..00000000
--- a/introspection/nmdbus-device-tun-org.freedesktop.NetworkManager.Device.Tun.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-]>
-<refentry id="gdbus-org.freedesktop.NetworkManager.Device.Tun">
-  <refmeta>    <refentrytitle role="top_of_page" id="gdbus-interface-org-freedesktop-NetworkManager-Device-Tun.top_of_page">org.freedesktop.NetworkManager.Device.Tun</refentrytitle>
-  <indexterm zone="gdbus-interface-org-freedesktop-NetworkManager-Device-Tun.top_of_page"><primary sortas=".Device.Tun">org.freedesktop.NetworkManager.Device.Tun</primary></indexterm>
-  </refmeta>  <refnamediv>    <refname>org.freedesktop.NetworkManager.Device.Tun</refname>    <refpurpose></refpurpose>  </refnamediv>  <refsect1 role="signal_proto">
-    <title role="signal_proto.title">Signals</title>
-    <synopsis>
-<link linkend="gdbus-signal-org-freedesktop-NetworkManager-Device-Tun.PropertiesChanged">PropertiesChanged</link> (a{sv} properties);
-</synopsis>
-  </refsect1>
-  <refsect1 role="properties">
-    <title role="properties.title">Properties</title>
-    <synopsis>
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-Tun.Owner">Owner</link>       readable   x
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-Tun.Group">Group</link>       readable   x
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-Tun.Mode">Mode</link>        readable   s
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-Tun.NoPi">NoPi</link>        readable   b
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-Tun.VnetHdr">VnetHdr</link>     readable   b
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-Tun.MultiQueue">MultiQueue</link>  readable   b
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-Tun.HwAddress">HwAddress</link>   readable   s
-</synopsis>
-  </refsect1>
-<refsect1 role="desc" id="gdbus-interface-org-freedesktop-NetworkManager-Device-Tun">
-  <title role="desc.title">Description</title>
-  <para></para>
-</refsect1>
-<refsect1 role="details" id="gdbus-signals-org.freedesktop.NetworkManager.Device.Tun">
-  <title role="details.title">Signal Details</title>
-<refsect2 role="signal" id="gdbus-signal-org-freedesktop-NetworkManager-Device-Tun.PropertiesChanged">
-  <title>The "PropertiesChanged" signal</title>
-  <indexterm zone="gdbus-signal-org-freedesktop-NetworkManager-Device-Tun.PropertiesChanged"><primary sortas=".Device.Tun::PropertiesChanged">org.freedesktop.NetworkManager.Device.Tun::PropertiesChanged</primary></indexterm>
-<programlisting>
-PropertiesChanged (a{sv} properties);
-</programlisting>
-<para>        DEPRECATED. Use the standard "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" instead which exists since version NetworkManager 1.2.0.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>a{sv} <parameter>properties</parameter></literal>:</term>
-  <listitem><para>A dictionary mapping property names to variant boxed values</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-</refsect1>
-<refsect1 role="details" id="gdbus-properties-org.freedesktop.NetworkManager.Device.Tun">
-  <title role="details.title">Property Details</title>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Tun.Owner">
-  <title>The "Owner" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-Tun.Owner"><primary sortas=".Device.Tun:Owner">org.freedesktop.NetworkManager.Device.Tun:Owner</primary></indexterm>
-<programlisting>
-Owner  readable   x
-</programlisting>
-<para>        The uid of the tunnel owner, or -1 if it has no owner.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Tun.Group">
-  <title>The "Group" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-Tun.Group"><primary sortas=".Device.Tun:Group">org.freedesktop.NetworkManager.Device.Tun:Group</primary></indexterm>
-<programlisting>
-Group  readable   x
-</programlisting>
-<para>        The gid of the tunnel group, or -1 if it has no owner.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Tun.Mode">
-  <title>The "Mode" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-Tun.Mode"><primary sortas=".Device.Tun:Mode">org.freedesktop.NetworkManager.Device.Tun:Mode</primary></indexterm>
-<programlisting>
-Mode  readable   s
-</programlisting>
-<para>        The tunnel mode, either "tun" or "tap".
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Tun.NoPi">
-  <title>The "NoPi" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-Tun.NoPi"><primary sortas=".Device.Tun:NoPi">org.freedesktop.NetworkManager.Device.Tun:NoPi</primary></indexterm>
-<programlisting>
-NoPi  readable   b
-</programlisting>
-<para>        The tunnel's "TUN_NO_PI" flag; true if no protocol info is prepended to
-        the tunnel packets.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Tun.VnetHdr">
-  <title>The "VnetHdr" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-Tun.VnetHdr"><primary sortas=".Device.Tun:VnetHdr">org.freedesktop.NetworkManager.Device.Tun:VnetHdr</primary></indexterm>
-<programlisting>
-VnetHdr  readable   b
-</programlisting>
-<para>        The tunnel's "TUN_VNET_HDR" flag; true if the tunnel packets include a
-        virtio network header.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Tun.MultiQueue">
-  <title>The "MultiQueue" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-Tun.MultiQueue"><primary sortas=".Device.Tun:MultiQueue">org.freedesktop.NetworkManager.Device.Tun:MultiQueue</primary></indexterm>
-<programlisting>
-MultiQueue  readable   b
-</programlisting>
-<para>        The tunnel's "TUN_TAP_MQ" flag; true if callers can connect to the tap
-        device multiple times, for multiple send/receive queues.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Tun.HwAddress">
-  <title>The "HwAddress" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-Tun.HwAddress"><primary sortas=".Device.Tun:HwAddress">org.freedesktop.NetworkManager.Device.Tun:HwAddress</primary></indexterm>
-<programlisting>
-HwAddress  readable   s
-</programlisting>
-<para>        Hardware address of the device.
-</para>
-</refsect2>
-</refsect1>
-</refentry>
-
diff --git a/introspection/nmdbus-device-veth-org.freedesktop.NetworkManager.Device.Veth.xml b/introspection/nmdbus-device-veth-org.freedesktop.NetworkManager.Device.Veth.xml
deleted file mode 100644
index 2086d618..00000000
--- a/introspection/nmdbus-device-veth-org.freedesktop.NetworkManager.Device.Veth.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-]>
-<refentry id="gdbus-org.freedesktop.NetworkManager.Device.Veth">
-  <refmeta>    <refentrytitle role="top_of_page" id="gdbus-interface-org-freedesktop-NetworkManager-Device-Veth.top_of_page">org.freedesktop.NetworkManager.Device.Veth</refentrytitle>
-  <indexterm zone="gdbus-interface-org-freedesktop-NetworkManager-Device-Veth.top_of_page"><primary sortas=".Device.Veth">org.freedesktop.NetworkManager.Device.Veth</primary></indexterm>
-  </refmeta>  <refnamediv>    <refname>org.freedesktop.NetworkManager.Device.Veth</refname>    <refpurpose></refpurpose>  </refnamediv>  <refsect1 role="signal_proto">
-    <title role="signal_proto.title">Signals</title>
-    <synopsis>
-<link linkend="gdbus-signal-org-freedesktop-NetworkManager-Device-Veth.PropertiesChanged">PropertiesChanged</link> (a{sv} properties);
-</synopsis>
-  </refsect1>
-  <refsect1 role="properties">
-    <title role="properties.title">Properties</title>
-    <synopsis>
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-Veth.Peer">Peer</link>  readable   o
-</synopsis>
-  </refsect1>
-<refsect1 role="desc" id="gdbus-interface-org-freedesktop-NetworkManager-Device-Veth">
-  <title role="desc.title">Description</title>
-  <para></para>
-</refsect1>
-<refsect1 role="details" id="gdbus-signals-org.freedesktop.NetworkManager.Device.Veth">
-  <title role="details.title">Signal Details</title>
-<refsect2 role="signal" id="gdbus-signal-org-freedesktop-NetworkManager-Device-Veth.PropertiesChanged">
-  <title>The "PropertiesChanged" signal</title>
-  <indexterm zone="gdbus-signal-org-freedesktop-NetworkManager-Device-Veth.PropertiesChanged"><primary sortas=".Device.Veth::PropertiesChanged">org.freedesktop.NetworkManager.Device.Veth::PropertiesChanged</primary></indexterm>
-<programlisting>
-PropertiesChanged (a{sv} properties);
-</programlisting>
-<para>        DEPRECATED. Use the standard "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" instead which exists since version NetworkManager 1.2.0.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>a{sv} <parameter>properties</parameter></literal>:</term>
-  <listitem><para>A dictionary mapping property names to variant boxed values</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-</refsect1>
-<refsect1 role="details" id="gdbus-properties-org.freedesktop.NetworkManager.Device.Veth">
-  <title role="details.title">Property Details</title>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Veth.Peer">
-  <title>The "Peer" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-Veth.Peer"><primary sortas=".Device.Veth:Peer">org.freedesktop.NetworkManager.Device.Veth:Peer</primary></indexterm>
-<programlisting>
-Peer  readable   o
-</programlisting>
-<para>        The object path of the device's peer.
-</para>
-</refsect2>
-</refsect1>
-</refentry>
-
diff --git a/introspection/nmdbus-device-vlan-org.freedesktop.NetworkManager.Device.Vlan.xml b/introspection/nmdbus-device-vlan-org.freedesktop.NetworkManager.Device.Vlan.xml
deleted file mode 100644
index a4e7348f..00000000
--- a/introspection/nmdbus-device-vlan-org.freedesktop.NetworkManager.Device.Vlan.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-]>
-<refentry id="gdbus-org.freedesktop.NetworkManager.Device.Vlan">
-  <refmeta>    <refentrytitle role="top_of_page" id="gdbus-interface-org-freedesktop-NetworkManager-Device-Vlan.top_of_page">org.freedesktop.NetworkManager.Device.Vlan</refentrytitle>
-  <indexterm zone="gdbus-interface-org-freedesktop-NetworkManager-Device-Vlan.top_of_page"><primary sortas=".Device.Vlan">org.freedesktop.NetworkManager.Device.Vlan</primary></indexterm>
-  </refmeta>  <refnamediv>    <refname>org.freedesktop.NetworkManager.Device.Vlan</refname>    <refpurpose></refpurpose>  </refnamediv>  <refsect1 role="signal_proto">
-    <title role="signal_proto.title">Signals</title>
-    <synopsis>
-<link linkend="gdbus-signal-org-freedesktop-NetworkManager-Device-Vlan.PropertiesChanged">PropertiesChanged</link> (a{sv} properties);
-</synopsis>
-  </refsect1>
-  <refsect1 role="properties">
-    <title role="properties.title">Properties</title>
-    <synopsis>
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-Vlan.HwAddress">HwAddress</link>  readable   s
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-Vlan.Carrier">Carrier</link>    readable   b
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-Vlan.Parent">Parent</link>     readable   o
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-Vlan.VlanId">VlanId</link>     readable   u
-</synopsis>
-  </refsect1>
-<refsect1 role="desc" id="gdbus-interface-org-freedesktop-NetworkManager-Device-Vlan">
-  <title role="desc.title">Description</title>
-  <para></para>
-</refsect1>
-<refsect1 role="details" id="gdbus-signals-org.freedesktop.NetworkManager.Device.Vlan">
-  <title role="details.title">Signal Details</title>
-<refsect2 role="signal" id="gdbus-signal-org-freedesktop-NetworkManager-Device-Vlan.PropertiesChanged">
-  <title>The "PropertiesChanged" signal</title>
-  <indexterm zone="gdbus-signal-org-freedesktop-NetworkManager-Device-Vlan.PropertiesChanged"><primary sortas=".Device.Vlan::PropertiesChanged">org.freedesktop.NetworkManager.Device.Vlan::PropertiesChanged</primary></indexterm>
-<programlisting>
-PropertiesChanged (a{sv} properties);
-</programlisting>
-<para>        DEPRECATED. Use the standard "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" instead which exists since version NetworkManager 1.2.0.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>a{sv} <parameter>properties</parameter></literal>:</term>
-  <listitem><para>A dictionary mapping property names to variant boxed values</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-</refsect1>
-<refsect1 role="details" id="gdbus-properties-org.freedesktop.NetworkManager.Device.Vlan">
-  <title role="details.title">Property Details</title>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Vlan.HwAddress">
-  <title>The "HwAddress" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-Vlan.HwAddress"><primary sortas=".Device.Vlan:HwAddress">org.freedesktop.NetworkManager.Device.Vlan:HwAddress</primary></indexterm>
-<programlisting>
-HwAddress  readable   s
-</programlisting>
-<para>        Hardware address of the device.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Vlan.Carrier">
-  <title>The "Carrier" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-Vlan.Carrier"><primary sortas=".Device.Vlan:Carrier">org.freedesktop.NetworkManager.Device.Vlan:Carrier</primary></indexterm>
-<programlisting>
-Carrier  readable   b
-</programlisting>
-<para>        Indicates whether the physical carrier is found (e.g. whether a cable is
-        plugged in or not).
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Vlan.Parent">
-  <title>The "Parent" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-Vlan.Parent"><primary sortas=".Device.Vlan:Parent">org.freedesktop.NetworkManager.Device.Vlan:Parent</primary></indexterm>
-<programlisting>
-Parent  readable   o
-</programlisting>
-<para>        Object path of the parent device of this VLAN device.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Vlan.VlanId">
-  <title>The "VlanId" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-Vlan.VlanId"><primary sortas=".Device.Vlan:VlanId">org.freedesktop.NetworkManager.Device.Vlan:VlanId</primary></indexterm>
-<programlisting>
-VlanId  readable   u
-</programlisting>
-<para>        The VLAN ID of this VLAN interface.
-</para>
-</refsect2>
-</refsect1>
-</refentry>
-
diff --git a/introspection/nmdbus-device-vxlan-org.freedesktop.NetworkManager.Device.Vxlan.xml b/introspection/nmdbus-device-vxlan-org.freedesktop.NetworkManager.Device.Vxlan.xml
deleted file mode 100644
index d8e45816..00000000
--- a/introspection/nmdbus-device-vxlan-org.freedesktop.NetworkManager.Device.Vxlan.xml
+++ /dev/null
@@ -1,222 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-]>
-<refentry id="gdbus-org.freedesktop.NetworkManager.Device.Vxlan">
-  <refmeta>    <refentrytitle role="top_of_page" id="gdbus-interface-org-freedesktop-NetworkManager-Device-Vxlan.top_of_page">org.freedesktop.NetworkManager.Device.Vxlan</refentrytitle>
-  <indexterm zone="gdbus-interface-org-freedesktop-NetworkManager-Device-Vxlan.top_of_page"><primary sortas=".Device.Vxlan">org.freedesktop.NetworkManager.Device.Vxlan</primary></indexterm>
-  </refmeta>  <refnamediv>    <refname>org.freedesktop.NetworkManager.Device.Vxlan</refname>    <refpurpose></refpurpose>  </refnamediv>  <refsect1 role="signal_proto">
-    <title role="signal_proto.title">Signals</title>
-    <synopsis>
-<link linkend="gdbus-signal-org-freedesktop-NetworkManager-Device-Vxlan.PropertiesChanged">PropertiesChanged</link> (a{sv} properties);
-</synopsis>
-  </refsect1>
-  <refsect1 role="properties">
-    <title role="properties.title">Properties</title>
-    <synopsis>
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.Parent">Parent</link>      readable   o
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.HwAddress">HwAddress</link>   readable   s
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.Id">Id</link>          readable   u
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.Group">Group</link>       readable   s
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.Local">Local</link>       readable   s
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.Tos">Tos</link>         readable   y
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.Ttl">Ttl</link>         readable   y
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.Learning">Learning</link>    readable   b
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.Ageing">Ageing</link>      readable   u
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.Limit">Limit</link>       readable   u
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.DstPort">DstPort</link>     readable   q
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.SrcPortMin">SrcPortMin</link>  readable   q
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.SrcPortMax">SrcPortMax</link>  readable   q
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.Proxy">Proxy</link>       readable   b
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.Rsc">Rsc</link>         readable   b
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.L2miss">L2miss</link>      readable   b
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.L3miss">L3miss</link>      readable   b
-</synopsis>
-  </refsect1>
-<refsect1 role="desc" id="gdbus-interface-org-freedesktop-NetworkManager-Device-Vxlan">
-  <title role="desc.title">Description</title>
-  <para></para>
-</refsect1>
-<refsect1 role="details" id="gdbus-signals-org.freedesktop.NetworkManager.Device.Vxlan">
-  <title role="details.title">Signal Details</title>
-<refsect2 role="signal" id="gdbus-signal-org-freedesktop-NetworkManager-Device-Vxlan.PropertiesChanged">
-  <title>The "PropertiesChanged" signal</title>
-  <indexterm zone="gdbus-signal-org-freedesktop-NetworkManager-Device-Vxlan.PropertiesChanged"><primary sortas=".Device.Vxlan::PropertiesChanged">org.freedesktop.NetworkManager.Device.Vxlan::PropertiesChanged</primary></indexterm>
-<programlisting>
-PropertiesChanged (a{sv} properties);
-</programlisting>
-<para>        DEPRECATED. Use the standard "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" instead which exists since version NetworkManager 1.2.0.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>a{sv} <parameter>properties</parameter></literal>:</term>
-  <listitem><para>A dictionary mapping property names to variant boxed values</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-</refsect1>
-<refsect1 role="details" id="gdbus-properties-org.freedesktop.NetworkManager.Device.Vxlan">
-  <title role="details.title">Property Details</title>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.Parent">
-  <title>The "Parent" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.Parent"><primary sortas=".Device.Vxlan:Parent">org.freedesktop.NetworkManager.Device.Vxlan:Parent</primary></indexterm>
-<programlisting>
-Parent  readable   o
-</programlisting>
-<para>        The object path of the parent device (if the VXLAN is not purely internal
-        to this host).
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.HwAddress">
-  <title>The "HwAddress" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.HwAddress"><primary sortas=".Device.Vxlan:HwAddress">org.freedesktop.NetworkManager.Device.Vxlan:HwAddress</primary></indexterm>
-<programlisting>
-HwAddress  readable   s
-</programlisting>
-<para>        Hardware address of the device.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.Id">
-  <title>The "Id" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.Id"><primary sortas=".Device.Vxlan:Id">org.freedesktop.NetworkManager.Device.Vxlan:Id</primary></indexterm>
-<programlisting>
-Id  readable   u
-</programlisting>
-<para>        The VXLAN Network Identifier (VNI).
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.Group">
-  <title>The "Group" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.Group"><primary sortas=".Device.Vxlan:Group">org.freedesktop.NetworkManager.Device.Vxlan:Group</primary></indexterm>
-<programlisting>
-Group  readable   s
-</programlisting>
-<para>        The IP (v4 or v6) multicast group used to communicate with other physical
-        hosts on this VXLAN.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.Local">
-  <title>The "Local" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.Local"><primary sortas=".Device.Vxlan:Local">org.freedesktop.NetworkManager.Device.Vxlan:Local</primary></indexterm>
-<programlisting>
-Local  readable   s
-</programlisting>
-<para>        The local IPv4 or IPv6 address to use when sending VXLAN packets to other
-        physical hosts.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.Tos">
-  <title>The "Tos" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.Tos"><primary sortas=".Device.Vxlan:Tos">org.freedesktop.NetworkManager.Device.Vxlan:Tos</primary></indexterm>
-<programlisting>
-Tos  readable   y
-</programlisting>
-<para>        The value to use in the IP ToS field for VXLAN packets sent to other
-        physical hosts.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.Ttl">
-  <title>The "Ttl" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.Ttl"><primary sortas=".Device.Vxlan:Ttl">org.freedesktop.NetworkManager.Device.Vxlan:Ttl</primary></indexterm>
-<programlisting>
-Ttl  readable   y
-</programlisting>
-<para>        The value to use in the IP TTL field for VXLAN packets sent to other
-        physical hosts.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.Learning">
-  <title>The "Learning" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.Learning"><primary sortas=".Device.Vxlan:Learning">org.freedesktop.NetworkManager.Device.Vxlan:Learning</primary></indexterm>
-<programlisting>
-Learning  readable   b
-</programlisting>
-<para>        True if the VXLAN dynamically learns remote IP addresses.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.Ageing">
-  <title>The "Ageing" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.Ageing"><primary sortas=".Device.Vxlan:Ageing">org.freedesktop.NetworkManager.Device.Vxlan:Ageing</primary></indexterm>
-<programlisting>
-Ageing  readable   u
-</programlisting>
-<para>        The interval in seconds at which the kernel purges stale cached addresses.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.Limit">
-  <title>The "Limit" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.Limit"><primary sortas=".Device.Vxlan:Limit">org.freedesktop.NetworkManager.Device.Vxlan:Limit</primary></indexterm>
-<programlisting>
-Limit  readable   u
-</programlisting>
-<para>        The maximum number of entries that can be added to the VXLAN's forwarding
-        table.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.DstPort">
-  <title>The "DstPort" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.DstPort"><primary sortas=".Device.Vxlan:DstPort">org.freedesktop.NetworkManager.Device.Vxlan:DstPort</primary></indexterm>
-<programlisting>
-DstPort  readable   q
-</programlisting>
-<para>        Destination port for outgoing VXLAN packets.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.SrcPortMin">
-  <title>The "SrcPortMin" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.SrcPortMin"><primary sortas=".Device.Vxlan:SrcPortMin">org.freedesktop.NetworkManager.Device.Vxlan:SrcPortMin</primary></indexterm>
-<programlisting>
-SrcPortMin  readable   q
-</programlisting>
-<para>        The lowest source port number to use for outgoing VXLAN packets.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.SrcPortMax">
-  <title>The "SrcPortMax" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.SrcPortMax"><primary sortas=".Device.Vxlan:SrcPortMax">org.freedesktop.NetworkManager.Device.Vxlan:SrcPortMax</primary></indexterm>
-<programlisting>
-SrcPortMax  readable   q
-</programlisting>
-<para>        The highest source port number to use for outgoing VXLAN packets.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.Proxy">
-  <title>The "Proxy" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.Proxy"><primary sortas=".Device.Vxlan:Proxy">org.freedesktop.NetworkManager.Device.Vxlan:Proxy</primary></indexterm>
-<programlisting>
-Proxy  readable   b
-</programlisting>
-<para>        True if the VXLAN is implementing DOVE ARP proxying for remote clients.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.Rsc">
-  <title>The "Rsc" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.Rsc"><primary sortas=".Device.Vxlan:Rsc">org.freedesktop.NetworkManager.Device.Vxlan:Rsc</primary></indexterm>
-<programlisting>
-Rsc  readable   b
-</programlisting>
-<para>        True if the VXLAN is implementing DOVE route short-circuiting of known
-        remote IP addresses.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.L2miss">
-  <title>The "L2miss" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.L2miss"><primary sortas=".Device.Vxlan:L2miss">org.freedesktop.NetworkManager.Device.Vxlan:L2miss</primary></indexterm>
-<programlisting>
-L2miss  readable   b
-</programlisting>
-<para>        True if the VXLAN will emit netlink notifications of L2 switch misses.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.L3miss">
-  <title>The "L3miss" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.L3miss"><primary sortas=".Device.Vxlan:L3miss">org.freedesktop.NetworkManager.Device.Vxlan:L3miss</primary></indexterm>
-<programlisting>
-L3miss  readable   b
-</programlisting>
-<para>        True if the VXLAN will emit netlink notifications of L3 switch misses.
-</para>
-</refsect2>
-</refsect1>
-</refentry>
-
diff --git a/introspection/nmdbus-device-wifi-org.freedesktop.NetworkManager.Device.Wireless.xml b/introspection/nmdbus-device-wifi-org.freedesktop.NetworkManager.Device.Wireless.xml
deleted file mode 100644
index 3652c937..00000000
--- a/introspection/nmdbus-device-wifi-org.freedesktop.NetworkManager.Device.Wireless.xml
+++ /dev/null
@@ -1,210 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-]>
-<refentry id="gdbus-org.freedesktop.NetworkManager.Device.Wireless">
-  <refmeta>    <refentrytitle role="top_of_page" id="gdbus-interface-org-freedesktop-NetworkManager-Device-Wireless.top_of_page">org.freedesktop.NetworkManager.Device.Wireless</refentrytitle>
-  <indexterm zone="gdbus-interface-org-freedesktop-NetworkManager-Device-Wireless.top_of_page"><primary sortas="DeviceWifi">org.freedesktop.NetworkManager.Device.Wireless</primary></indexterm>
-  </refmeta>  <refnamediv>    <refname>org.freedesktop.NetworkManager.Device.Wireless</refname>    <refpurpose></refpurpose>  </refnamediv>  <refsynopsisdiv role="synopsis">
-    <title role="synopsis.title">Methods</title>
-    <synopsis>
-<link linkend="gdbus-method-org-freedesktop-NetworkManager-Device-Wireless.GetAccessPoints">GetAccessPoints</link>    (OUT ao    access_points);
-<link linkend="gdbus-method-org-freedesktop-NetworkManager-Device-Wireless.GetAllAccessPoints">GetAllAccessPoints</link> (OUT ao    access_points);
-<link linkend="gdbus-method-org-freedesktop-NetworkManager-Device-Wireless.RequestScan">RequestScan</link>        (IN  a{sv} options);
-</synopsis>
-  </refsynopsisdiv>
-  <refsect1 role="signal_proto">
-    <title role="signal_proto.title">Signals</title>
-    <synopsis>
-<link linkend="gdbus-signal-org-freedesktop-NetworkManager-Device-Wireless.PropertiesChanged">PropertiesChanged</link>  (a{sv} properties);
-<link linkend="gdbus-signal-org-freedesktop-NetworkManager-Device-Wireless.AccessPointAdded">AccessPointAdded</link>   (o     access_point);
-<link linkend="gdbus-signal-org-freedesktop-NetworkManager-Device-Wireless.AccessPointRemoved">AccessPointRemoved</link> (o     access_point);
-</synopsis>
-  </refsect1>
-  <refsect1 role="properties">
-    <title role="properties.title">Properties</title>
-    <synopsis>
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-Wireless.HwAddress">HwAddress</link>             readable   s
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-Wireless.PermHwAddress">PermHwAddress</link>         readable   s
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-Wireless.Mode">Mode</link>                  readable   u
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-Wireless.Bitrate">Bitrate</link>               readable   u
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-Wireless.AccessPoints">AccessPoints</link>          readable   ao
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-Wireless.ActiveAccessPoint">ActiveAccessPoint</link>     readable   o
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-Wireless.WirelessCapabilities">WirelessCapabilities</link>  readable   u
-</synopsis>
-  </refsect1>
-<refsect1 role="desc" id="gdbus-interface-org-freedesktop-NetworkManager-Device-Wireless">
-  <title role="desc.title">Description</title>
-  <para></para>
-</refsect1>
-<refsect1 role="details" id="gdbus-methods-org.freedesktop.NetworkManager.Device.Wireless">
-  <title role="details.title">Method Details</title>
-<refsect2 role="method" id="gdbus-method-org-freedesktop-NetworkManager-Device-Wireless.GetAccessPoints">
-  <title>The GetAccessPoints() method</title>
-  <indexterm zone="gdbus-method-org-freedesktop-NetworkManager-Device-Wireless.GetAccessPoints"><primary sortas="DeviceWifi.GetAccessPoints">org.freedesktop.NetworkManager.Device.Wireless.GetAccessPoints()</primary></indexterm>
-<programlisting>
-GetAccessPoints (OUT ao access_points);
-</programlisting>
-<para>        DEPRECATED. Get the list of access points visible to this device. Note
-        that this list does not include access points which hide their SSID. To
-        retrieve a list of all access points (including hidden ones) use the
-        GetAllAccessPoints() method.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>OUT ao <parameter>access_points</parameter></literal>:</term>
-  <listitem><para>List of access point object paths.</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-<refsect2 role="method" id="gdbus-method-org-freedesktop-NetworkManager-Device-Wireless.GetAllAccessPoints">
-  <title>The GetAllAccessPoints() method</title>
-  <indexterm zone="gdbus-method-org-freedesktop-NetworkManager-Device-Wireless.GetAllAccessPoints"><primary sortas="DeviceWifi.GetAllAccessPoints">org.freedesktop.NetworkManager.Device.Wireless.GetAllAccessPoints()</primary></indexterm>
-<programlisting>
-GetAllAccessPoints (OUT ao access_points);
-</programlisting>
-<para>        Get the list of all access points visible to this device, including hidden
-        ones for which the SSID is not yet known.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>OUT ao <parameter>access_points</parameter></literal>:</term>
-  <listitem><para>List of access point object paths.</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-<refsect2 role="method" id="gdbus-method-org-freedesktop-NetworkManager-Device-Wireless.RequestScan">
-  <title>The RequestScan() method</title>
-  <indexterm zone="gdbus-method-org-freedesktop-NetworkManager-Device-Wireless.RequestScan"><primary sortas="DeviceWifi.RequestScan">org.freedesktop.NetworkManager.Device.Wireless.RequestScan()</primary></indexterm>
-<programlisting>
-RequestScan (IN  a{sv} options);
-</programlisting>
-<para>        Request the device to scan
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>IN a{sv} <parameter>options</parameter></literal>:</term>
-  <listitem><para>Options of scan. Currently 'ssids' option with value of "aay" type is supported.</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-</refsect1>
-<refsect1 role="details" id="gdbus-signals-org.freedesktop.NetworkManager.Device.Wireless">
-  <title role="details.title">Signal Details</title>
-<refsect2 role="signal" id="gdbus-signal-org-freedesktop-NetworkManager-Device-Wireless.PropertiesChanged">
-  <title>The "PropertiesChanged" signal</title>
-  <indexterm zone="gdbus-signal-org-freedesktop-NetworkManager-Device-Wireless.PropertiesChanged"><primary sortas="DeviceWifi::PropertiesChanged">org.freedesktop.NetworkManager.Device.Wireless::PropertiesChanged</primary></indexterm>
-<programlisting>
-PropertiesChanged (a{sv} properties);
-</programlisting>
-<para>        DEPRECATED. Use the standard "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" instead which exists since version NetworkManager 1.2.0.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>a{sv} <parameter>properties</parameter></literal>:</term>
-  <listitem><para>A dictionary containing the changed parameters.</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-<refsect2 role="signal" id="gdbus-signal-org-freedesktop-NetworkManager-Device-Wireless.AccessPointAdded">
-  <title>The "AccessPointAdded" signal</title>
-  <indexterm zone="gdbus-signal-org-freedesktop-NetworkManager-Device-Wireless.AccessPointAdded"><primary sortas="DeviceWifi::AccessPointAdded">org.freedesktop.NetworkManager.Device.Wireless::AccessPointAdded</primary></indexterm>
-<programlisting>
-AccessPointAdded (o access_point);
-</programlisting>
-<para>        Emitted when a new access point is found by the device.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>o <parameter>access_point</parameter></literal>:</term>
-  <listitem><para>The object path of the newly found access point.</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-<refsect2 role="signal" id="gdbus-signal-org-freedesktop-NetworkManager-Device-Wireless.AccessPointRemoved">
-  <title>The "AccessPointRemoved" signal</title>
-  <indexterm zone="gdbus-signal-org-freedesktop-NetworkManager-Device-Wireless.AccessPointRemoved"><primary sortas="DeviceWifi::AccessPointRemoved">org.freedesktop.NetworkManager.Device.Wireless::AccessPointRemoved</primary></indexterm>
-<programlisting>
-AccessPointRemoved (o access_point);
-</programlisting>
-<para>        Emitted when an access point disappears from view of the device.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>o <parameter>access_point</parameter></literal>:</term>
-  <listitem><para>The object path of the access point that has disappeared.</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-</refsect1>
-<refsect1 role="details" id="gdbus-properties-org.freedesktop.NetworkManager.Device.Wireless">
-  <title role="details.title">Property Details</title>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Wireless.HwAddress">
-  <title>The "HwAddress" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-Wireless.HwAddress"><primary sortas="DeviceWifi:HwAddress">org.freedesktop.NetworkManager.Device.Wireless:HwAddress</primary></indexterm>
-<programlisting>
-HwAddress  readable   s
-</programlisting>
-<para>        The active hardware address of the device.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Wireless.PermHwAddress">
-  <title>The "PermHwAddress" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-Wireless.PermHwAddress"><primary sortas="DeviceWifi:PermHwAddress">org.freedesktop.NetworkManager.Device.Wireless:PermHwAddress</primary></indexterm>
-<programlisting>
-PermHwAddress  readable   s
-</programlisting>
-<para>        The permanent hardware address of the device.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Wireless.Mode">
-  <title>The "Mode" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-Wireless.Mode"><primary sortas="DeviceWifi:Mode">org.freedesktop.NetworkManager.Device.Wireless:Mode</primary></indexterm>
-<programlisting>
-Mode  readable   u
-</programlisting>
-<para>        The operating mode of the wireless device.
-</para><para>        Returns: <link linkend="NM80211Mode">NM80211Mode</link>
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Wireless.Bitrate">
-  <title>The "Bitrate" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-Wireless.Bitrate"><primary sortas="DeviceWifi:Bitrate">org.freedesktop.NetworkManager.Device.Wireless:Bitrate</primary></indexterm>
-<programlisting>
-Bitrate  readable   u
-</programlisting>
-<para>        The bit rate currently used by the wireless device, in kilobits/second
-        (Kb/s).
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Wireless.AccessPoints">
-  <title>The "AccessPoints" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-Wireless.AccessPoints"><primary sortas="DeviceWifi:AccessPoints">org.freedesktop.NetworkManager.Device.Wireless:AccessPoints</primary></indexterm>
-<programlisting>
-AccessPoints  readable   ao
-</programlisting>
-<para>        List of object paths of access point visible to this wireless device.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Wireless.ActiveAccessPoint">
-  <title>The "ActiveAccessPoint" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-Wireless.ActiveAccessPoint"><primary sortas="DeviceWifi:ActiveAccessPoint">org.freedesktop.NetworkManager.Device.Wireless:ActiveAccessPoint</primary></indexterm>
-<programlisting>
-ActiveAccessPoint  readable   o
-</programlisting>
-<para>        Object path of the access point currently used by the wireless device.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Wireless.WirelessCapabilities">
-  <title>The "WirelessCapabilities" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-Wireless.WirelessCapabilities"><primary sortas="DeviceWifi:WirelessCapabilities">org.freedesktop.NetworkManager.Device.Wireless:WirelessCapabilities</primary></indexterm>
-<programlisting>
-WirelessCapabilities  readable   u
-</programlisting>
-<para>        The capabilities of the wireless device.
-</para><para>        Returns: <link linkend="NMDeviceWifiCapabilities">NMDeviceWifiCapabilities</link>
-</para>
-</refsect2>
-</refsect1>
-</refentry>
-
diff --git a/introspection/nmdbus-device-wimax-org.freedesktop.NetworkManager.Device.WiMax.xml b/introspection/nmdbus-device-wimax-org.freedesktop.NetworkManager.Device.WiMax.xml
deleted file mode 100644
index d3c1487f..00000000
--- a/introspection/nmdbus-device-wimax-org.freedesktop.NetworkManager.Device.WiMax.xml
+++ /dev/null
@@ -1,192 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-]>
-<refentry id="gdbus-org.freedesktop.NetworkManager.Device.WiMax">
-  <refmeta>    <refentrytitle role="top_of_page" id="gdbus-interface-org-freedesktop-NetworkManager-Device-WiMax.top_of_page">org.freedesktop.NetworkManager.Device.WiMax</refentrytitle>
-  <indexterm zone="gdbus-interface-org-freedesktop-NetworkManager-Device-WiMax.top_of_page"><primary sortas=".Device.WiMax">org.freedesktop.NetworkManager.Device.WiMax</primary></indexterm>
-  </refmeta>  <refnamediv>    <refname>org.freedesktop.NetworkManager.Device.WiMax</refname>    <refpurpose></refpurpose>  </refnamediv>  <refsynopsisdiv role="synopsis">
-    <title role="synopsis.title">Methods</title>
-    <synopsis>
-<link linkend="gdbus-method-org-freedesktop-NetworkManager-Device-WiMax.GetNspList">GetNspList</link> (OUT ao nsps);
-</synopsis>
-  </refsynopsisdiv>
-  <refsect1 role="signal_proto">
-    <title role="signal_proto.title">Signals</title>
-    <synopsis>
-<link linkend="gdbus-signal-org-freedesktop-NetworkManager-Device-WiMax.PropertiesChanged">PropertiesChanged</link> (a{sv} properties);
-<link linkend="gdbus-signal-org-freedesktop-NetworkManager-Device-WiMax.NspAdded">NspAdded</link>          (o     nsp);
-<link linkend="gdbus-signal-org-freedesktop-NetworkManager-Device-WiMax.NspRemoved">NspRemoved</link>        (o     nsp);
-</synopsis>
-  </refsect1>
-  <refsect1 role="properties">
-    <title role="properties.title">Properties</title>
-    <synopsis>
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-WiMax.Nsps">Nsps</link>             readable   ao
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-WiMax.HwAddress">HwAddress</link>        readable   s
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-WiMax.CenterFrequency">CenterFrequency</link>  readable   u
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-WiMax.Rssi">Rssi</link>             readable   i
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-WiMax.Cinr">Cinr</link>             readable   i
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-WiMax.TxPower">TxPower</link>          readable   i
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-WiMax.Bsid">Bsid</link>             readable   s
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Device-WiMax.ActiveNsp">ActiveNsp</link>        readable   o
-</synopsis>
-  </refsect1>
-<refsect1 role="desc" id="gdbus-interface-org-freedesktop-NetworkManager-Device-WiMax">
-  <title role="desc.title">Description</title>
-  <para></para>
-</refsect1>
-<refsect1 role="details" id="gdbus-methods-org.freedesktop.NetworkManager.Device.WiMax">
-  <title role="details.title">Method Details</title>
-<refsect2 role="method" id="gdbus-method-org-freedesktop-NetworkManager-Device-WiMax.GetNspList">
-  <title>The GetNspList() method</title>
-  <indexterm zone="gdbus-method-org-freedesktop-NetworkManager-Device-WiMax.GetNspList"><primary sortas=".Device.WiMax.GetNspList">org.freedesktop.NetworkManager.Device.WiMax.GetNspList()</primary></indexterm>
-<programlisting>
-GetNspList (OUT ao nsps);
-</programlisting>
-<para>        Get the list of NSPs visible to this device.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>OUT ao <parameter>nsps</parameter></literal>:</term>
-  <listitem><para>List of NSP object paths</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-</refsect1>
-<refsect1 role="details" id="gdbus-signals-org.freedesktop.NetworkManager.Device.WiMax">
-  <title role="details.title">Signal Details</title>
-<refsect2 role="signal" id="gdbus-signal-org-freedesktop-NetworkManager-Device-WiMax.PropertiesChanged">
-  <title>The "PropertiesChanged" signal</title>
-  <indexterm zone="gdbus-signal-org-freedesktop-NetworkManager-Device-WiMax.PropertiesChanged"><primary sortas=".Device.WiMax::PropertiesChanged">org.freedesktop.NetworkManager.Device.WiMax::PropertiesChanged</primary></indexterm>
-<programlisting>
-PropertiesChanged (a{sv} properties);
-</programlisting>
-<para>        DEPRECATED. Use the standard "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" instead which exists since version NetworkManager 1.2.0.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>a{sv} <parameter>properties</parameter></literal>:</term>
-  <listitem><para>A dictionary mapping property names to variant boxed values.</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-<refsect2 role="signal" id="gdbus-signal-org-freedesktop-NetworkManager-Device-WiMax.NspAdded">
-  <title>The "NspAdded" signal</title>
-  <indexterm zone="gdbus-signal-org-freedesktop-NetworkManager-Device-WiMax.NspAdded"><primary sortas=".Device.WiMax::NspAdded">org.freedesktop.NetworkManager.Device.WiMax::NspAdded</primary></indexterm>
-<programlisting>
-NspAdded (o nsp);
-</programlisting>
-<para>        Emitted when a new NSP is found by the device.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>o <parameter>nsp</parameter></literal>:</term>
-  <listitem><para>The object path of the newly found NSP.</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-<refsect2 role="signal" id="gdbus-signal-org-freedesktop-NetworkManager-Device-WiMax.NspRemoved">
-  <title>The "NspRemoved" signal</title>
-  <indexterm zone="gdbus-signal-org-freedesktop-NetworkManager-Device-WiMax.NspRemoved"><primary sortas=".Device.WiMax::NspRemoved">org.freedesktop.NetworkManager.Device.WiMax::NspRemoved</primary></indexterm>
-<programlisting>
-NspRemoved (o nsp);
-</programlisting>
-<para>        Emitted when an NSP disappears from view of the device.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>o <parameter>nsp</parameter></literal>:</term>
-  <listitem><para>The object path of the NSP that has disappeared.</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-</refsect1>
-<refsect1 role="details" id="gdbus-properties-org.freedesktop.NetworkManager.Device.WiMax">
-  <title role="details.title">Property Details</title>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-WiMax.Nsps">
-  <title>The "Nsps" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-WiMax.Nsps"><primary sortas=".Device.WiMax:Nsps">org.freedesktop.NetworkManager.Device.WiMax:Nsps</primary></indexterm>
-<programlisting>
-Nsps  readable   ao
-</programlisting>
-<para>        List of object paths of Network Service Providers (NSPs) visible to this
-        WiMAX device.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-WiMax.HwAddress">
-  <title>The "HwAddress" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-WiMax.HwAddress"><primary sortas=".Device.WiMax:HwAddress">org.freedesktop.NetworkManager.Device.WiMax:HwAddress</primary></indexterm>
-<programlisting>
-HwAddress  readable   s
-</programlisting>
-<para>        Hardware address of the device.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-WiMax.CenterFrequency">
-  <title>The "CenterFrequency" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-WiMax.CenterFrequency"><primary sortas=".Device.WiMax:CenterFrequency">org.freedesktop.NetworkManager.Device.WiMax:CenterFrequency</primary></indexterm>
-<programlisting>
-CenterFrequency  readable   u
-</programlisting>
-<para>        Center frequency (in KHz) of the radio channel the device is using to
-        communicate with the network when connected. Has no meaning when the
-        device is not connected.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-WiMax.Rssi">
-  <title>The "Rssi" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-WiMax.Rssi"><primary sortas=".Device.WiMax:Rssi">org.freedesktop.NetworkManager.Device.WiMax:Rssi</primary></indexterm>
-<programlisting>
-Rssi  readable   i
-</programlisting>
-<para>        RSSI of the current radio link in dBm. This value indicates how strong the
-        raw received RF signal from the base station is, but does not indicate the
-        overall quality of the radio link. Has no meaning when the device is not
-        connected.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-WiMax.Cinr">
-  <title>The "Cinr" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-WiMax.Cinr"><primary sortas=".Device.WiMax:Cinr">org.freedesktop.NetworkManager.Device.WiMax:Cinr</primary></indexterm>
-<programlisting>
-Cinr  readable   i
-</programlisting>
-<para>        CINR (Carrier to Interference + Noise Ratio) of the current radio link in
-        dB. CINR is a more accurate measure of radio link quality. Has no meaning
-        when the device is not connected.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-WiMax.TxPower">
-  <title>The "TxPower" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-WiMax.TxPower"><primary sortas=".Device.WiMax:TxPower">org.freedesktop.NetworkManager.Device.WiMax:TxPower</primary></indexterm>
-<programlisting>
-TxPower  readable   i
-</programlisting>
-<para>        Average power of the last burst transmitted by the device, in units of 0.5
-        dBm. i.e. a TxPower of -11 represents an actual device TX power of -5.5
-        dBm. Has no meaning when the device is not connected.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-WiMax.Bsid">
-  <title>The "Bsid" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-WiMax.Bsid"><primary sortas=".Device.WiMax:Bsid">org.freedesktop.NetworkManager.Device.WiMax:Bsid</primary></indexterm>
-<programlisting>
-Bsid  readable   s
-</programlisting>
-<para>        The ID of the serving base station as received from the network. Has no
-        meaning when the device is not connected.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-WiMax.ActiveNsp">
-  <title>The "ActiveNsp" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Device-WiMax.ActiveNsp"><primary sortas=".Device.WiMax:ActiveNsp">org.freedesktop.NetworkManager.Device.WiMax:ActiveNsp</primary></indexterm>
-<programlisting>
-ActiveNsp  readable   o
-</programlisting>
-<para>        Object path of the NSP currently used by the WiMax device.
-</para>
-</refsect2>
-</refsect1>
-</refentry>
-
diff --git a/introspection/nmdbus-dhcp4-config-org.freedesktop.NetworkManager.DHCP4Config.xml b/introspection/nmdbus-dhcp4-config-org.freedesktop.NetworkManager.DHCP4Config.xml
deleted file mode 100644
index e50f3fe6..00000000
--- a/introspection/nmdbus-dhcp4-config-org.freedesktop.NetworkManager.DHCP4Config.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-]>
-<refentry id="gdbus-org.freedesktop.NetworkManager.DHCP4Config">
-  <refmeta>    <refentrytitle role="top_of_page" id="gdbus-interface-org-freedesktop-NetworkManager-DHCP4Config.top_of_page">org.freedesktop.NetworkManager.DHCP4Config</refentrytitle>
-  <indexterm zone="gdbus-interface-org-freedesktop-NetworkManager-DHCP4Config.top_of_page"><primary sortas="Dhcp4Config">org.freedesktop.NetworkManager.DHCP4Config</primary></indexterm>
-  </refmeta>  <refnamediv>    <refname>org.freedesktop.NetworkManager.DHCP4Config</refname>    <refpurpose></refpurpose>  </refnamediv>  <refsect1 role="signal_proto">
-    <title role="signal_proto.title">Signals</title>
-    <synopsis>
-<link linkend="gdbus-signal-org-freedesktop-NetworkManager-DHCP4Config.PropertiesChanged">PropertiesChanged</link> (a{sv} properties);
-</synopsis>
-  </refsect1>
-  <refsect1 role="properties">
-    <title role="properties.title">Properties</title>
-    <synopsis>
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-DHCP4Config.Options">Options</link>  readable   a{sv}
-</synopsis>
-  </refsect1>
-<refsect1 role="desc" id="gdbus-interface-org-freedesktop-NetworkManager-DHCP4Config">
-  <title role="desc.title">Description</title>
-  <para>      Options and configuration returned by the IPv4 DHCP server.
-</para>
-</refsect1>
-<refsect1 role="details" id="gdbus-signals-org.freedesktop.NetworkManager.DHCP4Config">
-  <title role="details.title">Signal Details</title>
-<refsect2 role="signal" id="gdbus-signal-org-freedesktop-NetworkManager-DHCP4Config.PropertiesChanged">
-  <title>The "PropertiesChanged" signal</title>
-  <indexterm zone="gdbus-signal-org-freedesktop-NetworkManager-DHCP4Config.PropertiesChanged"><primary sortas="Dhcp4Config::PropertiesChanged">org.freedesktop.NetworkManager.DHCP4Config::PropertiesChanged</primary></indexterm>
-<programlisting>
-PropertiesChanged (a{sv} properties);
-</programlisting>
-<para>        DEPRECATED. Use the standard "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" instead which exists since version NetworkManager 1.2.0.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>a{sv} <parameter>properties</parameter></literal>:</term>
-  <listitem><para>A dictionary mapping property names to variant boxed values</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-</refsect1>
-<refsect1 role="details" id="gdbus-properties-org.freedesktop.NetworkManager.DHCP4Config">
-  <title role="details.title">Property Details</title>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-DHCP4Config.Options">
-  <title>The "Options" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-DHCP4Config.Options"><primary sortas="Dhcp4Config:Options">org.freedesktop.NetworkManager.DHCP4Config:Options</primary></indexterm>
-<programlisting>
-Options  readable   a{sv}
-</programlisting>
-<para>        Configuration options returned by a DHCP server, if any.
-</para>
-</refsect2>
-</refsect1>
-</refentry>
-
diff --git a/introspection/nmdbus-dhcp6-config-org.freedesktop.NetworkManager.DHCP6Config.xml b/introspection/nmdbus-dhcp6-config-org.freedesktop.NetworkManager.DHCP6Config.xml
deleted file mode 100644
index bd3bb4c7..00000000
--- a/introspection/nmdbus-dhcp6-config-org.freedesktop.NetworkManager.DHCP6Config.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-]>
-<refentry id="gdbus-org.freedesktop.NetworkManager.DHCP6Config">
-  <refmeta>    <refentrytitle role="top_of_page" id="gdbus-interface-org-freedesktop-NetworkManager-DHCP6Config.top_of_page">org.freedesktop.NetworkManager.DHCP6Config</refentrytitle>
-  <indexterm zone="gdbus-interface-org-freedesktop-NetworkManager-DHCP6Config.top_of_page"><primary sortas="Dhcp6Config">org.freedesktop.NetworkManager.DHCP6Config</primary></indexterm>
-  </refmeta>  <refnamediv>    <refname>org.freedesktop.NetworkManager.DHCP6Config</refname>    <refpurpose></refpurpose>  </refnamediv>  <refsect1 role="signal_proto">
-    <title role="signal_proto.title">Signals</title>
-    <synopsis>
-<link linkend="gdbus-signal-org-freedesktop-NetworkManager-DHCP6Config.PropertiesChanged">PropertiesChanged</link> (a{sv} properties);
-</synopsis>
-  </refsect1>
-  <refsect1 role="properties">
-    <title role="properties.title">Properties</title>
-    <synopsis>
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-DHCP6Config.Options">Options</link>  readable   a{sv}
-</synopsis>
-  </refsect1>
-<refsect1 role="desc" id="gdbus-interface-org-freedesktop-NetworkManager-DHCP6Config">
-  <title role="desc.title">Description</title>
-  <para>      Options and configuration returned by the IPv6 DHCP server.
-</para>
-</refsect1>
-<refsect1 role="details" id="gdbus-signals-org.freedesktop.NetworkManager.DHCP6Config">
-  <title role="details.title">Signal Details</title>
-<refsect2 role="signal" id="gdbus-signal-org-freedesktop-NetworkManager-DHCP6Config.PropertiesChanged">
-  <title>The "PropertiesChanged" signal</title>
-  <indexterm zone="gdbus-signal-org-freedesktop-NetworkManager-DHCP6Config.PropertiesChanged"><primary sortas="Dhcp6Config::PropertiesChanged">org.freedesktop.NetworkManager.DHCP6Config::PropertiesChanged</primary></indexterm>
-<programlisting>
-PropertiesChanged (a{sv} properties);
-</programlisting>
-<para>        DEPRECATED. Use the standard "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" instead which exists since version NetworkManager 1.2.0.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>a{sv} <parameter>properties</parameter></literal>:</term>
-  <listitem><para>A dictionary mapping property names to variant boxed values</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-</refsect1>
-<refsect1 role="details" id="gdbus-properties-org.freedesktop.NetworkManager.DHCP6Config">
-  <title role="details.title">Property Details</title>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-DHCP6Config.Options">
-  <title>The "Options" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-DHCP6Config.Options"><primary sortas="Dhcp6Config:Options">org.freedesktop.NetworkManager.DHCP6Config:Options</primary></indexterm>
-<programlisting>
-Options  readable   a{sv}
-</programlisting>
-<para>        Configuration options returned by a DHCP server, if any.
-</para>
-</refsect2>
-</refsect1>
-</refentry>
-
diff --git a/introspection/nmdbus-ip4-config-org.freedesktop.NetworkManager.IP4Config.xml b/introspection/nmdbus-ip4-config-org.freedesktop.NetworkManager.IP4Config.xml
deleted file mode 100644
index 2a337154..00000000
--- a/introspection/nmdbus-ip4-config-org.freedesktop.NetworkManager.IP4Config.xml
+++ /dev/null
@@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-]>
-<refentry id="gdbus-org.freedesktop.NetworkManager.IP4Config">
-  <refmeta>    <refentrytitle role="top_of_page" id="gdbus-interface-org-freedesktop-NetworkManager-IP4Config.top_of_page">org.freedesktop.NetworkManager.IP4Config</refentrytitle>
-  <indexterm zone="gdbus-interface-org-freedesktop-NetworkManager-IP4Config.top_of_page"><primary sortas=".IP4Config">org.freedesktop.NetworkManager.IP4Config</primary></indexterm>
-  </refmeta>  <refnamediv>    <refname>org.freedesktop.NetworkManager.IP4Config</refname>    <refpurpose></refpurpose>  </refnamediv>  <refsect1 role="signal_proto">
-    <title role="signal_proto.title">Signals</title>
-    <synopsis>
-<link linkend="gdbus-signal-org-freedesktop-NetworkManager-IP4Config.PropertiesChanged">PropertiesChanged</link> (a{sv} properties);
-</synopsis>
-  </refsect1>
-  <refsect1 role="properties">
-    <title role="properties.title">Properties</title>
-    <synopsis>
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-IP4Config.Addresses">Addresses</link>    readable   aau
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-IP4Config.AddressData">AddressData</link>  readable   aa{sv}
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-IP4Config.Gateway">Gateway</link>      readable   s
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-IP4Config.Routes">Routes</link>       readable   aau
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-IP4Config.RouteData">RouteData</link>    readable   aa{sv}
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-IP4Config.Nameservers">Nameservers</link>  readable   au
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-IP4Config.Domains">Domains</link>      readable   as
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-IP4Config.Searches">Searches</link>     readable   as
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-IP4Config.DnsOptions">DnsOptions</link>   readable   as
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-IP4Config.DnsPriority">DnsPriority</link>  readable   i
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-IP4Config.WinsServers">WinsServers</link>  readable   au
-</synopsis>
-  </refsect1>
-<refsect1 role="desc" id="gdbus-interface-org-freedesktop-NetworkManager-IP4Config">
-  <title role="desc.title">Description</title>
-  <para></para>
-</refsect1>
-<refsect1 role="details" id="gdbus-signals-org.freedesktop.NetworkManager.IP4Config">
-  <title role="details.title">Signal Details</title>
-<refsect2 role="signal" id="gdbus-signal-org-freedesktop-NetworkManager-IP4Config.PropertiesChanged">
-  <title>The "PropertiesChanged" signal</title>
-  <indexterm zone="gdbus-signal-org-freedesktop-NetworkManager-IP4Config.PropertiesChanged"><primary sortas=".IP4Config::PropertiesChanged">org.freedesktop.NetworkManager.IP4Config::PropertiesChanged</primary></indexterm>
-<programlisting>
-PropertiesChanged (a{sv} properties);
-</programlisting>
-<para>        DEPRECATED. Use the standard "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" instead which exists since version NetworkManager 1.2.0.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>a{sv} <parameter>properties</parameter></literal>:</term>
-  <listitem><para>A dictionary mapping property names to variant boxed values</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-</refsect1>
-<refsect1 role="details" id="gdbus-properties-org.freedesktop.NetworkManager.IP4Config">
-  <title role="details.title">Property Details</title>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-IP4Config.Addresses">
-  <title>The "Addresses" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-IP4Config.Addresses"><primary sortas=".IP4Config:Addresses">org.freedesktop.NetworkManager.IP4Config:Addresses</primary></indexterm>
-<programlisting>
-Addresses  readable   aau
-</programlisting>
-<para>        Array of arrays of IPv4 address/prefix/gateway. All 3 elements of each
-        array are in network byte order. Essentially: [(addr, prefix, gateway),
-        (addr, prefix, gateway), ...] Deprecated: use AddressData and Gateway
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-IP4Config.AddressData">
-  <title>The "AddressData" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-IP4Config.AddressData"><primary sortas=".IP4Config:AddressData">org.freedesktop.NetworkManager.IP4Config:AddressData</primary></indexterm>
-<programlisting>
-AddressData  readable   aa{sv}
-</programlisting>
-<para>        Array of IP address data objects. All addresses will include "address" (an
-        IP address string), and "prefix" (a uint). Some addresses may include
-        additional attributes.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-IP4Config.Gateway">
-  <title>The "Gateway" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-IP4Config.Gateway"><primary sortas=".IP4Config:Gateway">org.freedesktop.NetworkManager.IP4Config:Gateway</primary></indexterm>
-<programlisting>
-Gateway  readable   s
-</programlisting>
-<para>        The gateway in use.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-IP4Config.Routes">
-  <title>The "Routes" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-IP4Config.Routes"><primary sortas=".IP4Config:Routes">org.freedesktop.NetworkManager.IP4Config:Routes</primary></indexterm>
-<programlisting>
-Routes  readable   aau
-</programlisting>
-<para>        Arrays of IPv4 route/prefix/next-hop/metric. All 4 elements of each tuple
-        are in network byte order. 'route' and 'next hop' are IPv4 addresses,
-        while prefix and metric are simple unsigned integers. Essentially:
-        [(route, prefix, next-hop, metric), (route, prefix, next-hop, metric),
-        ...] Deprecated: use RouteData
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-IP4Config.RouteData">
-  <title>The "RouteData" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-IP4Config.RouteData"><primary sortas=".IP4Config:RouteData">org.freedesktop.NetworkManager.IP4Config:RouteData</primary></indexterm>
-<programlisting>
-RouteData  readable   aa{sv}
-</programlisting>
-<para>        Array of IP route data objects. All routes will include "dest" (an IP
-        address string) and "prefix" (a uint). Some routes may include "next-hop"
-        (an IP address string), "metric" (a uint), and additional attributes.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-IP4Config.Nameservers">
-  <title>The "Nameservers" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-IP4Config.Nameservers"><primary sortas=".IP4Config:Nameservers">org.freedesktop.NetworkManager.IP4Config:Nameservers</primary></indexterm>
-<programlisting>
-Nameservers  readable   au
-</programlisting>
-<para>        The nameservers in use.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-IP4Config.Domains">
-  <title>The "Domains" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-IP4Config.Domains"><primary sortas=".IP4Config:Domains">org.freedesktop.NetworkManager.IP4Config:Domains</primary></indexterm>
-<programlisting>
-Domains  readable   as
-</programlisting>
-<para>        A list of domains this address belongs to.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-IP4Config.Searches">
-  <title>The "Searches" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-IP4Config.Searches"><primary sortas=".IP4Config:Searches">org.freedesktop.NetworkManager.IP4Config:Searches</primary></indexterm>
-<programlisting>
-Searches  readable   as
-</programlisting>
-<para>        A list of dns searches.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-IP4Config.DnsOptions">
-  <title>The "DnsOptions" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-IP4Config.DnsOptions"><primary sortas=".IP4Config:DnsOptions">org.freedesktop.NetworkManager.IP4Config:DnsOptions</primary></indexterm>
-<programlisting>
-DnsOptions  readable   as
-</programlisting>
-<para>        A list of DNS options that modify the behavior of the DNS resolver. See
-        resolv.conf(5) manual page for the list of supported options.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-IP4Config.DnsPriority">
-  <title>The "DnsPriority" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-IP4Config.DnsPriority"><primary sortas=".IP4Config:DnsPriority">org.freedesktop.NetworkManager.IP4Config:DnsPriority</primary></indexterm>
-<programlisting>
-DnsPriority  readable   i
-</programlisting>
-<para>        The relative priority of DNS servers.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-IP4Config.WinsServers">
-  <title>The "WinsServers" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-IP4Config.WinsServers"><primary sortas=".IP4Config:WinsServers">org.freedesktop.NetworkManager.IP4Config:WinsServers</primary></indexterm>
-<programlisting>
-WinsServers  readable   au
-</programlisting>
-<para>        The Windows Internet Name Service servers associated with the connection.
-        Each address is in network byte order.
-</para>
-</refsect2>
-</refsect1>
-</refentry>
-
diff --git a/introspection/nmdbus-ip6-config-org.freedesktop.NetworkManager.IP6Config.xml b/introspection/nmdbus-ip6-config-org.freedesktop.NetworkManager.IP6Config.xml
deleted file mode 100644
index 99fe3324..00000000
--- a/introspection/nmdbus-ip6-config-org.freedesktop.NetworkManager.IP6Config.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-]>
-<refentry id="gdbus-org.freedesktop.NetworkManager.IP6Config">
-  <refmeta>    <refentrytitle role="top_of_page" id="gdbus-interface-org-freedesktop-NetworkManager-IP6Config.top_of_page">org.freedesktop.NetworkManager.IP6Config</refentrytitle>
-  <indexterm zone="gdbus-interface-org-freedesktop-NetworkManager-IP6Config.top_of_page"><primary sortas=".IP6Config">org.freedesktop.NetworkManager.IP6Config</primary></indexterm>
-  </refmeta>  <refnamediv>    <refname>org.freedesktop.NetworkManager.IP6Config</refname>    <refpurpose></refpurpose>  </refnamediv>  <refsect1 role="signal_proto">
-    <title role="signal_proto.title">Signals</title>
-    <synopsis>
-<link linkend="gdbus-signal-org-freedesktop-NetworkManager-IP6Config.PropertiesChanged">PropertiesChanged</link> (a{sv} properties);
-</synopsis>
-  </refsect1>
-  <refsect1 role="properties">
-    <title role="properties.title">Properties</title>
-    <synopsis>
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-IP6Config.Addresses">Addresses</link>    readable   a(ayuay)
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-IP6Config.AddressData">AddressData</link>  readable   aa{sv}
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-IP6Config.Gateway">Gateway</link>      readable   s
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-IP6Config.Routes">Routes</link>       readable   a(ayuayu)
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-IP6Config.RouteData">RouteData</link>    readable   aa{sv}
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-IP6Config.Nameservers">Nameservers</link>  readable   aay
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-IP6Config.Domains">Domains</link>      readable   as
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-IP6Config.Searches">Searches</link>     readable   as
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-IP6Config.DnsOptions">DnsOptions</link>   readable   as
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-IP6Config.DnsPriority">DnsPriority</link>  readable   i
-</synopsis>
-  </refsect1>
-<refsect1 role="desc" id="gdbus-interface-org-freedesktop-NetworkManager-IP6Config">
-  <title role="desc.title">Description</title>
-  <para></para>
-</refsect1>
-<refsect1 role="details" id="gdbus-signals-org.freedesktop.NetworkManager.IP6Config">
-  <title role="details.title">Signal Details</title>
-<refsect2 role="signal" id="gdbus-signal-org-freedesktop-NetworkManager-IP6Config.PropertiesChanged">
-  <title>The "PropertiesChanged" signal</title>
-  <indexterm zone="gdbus-signal-org-freedesktop-NetworkManager-IP6Config.PropertiesChanged"><primary sortas=".IP6Config::PropertiesChanged">org.freedesktop.NetworkManager.IP6Config::PropertiesChanged</primary></indexterm>
-<programlisting>
-PropertiesChanged (a{sv} properties);
-</programlisting>
-<para>        DEPRECATED. Use the standard "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" instead which exists since version NetworkManager 1.2.0.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>a{sv} <parameter>properties</parameter></literal>:</term>
-  <listitem><para>A dictionary mapping property names to variant boxed values</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-</refsect1>
-<refsect1 role="details" id="gdbus-properties-org.freedesktop.NetworkManager.IP6Config">
-  <title role="details.title">Property Details</title>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-IP6Config.Addresses">
-  <title>The "Addresses" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-IP6Config.Addresses"><primary sortas=".IP6Config:Addresses">org.freedesktop.NetworkManager.IP6Config:Addresses</primary></indexterm>
-<programlisting>
-Addresses  readable   a(ayuay)
-</programlisting>
-<para>        Array of tuples of IPv6 address/prefix/gateway. Deprecated: use
-        AddressData and Gateway.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-IP6Config.AddressData">
-  <title>The "AddressData" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-IP6Config.AddressData"><primary sortas=".IP6Config:AddressData">org.freedesktop.NetworkManager.IP6Config:AddressData</primary></indexterm>
-<programlisting>
-AddressData  readable   aa{sv}
-</programlisting>
-<para>        Array of IP address data objects. All addresses will include "address" (an
-        IP address string), and "prefix" (a uint). Some addresses may include
-        additional attributes.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-IP6Config.Gateway">
-  <title>The "Gateway" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-IP6Config.Gateway"><primary sortas=".IP6Config:Gateway">org.freedesktop.NetworkManager.IP6Config:Gateway</primary></indexterm>
-<programlisting>
-Gateway  readable   s
-</programlisting>
-<para>        The gateway in use.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-IP6Config.Routes">
-  <title>The "Routes" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-IP6Config.Routes"><primary sortas=".IP6Config:Routes">org.freedesktop.NetworkManager.IP6Config:Routes</primary></indexterm>
-<programlisting>
-Routes  readable   a(ayuayu)
-</programlisting>
-<para>        Tuples of IPv6 route/prefix/next-hop/metric. Deprecated: use RouteData
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-IP6Config.RouteData">
-  <title>The "RouteData" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-IP6Config.RouteData"><primary sortas=".IP6Config:RouteData">org.freedesktop.NetworkManager.IP6Config:RouteData</primary></indexterm>
-<programlisting>
-RouteData  readable   aa{sv}
-</programlisting>
-<para>        Array of IP route data objects. All routes will include "dest" (an IP
-        address string) and "prefix" (a uint). Some routes may include "next-hop"
-        (an IP address string), "metric" (a uint), and additional attributes.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-IP6Config.Nameservers">
-  <title>The "Nameservers" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-IP6Config.Nameservers"><primary sortas=".IP6Config:Nameservers">org.freedesktop.NetworkManager.IP6Config:Nameservers</primary></indexterm>
-<programlisting>
-Nameservers  readable   aay
-</programlisting>
-<para>        The nameservers in use.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-IP6Config.Domains">
-  <title>The "Domains" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-IP6Config.Domains"><primary sortas=".IP6Config:Domains">org.freedesktop.NetworkManager.IP6Config:Domains</primary></indexterm>
-<programlisting>
-Domains  readable   as
-</programlisting>
-<para>        A list of domains this address belongs to.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-IP6Config.Searches">
-  <title>The "Searches" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-IP6Config.Searches"><primary sortas=".IP6Config:Searches">org.freedesktop.NetworkManager.IP6Config:Searches</primary></indexterm>
-<programlisting>
-Searches  readable   as
-</programlisting>
-<para>        A list of dns searches.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-IP6Config.DnsOptions">
-  <title>The "DnsOptions" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-IP6Config.DnsOptions"><primary sortas=".IP6Config:DnsOptions">org.freedesktop.NetworkManager.IP6Config:DnsOptions</primary></indexterm>
-<programlisting>
-DnsOptions  readable   as
-</programlisting>
-<para>        A list of DNS options that modify the behavior of the DNS resolver. See
-        resolv.conf(5) manual page for the list of supported options.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-IP6Config.DnsPriority">
-  <title>The "DnsPriority" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-IP6Config.DnsPriority"><primary sortas=".IP6Config:DnsPriority">org.freedesktop.NetworkManager.IP6Config:DnsPriority</primary></indexterm>
-<programlisting>
-DnsPriority  readable   i
-</programlisting>
-<para>        The relative priority of DNS servers.
-</para>
-</refsect2>
-</refsect1>
-</refentry>
-
diff --git a/introspection/nmdbus-manager-org.freedesktop.NetworkManager.xml b/introspection/nmdbus-manager-org.freedesktop.NetworkManager.xml
deleted file mode 100644
index c7ded931..00000000
--- a/introspection/nmdbus-manager-org.freedesktop.NetworkManager.xml
+++ /dev/null
@@ -1,726 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-]>
-<refentry id="gdbus-org.freedesktop.NetworkManager">
-  <refmeta>    <refentrytitle role="top_of_page" id="gdbus-interface-org-freedesktop-NetworkManager.top_of_page">org.freedesktop.NetworkManager</refentrytitle>
-  <indexterm zone="gdbus-interface-org-freedesktop-NetworkManager.top_of_page"><primary sortas="Manager">org.freedesktop.NetworkManager</primary></indexterm>
-  </refmeta>  <refnamediv>    <refname>org.freedesktop.NetworkManager</refname>    <refpurpose></refpurpose>  </refnamediv>  <refsynopsisdiv role="synopsis">
-    <title role="synopsis.title">Methods</title>
-    <synopsis>
-<link linkend="gdbus-method-org-freedesktop-NetworkManager.Reload">Reload</link>                   (IN  u         flags);
-<link linkend="gdbus-method-org-freedesktop-NetworkManager.GetDevices">GetDevices</link>               (OUT ao        devices);
-<link linkend="gdbus-method-org-freedesktop-NetworkManager.GetAllDevices">GetAllDevices</link>            (OUT ao        devices);
-<link linkend="gdbus-method-org-freedesktop-NetworkManager.GetDeviceByIpIface">GetDeviceByIpIface</link>       (IN  s         iface,
-                          OUT o         device);
-<link linkend="gdbus-method-org-freedesktop-NetworkManager.ActivateConnection">ActivateConnection</link>       (IN  o         connection,
-                          IN  o         device,
-                          IN  o         specific_object,
-                          OUT o         active_connection);
-<link linkend="gdbus-method-org-freedesktop-NetworkManager.AddAndActivateConnection">AddAndActivateConnection</link> (IN  a{sa{sv}} connection,
-                          IN  o         device,
-                          IN  o         specific_object,
-                          OUT o         path,
-                          OUT o         active_connection);
-<link linkend="gdbus-method-org-freedesktop-NetworkManager.DeactivateConnection">DeactivateConnection</link>     (IN  o         active_connection);
-<link linkend="gdbus-method-org-freedesktop-NetworkManager.Sleep">Sleep</link>                    (IN  b         sleep);
-<link linkend="gdbus-method-org-freedesktop-NetworkManager.Enable">Enable</link>                   (IN  b         enable);
-<link linkend="gdbus-method-org-freedesktop-NetworkManager.GetPermissions">GetPermissions</link>           (OUT a{ss}     permissions);
-<link linkend="gdbus-method-org-freedesktop-NetworkManager.SetLogging">SetLogging</link>               (IN  s         level,
-                          IN  s         domains);
-<link linkend="gdbus-method-org-freedesktop-NetworkManager.GetLogging">GetLogging</link>               (OUT s         level,
-                          OUT s         domains);
-<link linkend="gdbus-method-org-freedesktop-NetworkManager.CheckConnectivity">CheckConnectivity</link>        (OUT u         connectivity);
-<link linkend="gdbus-method-org-freedesktop-NetworkManager.state">state</link>                    (OUT u         state);
-<link linkend="gdbus-method-org-freedesktop-NetworkManager.CheckpointCreate">CheckpointCreate</link>         (IN  ao        devices,
-                          IN  u         rollback_timeout,
-                          IN  u         flags,
-                          OUT o         checkpoint);
-<link linkend="gdbus-method-org-freedesktop-NetworkManager.CheckpointDestroy">CheckpointDestroy</link>        (IN  o         checkpoint);
-<link linkend="gdbus-method-org-freedesktop-NetworkManager.CheckpointRollback">CheckpointRollback</link>       (IN  o         checkpoint,
-                          OUT a{su}     result);
-</synopsis>
-  </refsynopsisdiv>
-  <refsect1 role="signal_proto">
-    <title role="signal_proto.title">Signals</title>
-    <synopsis>
-<link linkend="gdbus-signal-org-freedesktop-NetworkManager.CheckPermissions">CheckPermissions</link>  ();
-<link linkend="gdbus-signal-org-freedesktop-NetworkManager.StateChanged">StateChanged</link>      (u     state);
-<link linkend="gdbus-signal-org-freedesktop-NetworkManager.PropertiesChanged">PropertiesChanged</link> (a{sv} properties);
-<link linkend="gdbus-signal-org-freedesktop-NetworkManager.DeviceAdded">DeviceAdded</link>       (o     device_path);
-<link linkend="gdbus-signal-org-freedesktop-NetworkManager.DeviceRemoved">DeviceRemoved</link>     (o     device_path);
-</synopsis>
-  </refsect1>
-  <refsect1 role="properties">
-    <title role="properties.title">Properties</title>
-    <synopsis>
-<link linkend="gdbus-property-org-freedesktop-NetworkManager.Devices">Devices</link>                  readable   ao
-<link linkend="gdbus-property-org-freedesktop-NetworkManager.AllDevices">AllDevices</link>               readable   ao
-<link linkend="gdbus-property-org-freedesktop-NetworkManager.NetworkingEnabled">NetworkingEnabled</link>        readable   b
-<link linkend="gdbus-property-org-freedesktop-NetworkManager.WirelessEnabled">WirelessEnabled</link>          readwrite  b
-<link linkend="gdbus-property-org-freedesktop-NetworkManager.WirelessHardwareEnabled">WirelessHardwareEnabled</link>  readable   b
-<link linkend="gdbus-property-org-freedesktop-NetworkManager.WwanEnabled">WwanEnabled</link>              readwrite  b
-<link linkend="gdbus-property-org-freedesktop-NetworkManager.WwanHardwareEnabled">WwanHardwareEnabled</link>      readable   b
-<link linkend="gdbus-property-org-freedesktop-NetworkManager.WimaxEnabled">WimaxEnabled</link>             readwrite  b
-<link linkend="gdbus-property-org-freedesktop-NetworkManager.WimaxHardwareEnabled">WimaxHardwareEnabled</link>     readable   b
-<link linkend="gdbus-property-org-freedesktop-NetworkManager.ActiveConnections">ActiveConnections</link>        readable   ao
-<link linkend="gdbus-property-org-freedesktop-NetworkManager.PrimaryConnection">PrimaryConnection</link>        readable   o
-<link linkend="gdbus-property-org-freedesktop-NetworkManager.PrimaryConnectionType">PrimaryConnectionType</link>    readable   s
-<link linkend="gdbus-property-org-freedesktop-NetworkManager.Metered">Metered</link>                  readable   u
-<link linkend="gdbus-property-org-freedesktop-NetworkManager.ActivatingConnection">ActivatingConnection</link>     readable   o
-<link linkend="gdbus-property-org-freedesktop-NetworkManager.Startup">Startup</link>                  readable   b
-<link linkend="gdbus-property-org-freedesktop-NetworkManager.Version">Version</link>                  readable   s
-<link linkend="gdbus-property-org-freedesktop-NetworkManager.State">State</link>                    readable   u
-<link linkend="gdbus-property-org-freedesktop-NetworkManager.Connectivity">Connectivity</link>             readable   u
-<link linkend="gdbus-property-org-freedesktop-NetworkManager.GlobalDnsConfiguration">GlobalDnsConfiguration</link>   readwrite  a{sv}
-</synopsis>
-  </refsect1>
-<refsect1 role="desc" id="gdbus-interface-org-freedesktop-NetworkManager">
-  <title role="desc.title">Description</title>
-  <para></para>
-</refsect1>
-<refsect1 role="details" id="gdbus-methods-org.freedesktop.NetworkManager">
-  <title role="details.title">Method Details</title>
-<refsect2 role="method" id="gdbus-method-org-freedesktop-NetworkManager.Reload">
-  <title>The Reload() method</title>
-  <indexterm zone="gdbus-method-org-freedesktop-NetworkManager.Reload"><primary sortas="Manager.Reload">org.freedesktop.NetworkManager.Reload()</primary></indexterm>
-<programlisting>
-Reload (IN  u flags);
-</programlisting>
-<para>        Reload NetworkManager's configuration and perform certain updates, like flushing a cache or
-        rewriting external state to disk. This is similar to sending SIGHUP to NetworkManager but it
-        allows for more fine-grained control over what to reload (see <parameter>flags</parameter>). It also allows
-        non-root access via PolicyKit and contrary to signals it is synchronous.
-</para><para>        No flags (0x00) means to reload everything that is supported which is identical to
-        sending a SIGHUP.
-        (0x01) means to reload the NetworkManager.conf configuration from disk. Note that this
-        does not include connections, which can be reloaded via Setting's ReloadConnections.
-        (0x02) means to update DNS configuration, which usually involves writing /etc/resolv.conf
-        anew.
-        (0x04) means to restart the DNS plugin. This is for example useful when using
-        dnsmasq plugin, which uses additional configuration in /etc/NetworkManager/dnsmasq.d.
-        If you edit those files, you can restart the DNS plugin. This action shortly interrupts
-        name resolution.
-        Note that flags may affect each other. For example, restarting the DNS plugin (0x04)
-        implicitly updates DNS too (0x02). Or when reloading the configuration (0x01), changes
-        to DNS setting also cause a DNS update (0x02). However, (0x01) does not involve restarting
-        the DNS plugin (0x04) or update resolv.conf (0x02), unless the DNS related configuration
-        changes in NetworkManager.conf.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>IN u <parameter>flags</parameter></literal>:</term>
-  <listitem><para>optional flags to specify which parts shall be reloaded.</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-<refsect2 role="method" id="gdbus-method-org-freedesktop-NetworkManager.GetDevices">
-  <title>The GetDevices() method</title>
-  <indexterm zone="gdbus-method-org-freedesktop-NetworkManager.GetDevices"><primary sortas="Manager.GetDevices">org.freedesktop.NetworkManager.GetDevices()</primary></indexterm>
-<programlisting>
-GetDevices (OUT ao devices);
-</programlisting>
-<para>        Get the list of realized network devices.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>OUT ao <parameter>devices</parameter></literal>:</term>
-  <listitem><para>List of object paths of network devices known to the system. This list does not include device placeholders (see GetAllDevices()).</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-<refsect2 role="method" id="gdbus-method-org-freedesktop-NetworkManager.GetAllDevices">
-  <title>The GetAllDevices() method</title>
-  <indexterm zone="gdbus-method-org-freedesktop-NetworkManager.GetAllDevices"><primary sortas="Manager.GetAllDevices">org.freedesktop.NetworkManager.GetAllDevices()</primary></indexterm>
-<programlisting>
-GetAllDevices (OUT ao devices);
-</programlisting>
-<para>        Get the list of all network devices.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>OUT ao <parameter>devices</parameter></literal>:</term>
-  <listitem><para>List of object paths of network devices and device placeholders (eg, devices that do not yet exist but which can be automatically created by NetworkManager if one of their AvailableConnections was activated).</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-<refsect2 role="method" id="gdbus-method-org-freedesktop-NetworkManager.GetDeviceByIpIface">
-  <title>The GetDeviceByIpIface() method</title>
-  <indexterm zone="gdbus-method-org-freedesktop-NetworkManager.GetDeviceByIpIface"><primary sortas="Manager.GetDeviceByIpIface">org.freedesktop.NetworkManager.GetDeviceByIpIface()</primary></indexterm>
-<programlisting>
-GetDeviceByIpIface (IN  s iface,
-                    OUT o device);
-</programlisting>
-<para>        Return the object path of the network device referenced by its IP
-        interface name. Note that some devices (usually modems) only have an IP
-        interface name when they are connected.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>IN s <parameter>iface</parameter></literal>:</term>
-  <listitem><para>Interface name of the device to find.</para></listitem>
-</varlistentry>
-<varlistentry>
-  <term><literal>OUT o <parameter>device</parameter></literal>:</term>
-  <listitem><para>Object path of the network device.</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-<refsect2 role="method" id="gdbus-method-org-freedesktop-NetworkManager.ActivateConnection">
-  <title>The ActivateConnection() method</title>
-  <indexterm zone="gdbus-method-org-freedesktop-NetworkManager.ActivateConnection"><primary sortas="Manager.ActivateConnection">org.freedesktop.NetworkManager.ActivateConnection()</primary></indexterm>
-<programlisting>
-ActivateConnection (IN  o connection,
-                    IN  o device,
-                    IN  o specific_object,
-                    OUT o active_connection);
-</programlisting>
-<para>        Activate a connection using the supplied device.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>IN o <parameter>connection</parameter></literal>:</term>
-  <listitem><para>The connection to activate. If "/" is given, a valid device path must be given, and NetworkManager picks the best connection to activate for the given device. VPN connections must always pass a valid connection path.</para></listitem>
-</varlistentry>
-<varlistentry>
-  <term><literal>IN o <parameter>device</parameter></literal>:</term>
-  <listitem><para>The object path of device to be activated for physical connections. This parameter is ignored for VPN connections, because the specific_object (if provided) specifies the device to use.</para></listitem>
-</varlistentry>
-<varlistentry>
-  <term><literal>IN o <parameter>specific_object</parameter></literal>:</term>
-  <listitem><para>The path of a connection-type-specific object this activation should use. This parameter is currently ignored for wired and mobile broadband connections, and the value of "/" should be used (ie, no specific object). For WiFi connections, pass the object path of a specific AP from the card's scan list, or "/" to pick an AP automatically. For VPN connections, pass the object path of an ActiveConnection object that should serve as the "base" connection (to which the VPN connections lifetime will be tied), or pass "/" and NM will automatically use the current default device.</para></listitem>
-</varlistentry>
-<varlistentry>
-  <term><literal>OUT o <parameter>active_connection</parameter></literal>:</term>
-  <listitem><para>The path of the active connection object representing this active connection.</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-<refsect2 role="method" id="gdbus-method-org-freedesktop-NetworkManager.AddAndActivateConnection">
-  <title>The AddAndActivateConnection() method</title>
-  <indexterm zone="gdbus-method-org-freedesktop-NetworkManager.AddAndActivateConnection"><primary sortas="Manager.AddAndActivateConnection">org.freedesktop.NetworkManager.AddAndActivateConnection()</primary></indexterm>
-<programlisting>
-AddAndActivateConnection (IN  a{sa{sv}} connection,
-                          IN  o         device,
-                          IN  o         specific_object,
-                          OUT o         path,
-                          OUT o         active_connection);
-</programlisting>
-<para>        Adds a new connection using the given details (if any) as a template
-        (automatically filling in missing settings with the capabilities of the
-        given device and specific object), then activate the new connection.
-        Cannot be used for VPN connections at this time.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>IN a{sa{sv}} <parameter>connection</parameter></literal>:</term>
-  <listitem><para>Connection settings and properties; if incomplete missing settings will be automatically completed using the given device and specific object.</para></listitem>
-</varlistentry>
-<varlistentry>
-  <term><literal>IN o <parameter>device</parameter></literal>:</term>
-  <listitem><para>The object path of device to be activated using the given connection.</para></listitem>
-</varlistentry>
-<varlistentry>
-  <term><literal>IN o <parameter>specific_object</parameter></literal>:</term>
-  <listitem><para>The path of a connection-type-specific object this activation should use. This parameter is currently ignored for wired and mobile broadband connections, and the value of "/" should be used (ie, no specific object). For WiFi connections, pass the object path of a specific AP from the card's scan list, which will be used to complete the details of the newly added connection.</para></listitem>
-</varlistentry>
-<varlistentry>
-  <term><literal>OUT o <parameter>path</parameter></literal>:</term>
-  <listitem><para>Object path of the new connection that was just added.</para></listitem>
-</varlistentry>
-<varlistentry>
-  <term><literal>OUT o <parameter>active_connection</parameter></literal>:</term>
-  <listitem><para>The path of the active connection object representing this active connection.</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-<refsect2 role="method" id="gdbus-method-org-freedesktop-NetworkManager.DeactivateConnection">
-  <title>The DeactivateConnection() method</title>
-  <indexterm zone="gdbus-method-org-freedesktop-NetworkManager.DeactivateConnection"><primary sortas="Manager.DeactivateConnection">org.freedesktop.NetworkManager.DeactivateConnection()</primary></indexterm>
-<programlisting>
-DeactivateConnection (IN  o active_connection);
-</programlisting>
-<para>        Deactivate an active connection.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>IN o <parameter>active_connection</parameter></literal>:</term>
-  <listitem><para>The currently active connection to deactivate.</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-<refsect2 role="method" id="gdbus-method-org-freedesktop-NetworkManager.Sleep">
-  <title>The Sleep() method</title>
-  <indexterm zone="gdbus-method-org-freedesktop-NetworkManager.Sleep"><primary sortas="Manager.Sleep">org.freedesktop.NetworkManager.Sleep()</primary></indexterm>
-<programlisting>
-Sleep (IN  b sleep);
-</programlisting>
-<para>        Control the NetworkManager daemon's sleep state. When asleep, all
-        interfaces that it manages are deactivated. When awake, devices are
-        available to be activated. This command should not be called directly by
-        users or clients; it is intended for system suspend/resume tracking.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>IN b <parameter>sleep</parameter></literal>:</term>
-  <listitem><para>Indicates whether the NetworkManager daemon should sleep or wake.</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-<refsect2 role="method" id="gdbus-method-org-freedesktop-NetworkManager.Enable">
-  <title>The Enable() method</title>
-  <indexterm zone="gdbus-method-org-freedesktop-NetworkManager.Enable"><primary sortas="Manager.Enable">org.freedesktop.NetworkManager.Enable()</primary></indexterm>
-<programlisting>
-Enable (IN  b enable);
-</programlisting>
-<para>        Control whether overall networking is enabled or disabled. When disabled,
-        all interfaces that NM manages are deactivated. When enabled, all managed
-        interfaces are re-enabled and available to be activated. This command
-        should be used by clients that provide to users the ability to
-        enable/disable all networking.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>IN b <parameter>enable</parameter></literal>:</term>
-  <listitem><para>If FALSE, indicates that all networking should be disabled. If TRUE, indicates that NetworkManager should begin managing network devices.</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-<refsect2 role="method" id="gdbus-method-org-freedesktop-NetworkManager.GetPermissions">
-  <title>The GetPermissions() method</title>
-  <indexterm zone="gdbus-method-org-freedesktop-NetworkManager.GetPermissions"><primary sortas="Manager.GetPermissions">org.freedesktop.NetworkManager.GetPermissions()</primary></indexterm>
-<programlisting>
-GetPermissions (OUT a{ss} permissions);
-</programlisting>
-<para>        Returns the permissions a caller has for various authenticated operations
-        that NetworkManager provides, like Enable/Disable networking, changing
-        WiFi, WWAN, and WiMAX state, etc.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>OUT a{ss} <parameter>permissions</parameter></literal>:</term>
-  <listitem><para>Dictionary of available permissions and results. Each permission is represented by a name (ie "org.freedesktop.NetworkManager.Foobar") and each result is one of the following values: "yes" (the permission is available), "auth" (the permission is available after a successful authentication), or "no" (the permission is denied). Clients may use these values in the UI to indicate the ability to perform certain operations.</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-<refsect2 role="method" id="gdbus-method-org-freedesktop-NetworkManager.SetLogging">
-  <title>The SetLogging() method</title>
-  <indexterm zone="gdbus-method-org-freedesktop-NetworkManager.SetLogging"><primary sortas="Manager.SetLogging">org.freedesktop.NetworkManager.SetLogging()</primary></indexterm>
-<programlisting>
-SetLogging (IN  s level,
-            IN  s domains);
-</programlisting>
-<para>        Set logging verbosity and which operations are logged.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>IN s <parameter>level</parameter></literal>:</term>
-  <listitem><para>One of [ERR, WARN, INFO, DEBUG, TRACE, OFF, KEEP]. This level is applied to the domains as specified in the domains argument. Except for the special level "KEEP", all unmentioned domains are disabled entirely. "KEEP" is special and allows not to change the current setting except for the specified domains. E.g. level=KEEP and domains=PLATFORM:DEBUG will only touch the platform domain.</para></listitem>
-</varlistentry>
-<varlistentry>
-  <term><literal>IN s <parameter>domains</parameter></literal>:</term>
-  <listitem><para>A combination of logging domains separated by commas (','), or "NONE" to disable logging. Each domain enables logging for operations related to that domain. Available domains are: [PLATFORM, RFKILL, ETHER, WIFI, BT, MB, DHCP4, DHCP6, PPP, WIFI_SCAN, IP4, IP6, AUTOIP4, DNS, VPN, SHARING, SUPPLICANT, AGENTS, SETTINGS, SUSPEND, CORE, DEVICE, OLPC, WIMAX, INFINIBAND, FIREWALL, ADSL, BOND, VLAN, BRIDGE, DBUS_PROPS, TEAM, CONCHECK, DCB, DISPATCH, AUDIT]. In addition to these domains, the following special domains can be used: [NONE, ALL, DEFAULT, DHCP, IP]. You can also specify that some domains should log at a different level from the default by appending a colon (':') and a log level (eg, 'WIFI:DEBUG'). If an empty string is given, the log level is changed but the current set of log domains remains unchanged.</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-<refsect2 role="method" id="gdbus-method-org-freedesktop-NetworkManager.GetLogging">
-  <title>The GetLogging() method</title>
-  <indexterm zone="gdbus-method-org-freedesktop-NetworkManager.GetLogging"><primary sortas="Manager.GetLogging">org.freedesktop.NetworkManager.GetLogging()</primary></indexterm>
-<programlisting>
-GetLogging (OUT s level,
-            OUT s domains);
-</programlisting>
-<para>        Get current logging verbosity level and operations domains.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>OUT s <parameter>level</parameter></literal>:</term>
-  <listitem><para>One of [ERR, WARN, INFO, DEBUG, TRACE].</para></listitem>
-</varlistentry>
-<varlistentry>
-  <term><literal>OUT s <parameter>domains</parameter></literal>:</term>
-  <listitem><para>For available domains see SetLogging() call.</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-<refsect2 role="method" id="gdbus-method-org-freedesktop-NetworkManager.CheckConnectivity">
-  <title>The CheckConnectivity() method</title>
-  <indexterm zone="gdbus-method-org-freedesktop-NetworkManager.CheckConnectivity"><primary sortas="Manager.CheckConnectivity">org.freedesktop.NetworkManager.CheckConnectivity()</primary></indexterm>
-<programlisting>
-CheckConnectivity (OUT u connectivity);
-</programlisting>
-<para>        Re-check the network connectivity state.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>OUT u <parameter>connectivity</parameter></literal>:</term>
-  <listitem><para>(<link linkend="NMConnectivityState">NMConnectivityState</link>) The current connectivity state.</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-<refsect2 role="method" id="gdbus-method-org-freedesktop-NetworkManager.state">
-  <title>The state() method</title>
-  <indexterm zone="gdbus-method-org-freedesktop-NetworkManager.state"><primary sortas="Manager.state">org.freedesktop.NetworkManager.state()</primary></indexterm>
-<programlisting>
-state (OUT u state);
-</programlisting>
-<para>        The overall networking state as determined by the NetworkManager daemon,
-        based on the state of network devices under it's management.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>OUT u <parameter>state</parameter></literal>:</term>
-  <listitem><para><link linkend="NMState">NMState</link></para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-<refsect2 role="method" id="gdbus-method-org-freedesktop-NetworkManager.CheckpointCreate">
-  <title>The CheckpointCreate() method</title>
-  <indexterm zone="gdbus-method-org-freedesktop-NetworkManager.CheckpointCreate"><primary sortas="Manager.CheckpointCreate">org.freedesktop.NetworkManager.CheckpointCreate()</primary></indexterm>
-<programlisting>
-CheckpointCreate (IN  ao devices,
-                  IN  u  rollback_timeout,
-                  IN  u  flags,
-                  OUT o  checkpoint);
-</programlisting>
-<para>        <parameter>devices</parameter>: a list of device paths for which a checkpoint should be created. An empty list means all managed devices.
-        <parameter>rollback_timeout</parameter>: the time in seconds until NetworkManager will automatically rollback to the checkpoint. Set to zero for infinite.
-        <parameter>flags</parameter>: optional flags that influence the creation.
-        <parameter>checkpoint</parameter>: on success, returns the path of the checkpoint.
-</para><para>        Create a checkpoint of the current networking configuration
-        for given interfaces. If <parameter>rollback_timeout</parameter> is not zero, a
-        rollback is automatically performed after the given timeout.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>IN ao <parameter>devices</parameter></literal>:</term>
-  <listitem><para></para></listitem>
-</varlistentry>
-<varlistentry>
-  <term><literal>IN u <parameter>rollback_timeout</parameter></literal>:</term>
-  <listitem><para></para></listitem>
-</varlistentry>
-<varlistentry>
-  <term><literal>IN u <parameter>flags</parameter></literal>:</term>
-  <listitem><para></para></listitem>
-</varlistentry>
-<varlistentry>
-  <term><literal>OUT o <parameter>checkpoint</parameter></literal>:</term>
-  <listitem><para></para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-<refsect2 role="method" id="gdbus-method-org-freedesktop-NetworkManager.CheckpointDestroy">
-  <title>The CheckpointDestroy() method</title>
-  <indexterm zone="gdbus-method-org-freedesktop-NetworkManager.CheckpointDestroy"><primary sortas="Manager.CheckpointDestroy">org.freedesktop.NetworkManager.CheckpointDestroy()</primary></indexterm>
-<programlisting>
-CheckpointDestroy (IN  o checkpoint);
-</programlisting>
-<para>        Destroy a previously created checkpoint.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>IN o <parameter>checkpoint</parameter></literal>:</term>
-  <listitem><para>the checkpoint to be destroyed. Set to empty to cancel all pending checkpoints.</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-<refsect2 role="method" id="gdbus-method-org-freedesktop-NetworkManager.CheckpointRollback">
-  <title>The CheckpointRollback() method</title>
-  <indexterm zone="gdbus-method-org-freedesktop-NetworkManager.CheckpointRollback"><primary sortas="Manager.CheckpointRollback">org.freedesktop.NetworkManager.CheckpointRollback()</primary></indexterm>
-<programlisting>
-CheckpointRollback (IN  o     checkpoint,
-                    OUT a{su} result);
-</programlisting>
-<para>        Rollback a checkpoint before the timeout is reached.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>IN o <parameter>checkpoint</parameter></literal>:</term>
-  <listitem><para>the checkpoint to be rolled back.</para></listitem>
-</varlistentry>
-<varlistentry>
-  <term><literal>OUT a{su} <parameter>result</parameter></literal>:</term>
-  <listitem><para>on return, a dictionary of devices and results. Devices are represented by their original D-Bus path; each result is a <link linkend="NMRollbackResult">RollbackResult</link>.</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-</refsect1>
-<refsect1 role="details" id="gdbus-signals-org.freedesktop.NetworkManager">
-  <title role="details.title">Signal Details</title>
-<refsect2 role="signal" id="gdbus-signal-org-freedesktop-NetworkManager.CheckPermissions">
-  <title>The "CheckPermissions" signal</title>
-  <indexterm zone="gdbus-signal-org-freedesktop-NetworkManager.CheckPermissions"><primary sortas="Manager::CheckPermissions">org.freedesktop.NetworkManager::CheckPermissions</primary></indexterm>
-<programlisting>
-CheckPermissions ();
-</programlisting>
-<para>        Emitted when system authorization details change, indicating that clients
-        may wish to recheck permissions with GetPermissions.
-</para>
-</refsect2>
-<refsect2 role="signal" id="gdbus-signal-org-freedesktop-NetworkManager.StateChanged">
-  <title>The "StateChanged" signal</title>
-  <indexterm zone="gdbus-signal-org-freedesktop-NetworkManager.StateChanged"><primary sortas="Manager::StateChanged">org.freedesktop.NetworkManager::StateChanged</primary></indexterm>
-<programlisting>
-StateChanged (u state);
-</programlisting>
-<para>        NetworkManager's state changed.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>u <parameter>state</parameter></literal>:</term>
-  <listitem><para>(<link linkend="NMState">NMState</link>) The new state of NetworkManager.</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-<refsect2 role="signal" id="gdbus-signal-org-freedesktop-NetworkManager.PropertiesChanged">
-  <title>The "PropertiesChanged" signal</title>
-  <indexterm zone="gdbus-signal-org-freedesktop-NetworkManager.PropertiesChanged"><primary sortas="Manager::PropertiesChanged">org.freedesktop.NetworkManager::PropertiesChanged</primary></indexterm>
-<programlisting>
-PropertiesChanged (a{sv} properties);
-</programlisting>
-<para>        DEPRECATED. Use the standard "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" instead which exists since version NetworkManager 1.2.0.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>a{sv} <parameter>properties</parameter></literal>:</term>
-  <listitem><para>The changed properties.</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-<refsect2 role="signal" id="gdbus-signal-org-freedesktop-NetworkManager.DeviceAdded">
-  <title>The "DeviceAdded" signal</title>
-  <indexterm zone="gdbus-signal-org-freedesktop-NetworkManager.DeviceAdded"><primary sortas="Manager::DeviceAdded">org.freedesktop.NetworkManager::DeviceAdded</primary></indexterm>
-<programlisting>
-DeviceAdded (o device_path);
-</programlisting>
-<para>        A device was added to the system
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>o <parameter>device_path</parameter></literal>:</term>
-  <listitem><para>The object path of the newly added device.</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-<refsect2 role="signal" id="gdbus-signal-org-freedesktop-NetworkManager.DeviceRemoved">
-  <title>The "DeviceRemoved" signal</title>
-  <indexterm zone="gdbus-signal-org-freedesktop-NetworkManager.DeviceRemoved"><primary sortas="Manager::DeviceRemoved">org.freedesktop.NetworkManager::DeviceRemoved</primary></indexterm>
-<programlisting>
-DeviceRemoved (o device_path);
-</programlisting>
-<para>        A device was removed from the system, and is no longer available.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>o <parameter>device_path</parameter></literal>:</term>
-  <listitem><para>The object path of the device that was just removed.</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-</refsect1>
-<refsect1 role="details" id="gdbus-properties-org.freedesktop.NetworkManager">
-  <title role="details.title">Property Details</title>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager.Devices">
-  <title>The "Devices" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager.Devices"><primary sortas="Manager:Devices">org.freedesktop.NetworkManager:Devices</primary></indexterm>
-<programlisting>
-Devices  readable   ao
-</programlisting>
-<para>        The list of realized network devices. Realized devices are those which
-        have backing resources (eg from the kernel or a management daemon like
-        ModemManager, teamd, etc).
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager.AllDevices">
-  <title>The "AllDevices" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager.AllDevices"><primary sortas="Manager:AllDevices">org.freedesktop.NetworkManager:AllDevices</primary></indexterm>
-<programlisting>
-AllDevices  readable   ao
-</programlisting>
-<para>        The list of both realized and un-realized network devices. Un-realized
-        devices are software devices which do not yet have backing resources, but
-        for which backing resources can be created if the device is activated.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager.NetworkingEnabled">
-  <title>The "NetworkingEnabled" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager.NetworkingEnabled"><primary sortas="Manager:NetworkingEnabled">org.freedesktop.NetworkManager:NetworkingEnabled</primary></indexterm>
-<programlisting>
-NetworkingEnabled  readable   b
-</programlisting>
-<para>        Indicates if overall networking is currently enabled or not. See the
-        Enable() method.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager.WirelessEnabled">
-  <title>The "WirelessEnabled" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager.WirelessEnabled"><primary sortas="Manager:WirelessEnabled">org.freedesktop.NetworkManager:WirelessEnabled</primary></indexterm>
-<programlisting>
-WirelessEnabled  readwrite  b
-</programlisting>
-<para>        Indicates if wireless is currently enabled or not.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager.WirelessHardwareEnabled">
-  <title>The "WirelessHardwareEnabled" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager.WirelessHardwareEnabled"><primary sortas="Manager:WirelessHardwareEnabled">org.freedesktop.NetworkManager:WirelessHardwareEnabled</primary></indexterm>
-<programlisting>
-WirelessHardwareEnabled  readable   b
-</programlisting>
-<para>        Indicates if the wireless hardware is currently enabled, i.e. the state of
-        the RF kill switch.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager.WwanEnabled">
-  <title>The "WwanEnabled" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager.WwanEnabled"><primary sortas="Manager:WwanEnabled">org.freedesktop.NetworkManager:WwanEnabled</primary></indexterm>
-<programlisting>
-WwanEnabled  readwrite  b
-</programlisting>
-<para>        Indicates if mobile broadband devices are currently enabled or not.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager.WwanHardwareEnabled">
-  <title>The "WwanHardwareEnabled" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager.WwanHardwareEnabled"><primary sortas="Manager:WwanHardwareEnabled">org.freedesktop.NetworkManager:WwanHardwareEnabled</primary></indexterm>
-<programlisting>
-WwanHardwareEnabled  readable   b
-</programlisting>
-<para>        Indicates if the mobile broadband hardware is currently enabled, i.e. the
-        state of the RF kill switch.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager.WimaxEnabled">
-  <title>The "WimaxEnabled" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager.WimaxEnabled"><primary sortas="Manager:WimaxEnabled">org.freedesktop.NetworkManager:WimaxEnabled</primary></indexterm>
-<programlisting>
-WimaxEnabled  readwrite  b
-</programlisting>
-<para>        Indicates if WiMAX devices are currently enabled or not.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager.WimaxHardwareEnabled">
-  <title>The "WimaxHardwareEnabled" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager.WimaxHardwareEnabled"><primary sortas="Manager:WimaxHardwareEnabled">org.freedesktop.NetworkManager:WimaxHardwareEnabled</primary></indexterm>
-<programlisting>
-WimaxHardwareEnabled  readable   b
-</programlisting>
-<para>        Indicates if the WiMAX hardware is currently enabled, i.e. the state of
-        the RF kill switch.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager.ActiveConnections">
-  <title>The "ActiveConnections" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager.ActiveConnections"><primary sortas="Manager:ActiveConnections">org.freedesktop.NetworkManager:ActiveConnections</primary></indexterm>
-<programlisting>
-ActiveConnections  readable   ao
-</programlisting>
-<para>        List of active connection object paths.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager.PrimaryConnection">
-  <title>The "PrimaryConnection" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager.PrimaryConnection"><primary sortas="Manager:PrimaryConnection">org.freedesktop.NetworkManager:PrimaryConnection</primary></indexterm>
-<programlisting>
-PrimaryConnection  readable   o
-</programlisting>
-<para>        The object path of the "primary" active connection being used to access
-        the network. In particular, if there is no VPN active, or the VPN does not
-        have the default route, then this indicates the connection that has the
-        default route. If there is a VPN active with the default route, then this
-        indicates the connection that contains the route to the VPN endpoint.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager.PrimaryConnectionType">
-  <title>The "PrimaryConnectionType" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager.PrimaryConnectionType"><primary sortas="Manager:PrimaryConnectionType">org.freedesktop.NetworkManager:PrimaryConnectionType</primary></indexterm>
-<programlisting>
-PrimaryConnectionType  readable   s
-</programlisting>
-<para>        The connection type of the "primary" active connection being used to
-        access the network. This is the same as the Type property on the object
-        indicated by PrimaryConnection.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager.Metered">
-  <title>The "Metered" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager.Metered"><primary sortas="Manager:Metered">org.freedesktop.NetworkManager:Metered</primary></indexterm>
-<programlisting>
-Metered  readable   u
-</programlisting>
-<para>        Indicates whether the connectivity is metered. This is equivalent to the
-        metered property of the device associated with the primary connection.
-</para><para>        Returns: <link linkend="NMMetered">NMMetered</link>
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager.ActivatingConnection">
-  <title>The "ActivatingConnection" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager.ActivatingConnection"><primary sortas="Manager:ActivatingConnection">org.freedesktop.NetworkManager:ActivatingConnection</primary></indexterm>
-<programlisting>
-ActivatingConnection  readable   o
-</programlisting>
-<para>        The object path of an active connection that is currently being activated
-        and which is expected to become the new PrimaryConnection when it finishes
-        activating.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager.Startup">
-  <title>The "Startup" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager.Startup"><primary sortas="Manager:Startup">org.freedesktop.NetworkManager:Startup</primary></indexterm>
-<programlisting>
-Startup  readable   b
-</programlisting>
-<para>        Indicates whether NM is still starting up; this becomes FALSE when NM has
-        finished attempting to activate every connection that it might be able to
-        activate at startup.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager.Version">
-  <title>The "Version" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager.Version"><primary sortas="Manager:Version">org.freedesktop.NetworkManager:Version</primary></indexterm>
-<programlisting>
-Version  readable   s
-</programlisting>
-<para>        NetworkManager version.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager.State">
-  <title>The "State" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager.State"><primary sortas="Manager:State">org.freedesktop.NetworkManager:State</primary></indexterm>
-<programlisting>
-State  readable   u
-</programlisting>
-<para>        The overall state of the NetworkManager daemon.
-</para><para>        Returns: <link linkend="NMState">NMState</link>
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager.Connectivity">
-  <title>The "Connectivity" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager.Connectivity"><primary sortas="Manager:Connectivity">org.freedesktop.NetworkManager:Connectivity</primary></indexterm>
-<programlisting>
-Connectivity  readable   u
-</programlisting>
-<para>        The network connectivity state.
-</para><para>        Returns: <link linkend="NMConnectivityState">NMConnectivityState</link>
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager.GlobalDnsConfiguration">
-  <title>The "GlobalDnsConfiguration" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager.GlobalDnsConfiguration"><primary sortas="Manager:GlobalDnsConfiguration">org.freedesktop.NetworkManager:GlobalDnsConfiguration</primary></indexterm>
-<programlisting>
-GlobalDnsConfiguration  readwrite  a{sv}
-</programlisting>
-<para>        Dictionary of global DNS settings where the key is one of "searches",
-        "options" and "domains". The values for the "searches" and "options" keys
-        are string arrays describing the list of search domains and resolver
-        options, respectively. The value of the "domains" key is a second-level
-        dictionary, where each key is a domain name, and each key's value is a
-        third-level dictionary with the keys "servers" and "options". "servers" is
-        a string array of DNS servers, "options" is a string array of
-        domain-specific options.
-</para>
-</refsect2>
-</refsect1>
-</refentry>
-
diff --git a/introspection/nmdbus-ppp-manager-org.freedesktop.NetworkManager.PPP.xml b/introspection/nmdbus-ppp-manager-org.freedesktop.NetworkManager.PPP.xml
deleted file mode 100644
index 79370cd3..00000000
--- a/introspection/nmdbus-ppp-manager-org.freedesktop.NetworkManager.PPP.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-]>
-<refentry id="gdbus-org.freedesktop.NetworkManager.PPP">
-  <refmeta>    <refentrytitle role="top_of_page" id="gdbus-interface-org-freedesktop-NetworkManager-PPP.top_of_page">org.freedesktop.NetworkManager.PPP</refentrytitle>
-  <indexterm zone="gdbus-interface-org-freedesktop-NetworkManager-PPP.top_of_page"><primary sortas="PPPManager">org.freedesktop.NetworkManager.PPP</primary></indexterm>
-  </refmeta>  <refnamediv>    <refname>org.freedesktop.NetworkManager.PPP</refname>    <refpurpose></refpurpose>  </refnamediv>  <refsynopsisdiv role="synopsis">
-    <title role="synopsis.title">Methods</title>
-    <synopsis>
-<link linkend="gdbus-method-org-freedesktop-NetworkManager-PPP.NeedSecrets">NeedSecrets</link>  (OUT s     username,
-              OUT s     password);
-<link linkend="gdbus-method-org-freedesktop-NetworkManager-PPP.SetIp4Config">SetIp4Config</link> (IN  a{sv} config);
-<link linkend="gdbus-method-org-freedesktop-NetworkManager-PPP.SetIp6Config">SetIp6Config</link> (IN  a{sv} config);
-<link linkend="gdbus-method-org-freedesktop-NetworkManager-PPP.SetState">SetState</link>     (IN  u     state);
-</synopsis>
-  </refsynopsisdiv>
-<refsect1 role="desc" id="gdbus-interface-org-freedesktop-NetworkManager-PPP">
-  <title role="desc.title">Description</title>
-  <para></para>
-</refsect1>
-<refsect1 role="details" id="gdbus-methods-org.freedesktop.NetworkManager.PPP">
-  <title role="details.title">Method Details</title>
-<refsect2 role="method" id="gdbus-method-org-freedesktop-NetworkManager-PPP.NeedSecrets">
-  <title>The NeedSecrets() method</title>
-  <indexterm zone="gdbus-method-org-freedesktop-NetworkManager-PPP.NeedSecrets"><primary sortas="PPPManager.NeedSecrets">org.freedesktop.NetworkManager.PPP.NeedSecrets()</primary></indexterm>
-<programlisting>
-NeedSecrets (OUT s username,
-             OUT s password);
-</programlisting>
-<para></para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>OUT s <parameter>username</parameter></literal>:</term>
-  <listitem><para></para></listitem>
-</varlistentry>
-<varlistentry>
-  <term><literal>OUT s <parameter>password</parameter></literal>:</term>
-  <listitem><para></para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-<refsect2 role="method" id="gdbus-method-org-freedesktop-NetworkManager-PPP.SetIp4Config">
-  <title>The SetIp4Config() method</title>
-  <indexterm zone="gdbus-method-org-freedesktop-NetworkManager-PPP.SetIp4Config"><primary sortas="PPPManager.SetIp4Config">org.freedesktop.NetworkManager.PPP.SetIp4Config()</primary></indexterm>
-<programlisting>
-SetIp4Config (IN  a{sv} config);
-</programlisting>
-<para></para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>IN a{sv} <parameter>config</parameter></literal>:</term>
-  <listitem><para></para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-<refsect2 role="method" id="gdbus-method-org-freedesktop-NetworkManager-PPP.SetIp6Config">
-  <title>The SetIp6Config() method</title>
-  <indexterm zone="gdbus-method-org-freedesktop-NetworkManager-PPP.SetIp6Config"><primary sortas="PPPManager.SetIp6Config">org.freedesktop.NetworkManager.PPP.SetIp6Config()</primary></indexterm>
-<programlisting>
-SetIp6Config (IN  a{sv} config);
-</programlisting>
-<para></para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>IN a{sv} <parameter>config</parameter></literal>:</term>
-  <listitem><para></para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-<refsect2 role="method" id="gdbus-method-org-freedesktop-NetworkManager-PPP.SetState">
-  <title>The SetState() method</title>
-  <indexterm zone="gdbus-method-org-freedesktop-NetworkManager-PPP.SetState"><primary sortas="PPPManager.SetState">org.freedesktop.NetworkManager.PPP.SetState()</primary></indexterm>
-<programlisting>
-SetState (IN  u state);
-</programlisting>
-<para></para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>IN u <parameter>state</parameter></literal>:</term>
-  <listitem><para></para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-</refsect1>
-</refentry>
-
diff --git a/introspection/nmdbus-secret-agent-org.freedesktop.NetworkManager.SecretAgent.xml b/introspection/nmdbus-secret-agent-org.freedesktop.NetworkManager.SecretAgent.xml
deleted file mode 100644
index 0a77ec15..00000000
--- a/introspection/nmdbus-secret-agent-org.freedesktop.NetworkManager.SecretAgent.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-]>
-<refentry id="gdbus-org.freedesktop.NetworkManager.SecretAgent">
-  <refmeta>    <refentrytitle role="top_of_page" id="gdbus-interface-org-freedesktop-NetworkManager-SecretAgent.top_of_page">org.freedesktop.NetworkManager.SecretAgent</refentrytitle>
-  <indexterm zone="gdbus-interface-org-freedesktop-NetworkManager-SecretAgent.top_of_page"><primary sortas=".SecretAgent">org.freedesktop.NetworkManager.SecretAgent</primary></indexterm>
-  </refmeta>  <refnamediv>    <refname>org.freedesktop.NetworkManager.SecretAgent</refname>    <refpurpose></refpurpose>  </refnamediv>  <refsynopsisdiv role="synopsis">
-    <title role="synopsis.title">Methods</title>
-    <synopsis>
-<link linkend="gdbus-method-org-freedesktop-NetworkManager-SecretAgent.GetSecrets">GetSecrets</link>       (IN  a{sa{sv}} connection,
-                  IN  o         connection_path,
-                  IN  s         setting_name,
-                  IN  as        hints,
-                  IN  u         flags,
-                  OUT a{sa{sv}} secrets);
-<link linkend="gdbus-method-org-freedesktop-NetworkManager-SecretAgent.CancelGetSecrets">CancelGetSecrets</link> (IN  o         connection_path,
-                  IN  s         setting_name);
-<link linkend="gdbus-method-org-freedesktop-NetworkManager-SecretAgent.SaveSecrets">SaveSecrets</link>      (IN  a{sa{sv}} connection,
-                  IN  o         connection_path);
-<link linkend="gdbus-method-org-freedesktop-NetworkManager-SecretAgent.DeleteSecrets">DeleteSecrets</link>    (IN  a{sa{sv}} connection,
-                  IN  o         connection_path);
-</synopsis>
-  </refsynopsisdiv>
-<refsect1 role="desc" id="gdbus-interface-org-freedesktop-NetworkManager-SecretAgent">
-  <title role="desc.title">Description</title>
-  <para>      Private D-Bus interface used by secret agents that store and provide
-      secrets to NetworkManager. If an agent provides secrets to NetworkManager
-      as part of connection creation, and the some of those secrets are "agent
-      owned" the agent should store those secrets itself and should not expect
-      its SaveSecrets() method to be called. SaveSecrets() will be called eg if
-      some program other than the agent itself (like a connection editor)
-      changes the secrets out of band. The agent should implement this D-Bus
-      interface on an object with the path
-      /org/freedesktop/NetworkManager/SecretAgent.
-</para>
-</refsect1>
-<refsect1 role="details" id="gdbus-methods-org.freedesktop.NetworkManager.SecretAgent">
-  <title role="details.title">Method Details</title>
-<refsect2 role="method" id="gdbus-method-org-freedesktop-NetworkManager-SecretAgent.GetSecrets">
-  <title>The GetSecrets() method</title>
-  <indexterm zone="gdbus-method-org-freedesktop-NetworkManager-SecretAgent.GetSecrets"><primary sortas=".SecretAgent.GetSecrets">org.freedesktop.NetworkManager.SecretAgent.GetSecrets()</primary></indexterm>
-<programlisting>
-GetSecrets (IN  a{sa{sv}} connection,
-            IN  o         connection_path,
-            IN  s         setting_name,
-            IN  as        hints,
-            IN  u         flags,
-            OUT a{sa{sv}} secrets);
-</programlisting>
-<para>        Retrieve and return stored secrets, if any, or request new secrets from
-        the agent's user. If user interaction is allowed and the user enters new
-        secrets, the agent is expected to save the new secrets to persistent
-        storage (if the secret's flags include AGENT_OWNED) as NetworkManager will
-        not send these secrets back to the same agent via a SaveSecrets() call. If
-        the user canceled any interaction, the agent should return the
-        UserCanceled error (see below).
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>IN a{sa{sv}} <parameter>connection</parameter></literal>:</term>
-  <listitem><para>Nested settings maps containing the connection for which secrets are being requested. This may contain system-owned secrets if the agent has successfully authenticated to modify system network settings and the GetSecrets request flags allow user interaction.</para></listitem>
-</varlistentry>
-<varlistentry>
-  <term><literal>IN o <parameter>connection_path</parameter></literal>:</term>
-  <listitem><para>Object path of the connection for which secrets are being requested.</para></listitem>
-</varlistentry>
-<varlistentry>
-  <term><literal>IN s <parameter>setting_name</parameter></literal>:</term>
-  <listitem><para>Setting name for which secrets are being requested.</para></listitem>
-</varlistentry>
-<varlistentry>
-  <term><literal>IN as <parameter>hints</parameter></literal>:</term>
-  <listitem><para>Array of strings of key names in the requested setting for which NetworkManager thinks a secrets may be required, and/or well-known identifiers and data that may be useful to the client in processing the secrets request. Note that it's not always possible to determine which secret is required, so in some cases no hints may be given. The Agent should return any secrets it has, or that it thinks are required, regardless of what hints NetworkManager sends in this request. Some hints have special prefixes that provide information to the agent; for example, VPN requests may send server-specific messages prefixed with "x-vpn-message:".</para></listitem>
-</varlistentry>
-<varlistentry>
-  <term><literal>IN u <parameter>flags</parameter></literal>:</term>
-  <listitem><para>(<link linkend="NMSecretAgentGetSecretsFlags">NMSecretAgentGetSecretsFlags</link>) Flags which modify the behavior of the secrets request. If true, new secrets are assumed to be invalid or incorrect, and the agent should ask the user for new secrets. If false, existing secrets should be retrieved from storage and returned without interrupting the user.</para></listitem>
-</varlistentry>
-<varlistentry>
-  <term><literal>OUT a{sa{sv}} <parameter>secrets</parameter></literal>:</term>
-  <listitem><para>Nested settings maps containing secrets. Each setting MUST contain at least the 'name' field, containing the name of the setting, and one or more secrets.</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-<refsect2 role="method" id="gdbus-method-org-freedesktop-NetworkManager-SecretAgent.CancelGetSecrets">
-  <title>The CancelGetSecrets() method</title>
-  <indexterm zone="gdbus-method-org-freedesktop-NetworkManager-SecretAgent.CancelGetSecrets"><primary sortas=".SecretAgent.CancelGetSecrets">org.freedesktop.NetworkManager.SecretAgent.CancelGetSecrets()</primary></indexterm>
-<programlisting>
-CancelGetSecrets (IN  o connection_path,
-                  IN  s setting_name);
-</programlisting>
-<para>        Cancel a pending GetSecrets request for secrets of the given connection.
-        Any GetSecrets request with the same 'connection_path' and 'setting_name'
-        that are given in a CancelGetSecrets request should be canceled.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>IN o <parameter>connection_path</parameter></literal>:</term>
-  <listitem><para>Object path of the connection for which, if secrets for the given 'setting_name' are being requested, the request should be canceled.</para></listitem>
-</varlistentry>
-<varlistentry>
-  <term><literal>IN s <parameter>setting_name</parameter></literal>:</term>
-  <listitem><para>Setting name for which secrets for this connection were originally being requested.</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-<refsect2 role="method" id="gdbus-method-org-freedesktop-NetworkManager-SecretAgent.SaveSecrets">
-  <title>The SaveSecrets() method</title>
-  <indexterm zone="gdbus-method-org-freedesktop-NetworkManager-SecretAgent.SaveSecrets"><primary sortas=".SecretAgent.SaveSecrets">org.freedesktop.NetworkManager.SecretAgent.SaveSecrets()</primary></indexterm>
-<programlisting>
-SaveSecrets (IN  a{sa{sv}} connection,
-             IN  o         connection_path);
-</programlisting>
-<para>        Save given secrets to backing storage.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>IN a{sa{sv}} <parameter>connection</parameter></literal>:</term>
-  <listitem><para>Nested settings maps containing the entire connection (including secrets), for which the agent should save the secrets to backing storage. This method will not be called when the agent itself is the process creating or updating a connection; in that case the agent is assumed to have already saved those secrets since it had them already.</para></listitem>
-</varlistentry>
-<varlistentry>
-  <term><literal>IN o <parameter>connection_path</parameter></literal>:</term>
-  <listitem><para>Object path of the connection for which the agent should save secrets to backing storage.</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-<refsect2 role="method" id="gdbus-method-org-freedesktop-NetworkManager-SecretAgent.DeleteSecrets">
-  <title>The DeleteSecrets() method</title>
-  <indexterm zone="gdbus-method-org-freedesktop-NetworkManager-SecretAgent.DeleteSecrets"><primary sortas=".SecretAgent.DeleteSecrets">org.freedesktop.NetworkManager.SecretAgent.DeleteSecrets()</primary></indexterm>
-<programlisting>
-DeleteSecrets (IN  a{sa{sv}} connection,
-               IN  o         connection_path);
-</programlisting>
-<para>        Delete secrets from backing storage.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>IN a{sa{sv}} <parameter>connection</parameter></literal>:</term>
-  <listitem><para>Nested settings maps containing the connection properties (sans secrets), for which the agent should delete the secrets from backing storage.</para></listitem>
-</varlistentry>
-<varlistentry>
-  <term><literal>IN o <parameter>connection_path</parameter></literal>:</term>
-  <listitem><para>Object path of the connection for which the agent should delete secrets from backing storage.</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-</refsect1>
-</refentry>
-
diff --git a/introspection/nmdbus-settings-connection-org.freedesktop.NetworkManager.Settings.Connection.xml b/introspection/nmdbus-settings-connection-org.freedesktop.NetworkManager.Settings.Connection.xml
deleted file mode 100644
index 2de23972..00000000
--- a/introspection/nmdbus-settings-connection-org.freedesktop.NetworkManager.Settings.Connection.xml
+++ /dev/null
@@ -1,211 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-]>
-<refentry id="gdbus-org.freedesktop.NetworkManager.Settings.Connection">
-  <refmeta>    <refentrytitle role="top_of_page" id="gdbus-interface-org-freedesktop-NetworkManager-Settings-Connection.top_of_page">org.freedesktop.NetworkManager.Settings.Connection</refentrytitle>
-  <indexterm zone="gdbus-interface-org-freedesktop-NetworkManager-Settings-Connection.top_of_page"><primary sortas=".Settings.Connection">org.freedesktop.NetworkManager.Settings.Connection</primary></indexterm>
-  </refmeta>  <refnamediv>    <refname>org.freedesktop.NetworkManager.Settings.Connection</refname>    <refpurpose></refpurpose>  </refnamediv>  <refsynopsisdiv role="synopsis">
-    <title role="synopsis.title">Methods</title>
-    <synopsis>
-<link linkend="gdbus-method-org-freedesktop-NetworkManager-Settings-Connection.Update">Update</link>        (IN  a{sa{sv}} properties);
-<link linkend="gdbus-method-org-freedesktop-NetworkManager-Settings-Connection.UpdateUnsaved">UpdateUnsaved</link> (IN  a{sa{sv}} properties);
-<link linkend="gdbus-method-org-freedesktop-NetworkManager-Settings-Connection.Delete">Delete</link>        ();
-<link linkend="gdbus-method-org-freedesktop-NetworkManager-Settings-Connection.GetSettings">GetSettings</link>   (OUT a{sa{sv}} settings);
-<link linkend="gdbus-method-org-freedesktop-NetworkManager-Settings-Connection.GetSecrets">GetSecrets</link>    (IN  s         setting_name,
-               OUT a{sa{sv}} secrets);
-<link linkend="gdbus-method-org-freedesktop-NetworkManager-Settings-Connection.ClearSecrets">ClearSecrets</link>  ();
-<link linkend="gdbus-method-org-freedesktop-NetworkManager-Settings-Connection.Save">Save</link>          ();
-</synopsis>
-  </refsynopsisdiv>
-  <refsect1 role="signal_proto">
-    <title role="signal_proto.title">Signals</title>
-    <synopsis>
-<link linkend="gdbus-signal-org-freedesktop-NetworkManager-Settings-Connection.Updated">Updated</link>           ();
-<link linkend="gdbus-signal-org-freedesktop-NetworkManager-Settings-Connection.Removed">Removed</link>           ();
-<link linkend="gdbus-signal-org-freedesktop-NetworkManager-Settings-Connection.PropertiesChanged">PropertiesChanged</link> (a{sv} properties);
-</synopsis>
-  </refsect1>
-  <refsect1 role="properties">
-    <title role="properties.title">Properties</title>
-    <synopsis>
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Settings-Connection.Unsaved">Unsaved</link>  readable   b
-</synopsis>
-  </refsect1>
-<refsect1 role="desc" id="gdbus-interface-org-freedesktop-NetworkManager-Settings-Connection">
-  <title role="desc.title">Description</title>
-  <para>      Represents a single network connection configuration.
-</para>
-</refsect1>
-<refsect1 role="details" id="gdbus-methods-org.freedesktop.NetworkManager.Settings.Connection">
-  <title role="details.title">Method Details</title>
-<refsect2 role="method" id="gdbus-method-org-freedesktop-NetworkManager-Settings-Connection.Update">
-  <title>The Update() method</title>
-  <indexterm zone="gdbus-method-org-freedesktop-NetworkManager-Settings-Connection.Update"><primary sortas=".Settings.Connection.Update">org.freedesktop.NetworkManager.Settings.Connection.Update()</primary></indexterm>
-<programlisting>
-Update (IN  a{sa{sv}} properties);
-</programlisting>
-<para>        Update the connection with new settings and properties (replacing all
-        previous settings and properties) and save the connection to disk. Secrets
-        may be part of the update request, and will be either stored in persistent
-        storage or sent to a Secret Agent for storage, depending on the flags
-        associated with each secret.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>IN a{sa{sv}} <parameter>properties</parameter></literal>:</term>
-  <listitem><para>New connection settings, properties, and (optionally) secrets.</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-<refsect2 role="method" id="gdbus-method-org-freedesktop-NetworkManager-Settings-Connection.UpdateUnsaved">
-  <title>The UpdateUnsaved() method</title>
-  <indexterm zone="gdbus-method-org-freedesktop-NetworkManager-Settings-Connection.UpdateUnsaved"><primary sortas=".Settings.Connection.UpdateUnsaved">org.freedesktop.NetworkManager.Settings.Connection.UpdateUnsaved()</primary></indexterm>
-<programlisting>
-UpdateUnsaved (IN  a{sa{sv}} properties);
-</programlisting>
-<para>        Update the connection with new settings and properties (replacing all
-        previous settings and properties) but do not immediately save the
-        connection to disk. Secrets may be part of the update request and may sent
-        to a Secret Agent for storage, depending on the flags associated with each
-        secret. Use the 'Save' method to save these changes to disk. Note that
-        unsaved changes will be lost if the connection is reloaded from disk
-        (either automatically on file change or due to an explicit
-        ReloadConnections call).
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>IN a{sa{sv}} <parameter>properties</parameter></literal>:</term>
-  <listitem><para>New connection settings, properties, and (optionally) secrets.</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-<refsect2 role="method" id="gdbus-method-org-freedesktop-NetworkManager-Settings-Connection.Delete">
-  <title>The Delete() method</title>
-  <indexterm zone="gdbus-method-org-freedesktop-NetworkManager-Settings-Connection.Delete"><primary sortas=".Settings.Connection.Delete">org.freedesktop.NetworkManager.Settings.Connection.Delete()</primary></indexterm>
-<programlisting>
-Delete ();
-</programlisting>
-<para>        Delete the connection.
-</para>
-</refsect2>
-<refsect2 role="method" id="gdbus-method-org-freedesktop-NetworkManager-Settings-Connection.GetSettings">
-  <title>The GetSettings() method</title>
-  <indexterm zone="gdbus-method-org-freedesktop-NetworkManager-Settings-Connection.GetSettings"><primary sortas=".Settings.Connection.GetSettings">org.freedesktop.NetworkManager.Settings.Connection.GetSettings()</primary></indexterm>
-<programlisting>
-GetSettings (OUT a{sa{sv}} settings);
-</programlisting>
-<para>        Get the settings maps describing this network configuration. This will
-        never include any secrets required for connection to the network, as those
-        are often protected. Secrets must be requested separately using the
-        GetSecrets() call.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>OUT a{sa{sv}} <parameter>settings</parameter></literal>:</term>
-  <listitem><para>The nested settings maps describing this object.</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-<refsect2 role="method" id="gdbus-method-org-freedesktop-NetworkManager-Settings-Connection.GetSecrets">
-  <title>The GetSecrets() method</title>
-  <indexterm zone="gdbus-method-org-freedesktop-NetworkManager-Settings-Connection.GetSecrets"><primary sortas=".Settings.Connection.GetSecrets">org.freedesktop.NetworkManager.Settings.Connection.GetSecrets()</primary></indexterm>
-<programlisting>
-GetSecrets (IN  s         setting_name,
-            OUT a{sa{sv}} secrets);
-</programlisting>
-<para>        Get the secrets belonging to this network configuration. Only secrets from
-        persistent storage or a Secret Agent running in the requestor's session
-        will be returned. The user will never be prompted for secrets as a result
-        of this request.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>IN s <parameter>setting_name</parameter></literal>:</term>
-  <listitem><para>Name of the setting to return secrets for. If empty, all all secrets will be returned.</para></listitem>
-</varlistentry>
-<varlistentry>
-  <term><literal>OUT a{sa{sv}} <parameter>secrets</parameter></literal>:</term>
-  <listitem><para>Nested settings maps containing secrets.</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-<refsect2 role="method" id="gdbus-method-org-freedesktop-NetworkManager-Settings-Connection.ClearSecrets">
-  <title>The ClearSecrets() method</title>
-  <indexterm zone="gdbus-method-org-freedesktop-NetworkManager-Settings-Connection.ClearSecrets"><primary sortas=".Settings.Connection.ClearSecrets">org.freedesktop.NetworkManager.Settings.Connection.ClearSecrets()</primary></indexterm>
-<programlisting>
-ClearSecrets ();
-</programlisting>
-<para>        Clear the secrets belonging to this network connection profile.
-</para>
-</refsect2>
-<refsect2 role="method" id="gdbus-method-org-freedesktop-NetworkManager-Settings-Connection.Save">
-  <title>The Save() method</title>
-  <indexterm zone="gdbus-method-org-freedesktop-NetworkManager-Settings-Connection.Save"><primary sortas=".Settings.Connection.Save">org.freedesktop.NetworkManager.Settings.Connection.Save()</primary></indexterm>
-<programlisting>
-Save ();
-</programlisting>
-<para>        Saves a "dirty" connection (that had previously been updated with
-        UpdateUnsaved) to persistent storage.
-</para>
-</refsect2>
-</refsect1>
-<refsect1 role="details" id="gdbus-signals-org.freedesktop.NetworkManager.Settings.Connection">
-  <title role="details.title">Signal Details</title>
-<refsect2 role="signal" id="gdbus-signal-org-freedesktop-NetworkManager-Settings-Connection.Updated">
-  <title>The "Updated" signal</title>
-  <indexterm zone="gdbus-signal-org-freedesktop-NetworkManager-Settings-Connection.Updated"><primary sortas=".Settings.Connection::Updated">org.freedesktop.NetworkManager.Settings.Connection::Updated</primary></indexterm>
-<programlisting>
-Updated ();
-</programlisting>
-<para>        Emitted when any settings or permissions change. When handling this
-        signal, clients should re-read the connection using the GetSettings method
-        to get the changes and to ensure the client still has permission to access
-        the connection.
-</para>
-</refsect2>
-<refsect2 role="signal" id="gdbus-signal-org-freedesktop-NetworkManager-Settings-Connection.Removed">
-  <title>The "Removed" signal</title>
-  <indexterm zone="gdbus-signal-org-freedesktop-NetworkManager-Settings-Connection.Removed"><primary sortas=".Settings.Connection::Removed">org.freedesktop.NetworkManager.Settings.Connection::Removed</primary></indexterm>
-<programlisting>
-Removed ();
-</programlisting>
-<para>        Emitted when this connection is no longer available. This happens when the
-        connection is deleted or if it is no longer accessible by any of the
-        system's logged-in users. After receipt of this signal, the object no
-        longer exists. Also see the Settings.ConnectionRemoved signal.
-</para>
-</refsect2>
-<refsect2 role="signal" id="gdbus-signal-org-freedesktop-NetworkManager-Settings-Connection.PropertiesChanged">
-  <title>The "PropertiesChanged" signal</title>
-  <indexterm zone="gdbus-signal-org-freedesktop-NetworkManager-Settings-Connection.PropertiesChanged"><primary sortas=".Settings.Connection::PropertiesChanged">org.freedesktop.NetworkManager.Settings.Connection::PropertiesChanged</primary></indexterm>
-<programlisting>
-PropertiesChanged (a{sv} properties);
-</programlisting>
-<para>        DEPRECATED. Use the standard "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" instead which exists since version NetworkManager 1.2.0.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>a{sv} <parameter>properties</parameter></literal>:</term>
-  <listitem><para>A dictionary mapping property names to variant boxed values.</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-</refsect1>
-<refsect1 role="details" id="gdbus-properties-org.freedesktop.NetworkManager.Settings.Connection">
-  <title role="details.title">Property Details</title>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Settings-Connection.Unsaved">
-  <title>The "Unsaved" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Settings-Connection.Unsaved"><primary sortas=".Settings.Connection:Unsaved">org.freedesktop.NetworkManager.Settings.Connection:Unsaved</primary></indexterm>
-<programlisting>
-Unsaved  readable   b
-</programlisting>
-<para>        If set, indicates that the in-memory state of the connection does not
-        match the on-disk state. This flag will be set when UpdateUnsaved() is
-        called or when any connection details change, and cleared when the
-        connection is saved to disk via Save() or from internal operations.
-</para>
-</refsect2>
-</refsect1>
-</refentry>
-
diff --git a/introspection/nmdbus-settings-org.freedesktop.NetworkManager.Settings.xml b/introspection/nmdbus-settings-org.freedesktop.NetworkManager.Settings.xml
deleted file mode 100644
index 9882f812..00000000
--- a/introspection/nmdbus-settings-org.freedesktop.NetworkManager.Settings.xml
+++ /dev/null
@@ -1,288 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-]>
-<refentry id="gdbus-org.freedesktop.NetworkManager.Settings">
-  <refmeta>    <refentrytitle role="top_of_page" id="gdbus-interface-org-freedesktop-NetworkManager-Settings.top_of_page">org.freedesktop.NetworkManager.Settings</refentrytitle>
-  <indexterm zone="gdbus-interface-org-freedesktop-NetworkManager-Settings.top_of_page"><primary sortas=".Settings">org.freedesktop.NetworkManager.Settings</primary></indexterm>
-  </refmeta>  <refnamediv>    <refname>org.freedesktop.NetworkManager.Settings</refname>    <refpurpose></refpurpose>  </refnamediv>  <refsynopsisdiv role="synopsis">
-    <title role="synopsis.title">Methods</title>
-    <synopsis>
-<link linkend="gdbus-method-org-freedesktop-NetworkManager-Settings.ListConnections">ListConnections</link>      (OUT ao        connections);
-<link linkend="gdbus-method-org-freedesktop-NetworkManager-Settings.GetConnectionByUuid">GetConnectionByUuid</link>  (IN  s         uuid,
-                      OUT o         connection);
-<link linkend="gdbus-method-org-freedesktop-NetworkManager-Settings.AddConnection">AddConnection</link>        (IN  a{sa{sv}} connection,
-                      OUT o         path);
-<link linkend="gdbus-method-org-freedesktop-NetworkManager-Settings.AddConnectionUnsaved">AddConnectionUnsaved</link> (IN  a{sa{sv}} connection,
-                      OUT o         path);
-<link linkend="gdbus-method-org-freedesktop-NetworkManager-Settings.LoadConnections">LoadConnections</link>      (IN  as        filenames,
-                      OUT b         status,
-                      OUT as        failures);
-<link linkend="gdbus-method-org-freedesktop-NetworkManager-Settings.ReloadConnections">ReloadConnections</link>    (OUT b         status);
-<link linkend="gdbus-method-org-freedesktop-NetworkManager-Settings.SaveHostname">SaveHostname</link>         (IN  s         hostname);
-</synopsis>
-  </refsynopsisdiv>
-  <refsect1 role="signal_proto">
-    <title role="signal_proto.title">Signals</title>
-    <synopsis>
-<link linkend="gdbus-signal-org-freedesktop-NetworkManager-Settings.PropertiesChanged">PropertiesChanged</link> (a{sv} properties);
-<link linkend="gdbus-signal-org-freedesktop-NetworkManager-Settings.NewConnection">NewConnection</link>     (o     connection);
-<link linkend="gdbus-signal-org-freedesktop-NetworkManager-Settings.ConnectionRemoved">ConnectionRemoved</link> (o     connection);
-</synopsis>
-  </refsect1>
-  <refsect1 role="properties">
-    <title role="properties.title">Properties</title>
-    <synopsis>
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Settings.Connections">Connections</link>  readable   ao
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Settings.Hostname">Hostname</link>     readable   s
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-Settings.CanModify">CanModify</link>    readable   b
-</synopsis>
-  </refsect1>
-<refsect1 role="desc" id="gdbus-interface-org-freedesktop-NetworkManager-Settings">
-  <title role="desc.title">Description</title>
-  <para>      The Settings interface allows clients to view and administrate the
-      connections stored and used by NetworkManager.
-</para>
-</refsect1>
-<refsect1 role="details" id="gdbus-methods-org.freedesktop.NetworkManager.Settings">
-  <title role="details.title">Method Details</title>
-<refsect2 role="method" id="gdbus-method-org-freedesktop-NetworkManager-Settings.ListConnections">
-  <title>The ListConnections() method</title>
-  <indexterm zone="gdbus-method-org-freedesktop-NetworkManager-Settings.ListConnections"><primary sortas=".Settings.ListConnections">org.freedesktop.NetworkManager.Settings.ListConnections()</primary></indexterm>
-<programlisting>
-ListConnections (OUT ao connections);
-</programlisting>
-<para>        List the saved network connections known to NetworkManager.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>OUT ao <parameter>connections</parameter></literal>:</term>
-  <listitem><para>List of connections.</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-<refsect2 role="method" id="gdbus-method-org-freedesktop-NetworkManager-Settings.GetConnectionByUuid">
-  <title>The GetConnectionByUuid() method</title>
-  <indexterm zone="gdbus-method-org-freedesktop-NetworkManager-Settings.GetConnectionByUuid"><primary sortas=".Settings.GetConnectionByUuid">org.freedesktop.NetworkManager.Settings.GetConnectionByUuid()</primary></indexterm>
-<programlisting>
-GetConnectionByUuid (IN  s uuid,
-                     OUT o connection);
-</programlisting>
-<para>        Retrieve the object path of a connection, given that connection's UUID.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>IN s <parameter>uuid</parameter></literal>:</term>
-  <listitem><para>The UUID to find the connection object path for.</para></listitem>
-</varlistentry>
-<varlistentry>
-  <term><literal>OUT o <parameter>connection</parameter></literal>:</term>
-  <listitem><para>The connection's object path.</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-<refsect2 role="method" id="gdbus-method-org-freedesktop-NetworkManager-Settings.AddConnection">
-  <title>The AddConnection() method</title>
-  <indexterm zone="gdbus-method-org-freedesktop-NetworkManager-Settings.AddConnection"><primary sortas=".Settings.AddConnection">org.freedesktop.NetworkManager.Settings.AddConnection()</primary></indexterm>
-<programlisting>
-AddConnection (IN  a{sa{sv}} connection,
-               OUT o         path);
-</programlisting>
-<para>        Add new connection and save it to disk. This operation does not start the
-        network connection unless (1) device is idle and able to connect to the
-        network described by the new connection, and (2) the connection is allowed
-        to be started automatically.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>IN a{sa{sv}} <parameter>connection</parameter></literal>:</term>
-  <listitem><para>Connection settings and properties.</para></listitem>
-</varlistentry>
-<varlistentry>
-  <term><literal>OUT o <parameter>path</parameter></literal>:</term>
-  <listitem><para>Object path of the new connection that was just added.</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-<refsect2 role="method" id="gdbus-method-org-freedesktop-NetworkManager-Settings.AddConnectionUnsaved">
-  <title>The AddConnectionUnsaved() method</title>
-  <indexterm zone="gdbus-method-org-freedesktop-NetworkManager-Settings.AddConnectionUnsaved"><primary sortas=".Settings.AddConnectionUnsaved">org.freedesktop.NetworkManager.Settings.AddConnectionUnsaved()</primary></indexterm>
-<programlisting>
-AddConnectionUnsaved (IN  a{sa{sv}} connection,
-                      OUT o         path);
-</programlisting>
-<para>        Add new connection but do not save it to disk immediately. This operation
-        does not start the network connection unless (1) device is idle and able
-        to connect to the network described by the new connection, and (2) the
-        connection is allowed to be started automatically. Use the 'Save' method
-        on the connection to save these changes to disk. Note that unsaved changes
-        will be lost if the connection is reloaded from disk (either automatically
-        on file change or due to an explicit ReloadConnections call).
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>IN a{sa{sv}} <parameter>connection</parameter></literal>:</term>
-  <listitem><para>Connection settings and properties.</para></listitem>
-</varlistentry>
-<varlistentry>
-  <term><literal>OUT o <parameter>path</parameter></literal>:</term>
-  <listitem><para>Object path of the new connection that was just added.</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-<refsect2 role="method" id="gdbus-method-org-freedesktop-NetworkManager-Settings.LoadConnections">
-  <title>The LoadConnections() method</title>
-  <indexterm zone="gdbus-method-org-freedesktop-NetworkManager-Settings.LoadConnections"><primary sortas=".Settings.LoadConnections">org.freedesktop.NetworkManager.Settings.LoadConnections()</primary></indexterm>
-<programlisting>
-LoadConnections (IN  as filenames,
-                 OUT b  status,
-                 OUT as failures);
-</programlisting>
-<para>        Loads or reloads the indicated connections from disk. You should call this
-        after making changes directly to an on-disk connection file to make sure
-        that NetworkManager sees the changes. (If "monitor-connection-files" in
-        NetworkManager.conf is "true", then this will have no real effect, but is
-        harmless.) As with AddConnection(), this operation does not necessarily
-        start the network connection.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>IN as <parameter>filenames</parameter></literal>:</term>
-  <listitem><para>Array of paths to on-disk connection profiles in directories monitored by NetworkManager.</para></listitem>
-</varlistentry>
-<varlistentry>
-  <term><literal>OUT b <parameter>status</parameter></literal>:</term>
-  <listitem><para>Success or failure of the operation as a whole. True if NetworkManager at least tried to load the indicated connections, even if it did not succeed. False if an error occurred before trying to load the connections (eg, permission denied).</para></listitem>
-</varlistentry>
-<varlistentry>
-  <term><literal>OUT as <parameter>failures</parameter></literal>:</term>
-  <listitem><para>Paths of connection files that could not be loaded.</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-<refsect2 role="method" id="gdbus-method-org-freedesktop-NetworkManager-Settings.ReloadConnections">
-  <title>The ReloadConnections() method</title>
-  <indexterm zone="gdbus-method-org-freedesktop-NetworkManager-Settings.ReloadConnections"><primary sortas=".Settings.ReloadConnections">org.freedesktop.NetworkManager.Settings.ReloadConnections()</primary></indexterm>
-<programlisting>
-ReloadConnections (OUT b status);
-</programlisting>
-<para>        Tells NetworkManager to reload all connection files from disk, including
-        noticing any added or deleted connection files. By default, connections
-        are re-read automatically any time they change, so you only need to use
-        this command if you have set "monitor-connection-files=false" in
-        NetworkManager.conf.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>OUT b <parameter>status</parameter></literal>:</term>
-  <listitem><para>Success or failure.</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-<refsect2 role="method" id="gdbus-method-org-freedesktop-NetworkManager-Settings.SaveHostname">
-  <title>The SaveHostname() method</title>
-  <indexterm zone="gdbus-method-org-freedesktop-NetworkManager-Settings.SaveHostname"><primary sortas=".Settings.SaveHostname">org.freedesktop.NetworkManager.Settings.SaveHostname()</primary></indexterm>
-<programlisting>
-SaveHostname (IN  s hostname);
-</programlisting>
-<para>        Save the hostname to persistent configuration.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>IN s <parameter>hostname</parameter></literal>:</term>
-  <listitem><para>The hostname to save to persistent configuration. If blank, the persistent hostname is cleared.</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-</refsect1>
-<refsect1 role="details" id="gdbus-signals-org.freedesktop.NetworkManager.Settings">
-  <title role="details.title">Signal Details</title>
-<refsect2 role="signal" id="gdbus-signal-org-freedesktop-NetworkManager-Settings.PropertiesChanged">
-  <title>The "PropertiesChanged" signal</title>
-  <indexterm zone="gdbus-signal-org-freedesktop-NetworkManager-Settings.PropertiesChanged"><primary sortas=".Settings::PropertiesChanged">org.freedesktop.NetworkManager.Settings::PropertiesChanged</primary></indexterm>
-<programlisting>
-PropertiesChanged (a{sv} properties);
-</programlisting>
-<para>        DEPRECATED. Use the standard "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" instead which exists since version NetworkManager 1.2.0.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>a{sv} <parameter>properties</parameter></literal>:</term>
-  <listitem><para>A dictionary mapping property names to variant boxed values</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-<refsect2 role="signal" id="gdbus-signal-org-freedesktop-NetworkManager-Settings.NewConnection">
-  <title>The "NewConnection" signal</title>
-  <indexterm zone="gdbus-signal-org-freedesktop-NetworkManager-Settings.NewConnection"><primary sortas=".Settings::NewConnection">org.freedesktop.NetworkManager.Settings::NewConnection</primary></indexterm>
-<programlisting>
-NewConnection (o connection);
-</programlisting>
-<para>        Emitted when a new connection has been added after NetworkManager has
-        started up and initialized. This signal is not emitted for connections
-        read while starting up, because NetworkManager's D-Bus service is only
-        available after all connections have been read, and to prevent spamming
-        listeners with too many signals at one time. To retrieve the initial
-        connection list, call the ListConnections() method once, and then listen
-        for individual Settings.NewConnection and Settings.Connection.Deleted
-        signals for further updates.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>o <parameter>connection</parameter></literal>:</term>
-  <listitem><para>Object path of the new connection.</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-<refsect2 role="signal" id="gdbus-signal-org-freedesktop-NetworkManager-Settings.ConnectionRemoved">
-  <title>The "ConnectionRemoved" signal</title>
-  <indexterm zone="gdbus-signal-org-freedesktop-NetworkManager-Settings.ConnectionRemoved"><primary sortas=".Settings::ConnectionRemoved">org.freedesktop.NetworkManager.Settings::ConnectionRemoved</primary></indexterm>
-<programlisting>
-ConnectionRemoved (o connection);
-</programlisting>
-<para>        Emitted when a connection is no longer available. This happens when the
-        connection is deleted or if it is no longer accessible by any of the
-        system's logged-in users. After receipt of this signal, the connection no
-        longer exists and cannot be used. Also see the Settings.Connection.Removed
-        signal.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>o <parameter>connection</parameter></literal>:</term>
-  <listitem><para>Object path of the removed connection.</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-</refsect1>
-<refsect1 role="details" id="gdbus-properties-org.freedesktop.NetworkManager.Settings">
-  <title role="details.title">Property Details</title>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Settings.Connections">
-  <title>The "Connections" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Settings.Connections"><primary sortas=".Settings:Connections">org.freedesktop.NetworkManager.Settings:Connections</primary></indexterm>
-<programlisting>
-Connections  readable   ao
-</programlisting>
-<para>        List of object paths of available network connection profiles.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Settings.Hostname">
-  <title>The "Hostname" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Settings.Hostname"><primary sortas=".Settings:Hostname">org.freedesktop.NetworkManager.Settings:Hostname</primary></indexterm>
-<programlisting>
-Hostname  readable   s
-</programlisting>
-<para>        The machine hostname stored in persistent configuration.
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Settings.CanModify">
-  <title>The "CanModify" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Settings.CanModify"><primary sortas=".Settings:CanModify">org.freedesktop.NetworkManager.Settings:CanModify</primary></indexterm>
-<programlisting>
-CanModify  readable   b
-</programlisting>
-<para>        If true, adding and modifying connections is supported.
-</para>
-</refsect2>
-</refsect1>
-</refentry>
-
diff --git a/introspection/nmdbus-vpn-connection-org.freedesktop.NetworkManager.VPN.Connection.xml b/introspection/nmdbus-vpn-connection-org.freedesktop.NetworkManager.VPN.Connection.xml
deleted file mode 100644
index 523acbba..00000000
--- a/introspection/nmdbus-vpn-connection-org.freedesktop.NetworkManager.VPN.Connection.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-]>
-<refentry id="gdbus-org.freedesktop.NetworkManager.VPN.Connection">
-  <refmeta>    <refentrytitle role="top_of_page" id="gdbus-interface-org-freedesktop-NetworkManager-VPN-Connection.top_of_page">org.freedesktop.NetworkManager.VPN.Connection</refentrytitle>
-  <indexterm zone="gdbus-interface-org-freedesktop-NetworkManager-VPN-Connection.top_of_page"><primary sortas="VpnConnection">org.freedesktop.NetworkManager.VPN.Connection</primary></indexterm>
-  </refmeta>  <refnamediv>    <refname>org.freedesktop.NetworkManager.VPN.Connection</refname>    <refpurpose></refpurpose>  </refnamediv>  <refsect1 role="signal_proto">
-    <title role="signal_proto.title">Signals</title>
-    <synopsis>
-<link linkend="gdbus-signal-org-freedesktop-NetworkManager-VPN-Connection.PropertiesChanged">PropertiesChanged</link> (a{sv} properties);
-<link linkend="gdbus-signal-org-freedesktop-NetworkManager-VPN-Connection.VpnStateChanged">VpnStateChanged</link>   (u     state,
-                   u     reason);
-</synopsis>
-  </refsect1>
-  <refsect1 role="properties">
-    <title role="properties.title">Properties</title>
-    <synopsis>
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-VPN-Connection.VpnState">VpnState</link>  readable   u
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-VPN-Connection.Banner">Banner</link>    readable   s
-</synopsis>
-  </refsect1>
-<refsect1 role="desc" id="gdbus-interface-org-freedesktop-NetworkManager-VPN-Connection">
-  <title role="desc.title">Description</title>
-  <para>      Represents an active connection to a Virtual Private Network.
-</para>
-</refsect1>
-<refsect1 role="details" id="gdbus-signals-org.freedesktop.NetworkManager.VPN.Connection">
-  <title role="details.title">Signal Details</title>
-<refsect2 role="signal" id="gdbus-signal-org-freedesktop-NetworkManager-VPN-Connection.PropertiesChanged">
-  <title>The "PropertiesChanged" signal</title>
-  <indexterm zone="gdbus-signal-org-freedesktop-NetworkManager-VPN-Connection.PropertiesChanged"><primary sortas="VpnConnection::PropertiesChanged">org.freedesktop.NetworkManager.VPN.Connection::PropertiesChanged</primary></indexterm>
-<programlisting>
-PropertiesChanged (a{sv} properties);
-</programlisting>
-<para>        DEPRECATED. Use the standard "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" instead which exists since version NetworkManager 1.2.0.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>a{sv} <parameter>properties</parameter></literal>:</term>
-  <listitem><para>A dictionary mapping property names to variant boxed values</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-<refsect2 role="signal" id="gdbus-signal-org-freedesktop-NetworkManager-VPN-Connection.VpnStateChanged">
-  <title>The "VpnStateChanged" signal</title>
-  <indexterm zone="gdbus-signal-org-freedesktop-NetworkManager-VPN-Connection.VpnStateChanged"><primary sortas="VpnConnection::VpnStateChanged">org.freedesktop.NetworkManager.VPN.Connection::VpnStateChanged</primary></indexterm>
-<programlisting>
-VpnStateChanged (u state,
-                 u reason);
-</programlisting>
-<para>        Emitted when the state of the VPN connection has changed.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>u <parameter>state</parameter></literal>:</term>
-  <listitem><para>(<link linkend="NMVpnConnectionState">NMVpnConnectionState</link>) The new state of the VPN connection.</para></listitem>
-</varlistentry>
-<varlistentry>
-  <term><literal>u <parameter>reason</parameter></literal>:</term>
-  <listitem><para>(<link linkend="NMVpnConnectionStateReason">NMVpnConnectionStateReason</link>) Reason code describing the change to the new state.</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-</refsect1>
-<refsect1 role="details" id="gdbus-properties-org.freedesktop.NetworkManager.VPN.Connection">
-  <title role="details.title">Property Details</title>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-VPN-Connection.VpnState">
-  <title>The "VpnState" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-VPN-Connection.VpnState"><primary sortas="VpnConnection:VpnState">org.freedesktop.NetworkManager.VPN.Connection:VpnState</primary></indexterm>
-<programlisting>
-VpnState  readable   u
-</programlisting>
-<para>        The VPN-specific state of the connection.
-</para><para>        Returns: <link linkend="NMVpnConnectionState">NMVpnConnectionState</link>
-</para>
-</refsect2>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-VPN-Connection.Banner">
-  <title>The "Banner" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-VPN-Connection.Banner"><primary sortas="VpnConnection:Banner">org.freedesktop.NetworkManager.VPN.Connection:Banner</primary></indexterm>
-<programlisting>
-Banner  readable   s
-</programlisting>
-<para>        The banner string of the VPN connection.
-</para>
-</refsect2>
-</refsect1>
-</refentry>
-
diff --git a/introspection/nmdbus-vpn-plugin-org.freedesktop.NetworkManager.VPN.Plugin.xml b/introspection/nmdbus-vpn-plugin-org.freedesktop.NetworkManager.VPN.Plugin.xml
deleted file mode 100644
index 80eaebc3..00000000
--- a/introspection/nmdbus-vpn-plugin-org.freedesktop.NetworkManager.VPN.Plugin.xml
+++ /dev/null
@@ -1,325 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-]>
-<refentry id="gdbus-org.freedesktop.NetworkManager.VPN.Plugin">
-  <refmeta>    <refentrytitle role="top_of_page" id="gdbus-interface-org-freedesktop-NetworkManager-VPN-Plugin.top_of_page">org.freedesktop.NetworkManager.VPN.Plugin</refentrytitle>
-  <indexterm zone="gdbus-interface-org-freedesktop-NetworkManager-VPN-Plugin.top_of_page"><primary sortas="VpnPlugin">org.freedesktop.NetworkManager.VPN.Plugin</primary></indexterm>
-  </refmeta>  <refnamediv>    <refname>org.freedesktop.NetworkManager.VPN.Plugin</refname>    <refpurpose></refpurpose>  </refnamediv>  <refsynopsisdiv role="synopsis">
-    <title role="synopsis.title">Methods</title>
-    <synopsis>
-<link linkend="gdbus-method-org-freedesktop-NetworkManager-VPN-Plugin.Connect">Connect</link>            (IN  a{sa{sv}} connection);
-<link linkend="gdbus-method-org-freedesktop-NetworkManager-VPN-Plugin.ConnectInteractive">ConnectInteractive</link> (IN  a{sa{sv}} connection,
-                    IN  a{sv}     details);
-<link linkend="gdbus-method-org-freedesktop-NetworkManager-VPN-Plugin.NeedSecrets">NeedSecrets</link>        (IN  a{sa{sv}} settings,
-                    OUT s         setting_name);
-<link linkend="gdbus-method-org-freedesktop-NetworkManager-VPN-Plugin.Disconnect">Disconnect</link>         ();
-<link linkend="gdbus-method-org-freedesktop-NetworkManager-VPN-Plugin.SetConfig">SetConfig</link>          (IN  a{sv}     config);
-<link linkend="gdbus-method-org-freedesktop-NetworkManager-VPN-Plugin.SetIp4Config">SetIp4Config</link>       (IN  a{sv}     config);
-<link linkend="gdbus-method-org-freedesktop-NetworkManager-VPN-Plugin.SetIp6Config">SetIp6Config</link>       (IN  a{sv}     config);
-<link linkend="gdbus-method-org-freedesktop-NetworkManager-VPN-Plugin.SetFailure">SetFailure</link>         (IN  s         reason);
-<link linkend="gdbus-method-org-freedesktop-NetworkManager-VPN-Plugin.NewSecrets">NewSecrets</link>         (IN  a{sa{sv}} connection);
-</synopsis>
-  </refsynopsisdiv>
-  <refsect1 role="signal_proto">
-    <title role="signal_proto.title">Signals</title>
-    <synopsis>
-<link linkend="gdbus-signal-org-freedesktop-NetworkManager-VPN-Plugin.StateChanged">StateChanged</link>    (u     state);
-<link linkend="gdbus-signal-org-freedesktop-NetworkManager-VPN-Plugin.SecretsRequired">SecretsRequired</link> (s     message,
-                 as    secrets);
-<link linkend="gdbus-signal-org-freedesktop-NetworkManager-VPN-Plugin.Config">Config</link>          (a{sv} config);
-<link linkend="gdbus-signal-org-freedesktop-NetworkManager-VPN-Plugin.Ip4Config">Ip4Config</link>       (a{sv} ip4config);
-<link linkend="gdbus-signal-org-freedesktop-NetworkManager-VPN-Plugin.Ip6Config">Ip6Config</link>       (a{sv} ip6config);
-<link linkend="gdbus-signal-org-freedesktop-NetworkManager-VPN-Plugin.LoginBanner">LoginBanner</link>     (s     banner);
-<link linkend="gdbus-signal-org-freedesktop-NetworkManager-VPN-Plugin.Failure">Failure</link>         (u     reason);
-</synopsis>
-  </refsect1>
-  <refsect1 role="properties">
-    <title role="properties.title">Properties</title>
-    <synopsis>
-<link linkend="gdbus-property-org-freedesktop-NetworkManager-VPN-Plugin.State">State</link>  readable   u
-</synopsis>
-  </refsect1>
-<refsect1 role="desc" id="gdbus-interface-org-freedesktop-NetworkManager-VPN-Plugin">
-  <title role="desc.title">Description</title>
-  <para>      This interface is provided by plugins providing VPN services to the
-      NetworkManager daemon.
-</para>
-</refsect1>
-<refsect1 role="details" id="gdbus-methods-org.freedesktop.NetworkManager.VPN.Plugin">
-  <title role="details.title">Method Details</title>
-<refsect2 role="method" id="gdbus-method-org-freedesktop-NetworkManager-VPN-Plugin.Connect">
-  <title>The Connect() method</title>
-  <indexterm zone="gdbus-method-org-freedesktop-NetworkManager-VPN-Plugin.Connect"><primary sortas="VpnPlugin.Connect">org.freedesktop.NetworkManager.VPN.Plugin.Connect()</primary></indexterm>
-<programlisting>
-Connect (IN  a{sa{sv}} connection);
-</programlisting>
-<para>        Tells the plugin to connect. Interactive secrets requests (eg, emitting
-        the SecretsRequired signal) are not allowed.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>IN a{sa{sv}} <parameter>connection</parameter></literal>:</term>
-  <listitem><para>Describes the connection to be established.</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-<refsect2 role="method" id="gdbus-method-org-freedesktop-NetworkManager-VPN-Plugin.ConnectInteractive">
-  <title>The ConnectInteractive() method</title>
-  <indexterm zone="gdbus-method-org-freedesktop-NetworkManager-VPN-Plugin.ConnectInteractive"><primary sortas="VpnPlugin.ConnectInteractive">org.freedesktop.NetworkManager.VPN.Plugin.ConnectInteractive()</primary></indexterm>
-<programlisting>
-ConnectInteractive (IN  a{sa{sv}} connection,
-                    IN  a{sv}     details);
-</programlisting>
-<para>        Tells the plugin to connect, allowing interactive secrets requests (eg the
-        plugin is allowed to emit the SecretsRequired signal if the VPN service
-        indicates that it needs additional secrets during the connect process).
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>IN a{sa{sv}} <parameter>connection</parameter></literal>:</term>
-  <listitem><para>Describes the connection to be established.</para></listitem>
-</varlistentry>
-<varlistentry>
-  <term><literal>IN a{sv} <parameter>details</parameter></literal>:</term>
-  <listitem><para>Additional details about the Connect process.</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-<refsect2 role="method" id="gdbus-method-org-freedesktop-NetworkManager-VPN-Plugin.NeedSecrets">
-  <title>The NeedSecrets() method</title>
-  <indexterm zone="gdbus-method-org-freedesktop-NetworkManager-VPN-Plugin.NeedSecrets"><primary sortas="VpnPlugin.NeedSecrets">org.freedesktop.NetworkManager.VPN.Plugin.NeedSecrets()</primary></indexterm>
-<programlisting>
-NeedSecrets (IN  a{sa{sv}} settings,
-             OUT s         setting_name);
-</programlisting>
-<para>        Asks the plugin whether the provided connection will require secrets to
-        connect successfully.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>IN a{sa{sv}} <parameter>settings</parameter></literal>:</term>
-  <listitem><para>Describes the connection that may need secrets.</para></listitem>
-</varlistentry>
-<varlistentry>
-  <term><literal>OUT s <parameter>setting_name</parameter></literal>:</term>
-  <listitem><para>The setting name within the provided connection that requires secrets, if any.</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-<refsect2 role="method" id="gdbus-method-org-freedesktop-NetworkManager-VPN-Plugin.Disconnect">
-  <title>The Disconnect() method</title>
-  <indexterm zone="gdbus-method-org-freedesktop-NetworkManager-VPN-Plugin.Disconnect"><primary sortas="VpnPlugin.Disconnect">org.freedesktop.NetworkManager.VPN.Plugin.Disconnect()</primary></indexterm>
-<programlisting>
-Disconnect ();
-</programlisting>
-<para>        Disconnect the plugin.
-</para>
-</refsect2>
-<refsect2 role="method" id="gdbus-method-org-freedesktop-NetworkManager-VPN-Plugin.SetConfig">
-  <title>The SetConfig() method</title>
-  <indexterm zone="gdbus-method-org-freedesktop-NetworkManager-VPN-Plugin.SetConfig"><primary sortas="VpnPlugin.SetConfig">org.freedesktop.NetworkManager.VPN.Plugin.SetConfig()</primary></indexterm>
-<programlisting>
-SetConfig (IN  a{sv} config);
-</programlisting>
-<para>        Set generic connection details on the connection.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>IN a{sv} <parameter>config</parameter></literal>:</term>
-  <listitem><para>Generic configuration details for the connection.</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-<refsect2 role="method" id="gdbus-method-org-freedesktop-NetworkManager-VPN-Plugin.SetIp4Config">
-  <title>The SetIp4Config() method</title>
-  <indexterm zone="gdbus-method-org-freedesktop-NetworkManager-VPN-Plugin.SetIp4Config"><primary sortas="VpnPlugin.SetIp4Config">org.freedesktop.NetworkManager.VPN.Plugin.SetIp4Config()</primary></indexterm>
-<programlisting>
-SetIp4Config (IN  a{sv} config);
-</programlisting>
-<para>        Set IPv4 details on the connection.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>IN a{sv} <parameter>config</parameter></literal>:</term>
-  <listitem><para>Ip4Config details for the connection. You must call SetConfig() before calling this.</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-<refsect2 role="method" id="gdbus-method-org-freedesktop-NetworkManager-VPN-Plugin.SetIp6Config">
-  <title>The SetIp6Config() method</title>
-  <indexterm zone="gdbus-method-org-freedesktop-NetworkManager-VPN-Plugin.SetIp6Config"><primary sortas="VpnPlugin.SetIp6Config">org.freedesktop.NetworkManager.VPN.Plugin.SetIp6Config()</primary></indexterm>
-<programlisting>
-SetIp6Config (IN  a{sv} config);
-</programlisting>
-<para>        Set IPv6 details on the connection.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>IN a{sv} <parameter>config</parameter></literal>:</term>
-  <listitem><para>Ip6Config details for the connection. You must call SetConfig() before calling this.</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-<refsect2 role="method" id="gdbus-method-org-freedesktop-NetworkManager-VPN-Plugin.SetFailure">
-  <title>The SetFailure() method</title>
-  <indexterm zone="gdbus-method-org-freedesktop-NetworkManager-VPN-Plugin.SetFailure"><primary sortas="VpnPlugin.SetFailure">org.freedesktop.NetworkManager.VPN.Plugin.SetFailure()</primary></indexterm>
-<programlisting>
-SetFailure (IN  s reason);
-</programlisting>
-<para>        Indicate a failure to the plugin.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>IN s <parameter>reason</parameter></literal>:</term>
-  <listitem><para>The reason for the failure.</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-<refsect2 role="method" id="gdbus-method-org-freedesktop-NetworkManager-VPN-Plugin.NewSecrets">
-  <title>The NewSecrets() method</title>
-  <indexterm zone="gdbus-method-org-freedesktop-NetworkManager-VPN-Plugin.NewSecrets"><primary sortas="VpnPlugin.NewSecrets">org.freedesktop.NetworkManager.VPN.Plugin.NewSecrets()</primary></indexterm>
-<programlisting>
-NewSecrets (IN  a{sa{sv}} connection);
-</programlisting>
-<para>        Called in response to a SecretsRequired signal to deliver updated secrets
-        or other information to the plugin.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>IN a{sa{sv}} <parameter>connection</parameter></literal>:</term>
-  <listitem><para>Describes the connection including the new secrets.</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-</refsect1>
-<refsect1 role="details" id="gdbus-signals-org.freedesktop.NetworkManager.VPN.Plugin">
-  <title role="details.title">Signal Details</title>
-<refsect2 role="signal" id="gdbus-signal-org-freedesktop-NetworkManager-VPN-Plugin.StateChanged">
-  <title>The "StateChanged" signal</title>
-  <indexterm zone="gdbus-signal-org-freedesktop-NetworkManager-VPN-Plugin.StateChanged"><primary sortas="VpnPlugin::StateChanged">org.freedesktop.NetworkManager.VPN.Plugin::StateChanged</primary></indexterm>
-<programlisting>
-StateChanged (u state);
-</programlisting>
-<para>        Emitted when the plugin state changes.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>u <parameter>state</parameter></literal>:</term>
-  <listitem><para>(<link linkend="NMVpnServiceState">NMVpnServiceState</link>) The new state of the plugin.</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-<refsect2 role="signal" id="gdbus-signal-org-freedesktop-NetworkManager-VPN-Plugin.SecretsRequired">
-  <title>The "SecretsRequired" signal</title>
-  <indexterm zone="gdbus-signal-org-freedesktop-NetworkManager-VPN-Plugin.SecretsRequired"><primary sortas="VpnPlugin::SecretsRequired">org.freedesktop.NetworkManager.VPN.Plugin::SecretsRequired</primary></indexterm>
-<programlisting>
-SecretsRequired (s  message,
-                 as secrets);
-</programlisting>
-<para>        Emitted during an ongoing ConnectInteractive() request when the plugin has
-        determined that new secrets are required. NetworkManager will then call
-        the NewSecrets() method with a connection hash including the new secrets.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>s <parameter>message</parameter></literal>:</term>
-  <listitem><para>Informational message, if any, about the request. For example, if a second PIN is required, could indicate to the user to wait for the token code to change until entering the next PIN.</para></listitem>
-</varlistentry>
-<varlistentry>
-  <term><literal>as <parameter>secrets</parameter></literal>:</term>
-  <listitem><para>Array of strings of VPN secret names which the plugin thinks secrets may be required for, or other VPN-specific data to be processed by the VPN's front-end.</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-<refsect2 role="signal" id="gdbus-signal-org-freedesktop-NetworkManager-VPN-Plugin.Config">
-  <title>The "Config" signal</title>
-  <indexterm zone="gdbus-signal-org-freedesktop-NetworkManager-VPN-Plugin.Config"><primary sortas="VpnPlugin::Config">org.freedesktop.NetworkManager.VPN.Plugin::Config</primary></indexterm>
-<programlisting>
-Config (a{sv} config);
-</programlisting>
-<para>        The plugin obtained generic configuration information.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>a{sv} <parameter>config</parameter></literal>:</term>
-  <listitem><para>The configuration information.</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-<refsect2 role="signal" id="gdbus-signal-org-freedesktop-NetworkManager-VPN-Plugin.Ip4Config">
-  <title>The "Ip4Config" signal</title>
-  <indexterm zone="gdbus-signal-org-freedesktop-NetworkManager-VPN-Plugin.Ip4Config"><primary sortas="VpnPlugin::Ip4Config">org.freedesktop.NetworkManager.VPN.Plugin::Ip4Config</primary></indexterm>
-<programlisting>
-Ip4Config (a{sv} ip4config);
-</programlisting>
-<para>        The plugin obtained an IPv4 configuration.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>a{sv} <parameter>ip4config</parameter></literal>:</term>
-  <listitem><para>The IPv4 configuration.</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-<refsect2 role="signal" id="gdbus-signal-org-freedesktop-NetworkManager-VPN-Plugin.Ip6Config">
-  <title>The "Ip6Config" signal</title>
-  <indexterm zone="gdbus-signal-org-freedesktop-NetworkManager-VPN-Plugin.Ip6Config"><primary sortas="VpnPlugin::Ip6Config">org.freedesktop.NetworkManager.VPN.Plugin::Ip6Config</primary></indexterm>
-<programlisting>
-Ip6Config (a{sv} ip6config);
-</programlisting>
-<para>        The plugin obtained an IPv6 configuration.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>a{sv} <parameter>ip6config</parameter></literal>:</term>
-  <listitem><para>The IPv6 configuration.</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-<refsect2 role="signal" id="gdbus-signal-org-freedesktop-NetworkManager-VPN-Plugin.LoginBanner">
-  <title>The "LoginBanner" signal</title>
-  <indexterm zone="gdbus-signal-org-freedesktop-NetworkManager-VPN-Plugin.LoginBanner"><primary sortas="VpnPlugin::LoginBanner">org.freedesktop.NetworkManager.VPN.Plugin::LoginBanner</primary></indexterm>
-<programlisting>
-LoginBanner (s banner);
-</programlisting>
-<para>        Emitted when the plugin receives a login banner from the VPN service.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>s <parameter>banner</parameter></literal>:</term>
-  <listitem><para>The login banner string.</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-<refsect2 role="signal" id="gdbus-signal-org-freedesktop-NetworkManager-VPN-Plugin.Failure">
-  <title>The "Failure" signal</title>
-  <indexterm zone="gdbus-signal-org-freedesktop-NetworkManager-VPN-Plugin.Failure"><primary sortas="VpnPlugin::Failure">org.freedesktop.NetworkManager.VPN.Plugin::Failure</primary></indexterm>
-<programlisting>
-Failure (u reason);
-</programlisting>
-<para>        Emitted when a failure in the VPN plugin occurs.
-</para>
-<variablelist role="params">
-<varlistentry>
-  <term><literal>u <parameter>reason</parameter></literal>:</term>
-  <listitem><para>(<link linkend="NMVpnPluginFailure">NMVpnPluginFailure</link>) Reason code for the failure.</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-</refsect1>
-<refsect1 role="details" id="gdbus-properties-org.freedesktop.NetworkManager.VPN.Plugin">
-  <title role="details.title">Property Details</title>
-<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-VPN-Plugin.State">
-  <title>The "State" property</title>
-  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-VPN-Plugin.State"><primary sortas="VpnPlugin:State">org.freedesktop.NetworkManager.VPN.Plugin:State</primary></indexterm>
-<programlisting>
-State  readable   u
-</programlisting>
-<para>        The state of the plugin.
-</para><para>        Returns: <link linkend="NMVpnServiceState">NMVpnServiceState</link>
-</para>
-</refsect2>
-</refsect1>
-</refentry>
-
diff --git a/introspection/nm-access-point.xml b/introspection/org.freedesktop.NetworkManager.AccessPoint.xml
index 617c8671..617c8671 100644
--- a/introspection/nm-access-point.xml
+++ b/introspection/org.freedesktop.NetworkManager.AccessPoint.xml
diff --git a/introspection/nm-agent-manager.xml b/introspection/org.freedesktop.NetworkManager.AgentManager.xml
index 86b4404a..86b4404a 100644
--- a/introspection/nm-agent-manager.xml
+++ b/introspection/org.freedesktop.NetworkManager.AgentManager.xml
diff --git a/introspection/nm-checkpoint.xml b/introspection/org.freedesktop.NetworkManager.Checkpoint.xml
index 1c5050f2..1c5050f2 100644
--- a/introspection/nm-checkpoint.xml
+++ b/introspection/org.freedesktop.NetworkManager.Checkpoint.xml
diff --git a/introspection/nm-active-connection.xml b/introspection/org.freedesktop.NetworkManager.Connection.Active.xml
index 383ede34..383ede34 100644
--- a/introspection/nm-active-connection.xml
+++ b/introspection/org.freedesktop.NetworkManager.Connection.Active.xml
diff --git a/introspection/nm-dhcp4-config.xml b/introspection/org.freedesktop.NetworkManager.DHCP4Config.xml
index 5244bcaa..5244bcaa 100644
--- a/introspection/nm-dhcp4-config.xml
+++ b/introspection/org.freedesktop.NetworkManager.DHCP4Config.xml
diff --git a/introspection/nm-dhcp6-config.xml b/introspection/org.freedesktop.NetworkManager.DHCP6Config.xml
index 09e2ca86..09e2ca86 100644
--- a/introspection/nm-dhcp6-config.xml
+++ b/introspection/org.freedesktop.NetworkManager.DHCP6Config.xml
diff --git a/introspection/nm-device-adsl.xml b/introspection/org.freedesktop.NetworkManager.Device.Adsl.xml
index 0986f069..0986f069 100644
--- a/introspection/nm-device-adsl.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.Adsl.xml
diff --git a/introspection/nm-device-bt.xml b/introspection/org.freedesktop.NetworkManager.Device.Bluetooth.xml
index f891220d..f891220d 100644
--- a/introspection/nm-device-bt.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.Bluetooth.xml
diff --git a/introspection/nm-device-bond.xml b/introspection/org.freedesktop.NetworkManager.Device.Bond.xml
index e6288a15..e6288a15 100644
--- a/introspection/nm-device-bond.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.Bond.xml
diff --git a/introspection/nm-device-bridge.xml b/introspection/org.freedesktop.NetworkManager.Device.Bridge.xml
index a6c5710d..a6c5710d 100644
--- a/introspection/nm-device-bridge.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.Bridge.xml
diff --git a/introspection/nm-device-generic.xml b/introspection/org.freedesktop.NetworkManager.Device.Generic.xml
index 39aafc2c..39aafc2c 100644
--- a/introspection/nm-device-generic.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.Generic.xml
diff --git a/introspection/nm-device-ip-tunnel.xml b/introspection/org.freedesktop.NetworkManager.Device.IPTunnel.xml
index dda71e3e..dda71e3e 100644
--- a/introspection/nm-device-ip-tunnel.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.IPTunnel.xml
diff --git a/introspection/nm-device-infiniband.xml b/introspection/org.freedesktop.NetworkManager.Device.Infiniband.xml
index 34b5fadd..34b5fadd 100644
--- a/introspection/nm-device-infiniband.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.Infiniband.xml
diff --git a/introspection/org.freedesktop.NetworkManager.Device.Macsec.xml b/introspection/org.freedesktop.NetworkManager.Device.Macsec.xml
new file mode 100644
index 00000000..e67f937c
--- /dev/null
+++ b/introspection/org.freedesktop.NetworkManager.Device.Macsec.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<node name="/">
+  <interface name="org.freedesktop.NetworkManager.Device.Macsec">
+
+    <!--
+        Parent:
+
+        The object path of the parent device.
+    -->
+    <property name="Parent" type="o" access="read"/>
+
+    <!--
+        Sci:
+
+        The Secure Channel Identifier in use.
+    -->
+    <property name="Sci" type="t" access="read"/>
+
+    <!--
+        IcvLength:
+
+        The length of ICV (Integrity Check Value).
+    -->
+    <property name="IcvLength" type="y" access="read"/>
+
+    <!--
+        CipherSuite:
+
+        The set of cryptographic algorithms in use
+        (e.g. 0x0080020001000001 for GCM-AES-128).
+    -->
+    <property name="CipherSuite" type="t" access="read"/>
+
+    <!--
+        Window:
+
+        The size of the replay window.
+    -->
+    <property name="Window" type="u" access="read"/>
+
+    <!--
+        EncodingSa:
+
+        The value of the Association Number (0..3) for the Security
+        Association in use.
+    -->
+    <property name="EncodingSa" type="y" access="read"/>
+
+    <!--
+        Validation:
+
+        The validation mode for incoming packets (strict, check,
+        disabled).
+    -->
+    <property name="Validation" type="s" access="read"/>
+
+    <!--
+        Encrypt:
+
+        Whether encryption of transmitted frames is enabled.
+    -->
+    <property name="Encrypt" type="b" access="read"/>
+
+    <!--
+        Protect:
+
+        Whether protection of transmitted frames is enabled.
+    -->
+    <property name="Protect" type="b" access="read"/>
+
+    <!--
+        IncludeSci:
+
+        Whether the SCI is always included in SecTAG for transmitted
+        frames.
+
+    -->
+    <property name="IncludeSci" type="b" access="read"/>
+
+    <!--
+        Es:
+
+        Whether the ES (End station) bit is enabled in SecTAG for
+        transmitted frames.
+    -->
+    <property name="Es" type="b" access="read"/>
+
+    <!--
+        Scb:
+
+        Whether the SCB (Single Copy Broadcast) bit is enabled in
+        SecTAG for transmitted frames.
+    -->
+    <property name="Scb" type="b" access="read"/>
+
+    <!--
+        ReplayProtect:
+
+        Whether replay protection is enabled.
+    -->
+    <property name="ReplayProtect" type="b" access="read"/>
+
+    <!--
+        PropertiesChanged:
+        @properties: A dictionary mapping property names to variant boxed values
+
+        DEPRECATED. Use the standard "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" instead which exists since version NetworkManager 1.2.0.
+    -->
+    <signal name="PropertiesChanged">
+      <arg name="properties" type="a{sv}"/>
+    </signal>
+  </interface>
+</node>
diff --git a/introspection/nm-device-macvlan.xml b/introspection/org.freedesktop.NetworkManager.Device.Macvlan.xml
index e0b58ba4..e0b58ba4 100644
--- a/introspection/nm-device-macvlan.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.Macvlan.xml
diff --git a/introspection/nm-device-modem.xml b/introspection/org.freedesktop.NetworkManager.Device.Modem.xml
index 29eff682..29eff682 100644
--- a/introspection/nm-device-modem.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.Modem.xml
diff --git a/introspection/nm-device-olpc-mesh.xml b/introspection/org.freedesktop.NetworkManager.Device.OlpcMesh.xml
index 3d6162f3..3d6162f3 100644
--- a/introspection/nm-device-olpc-mesh.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.OlpcMesh.xml
diff --git a/introspection/nm-device-statistics.xml b/introspection/org.freedesktop.NetworkManager.Device.Statistics.xml
index 84c3b6fe..84c3b6fe 100644
--- a/introspection/nm-device-statistics.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.Statistics.xml
diff --git a/introspection/nm-device-team.xml b/introspection/org.freedesktop.NetworkManager.Device.Team.xml
index c7b50a38..c7b50a38 100644
--- a/introspection/nm-device-team.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.Team.xml
diff --git a/introspection/nm-device-tun.xml b/introspection/org.freedesktop.NetworkManager.Device.Tun.xml
index 68167cc5..68167cc5 100644
--- a/introspection/nm-device-tun.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.Tun.xml
diff --git a/introspection/nm-device-veth.xml b/introspection/org.freedesktop.NetworkManager.Device.Veth.xml
index 93c7c870..93c7c870 100644
--- a/introspection/nm-device-veth.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.Veth.xml
diff --git a/introspection/nm-device-vlan.xml b/introspection/org.freedesktop.NetworkManager.Device.Vlan.xml
index e5bf7c44..e5bf7c44 100644
--- a/introspection/nm-device-vlan.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.Vlan.xml
diff --git a/introspection/nm-device-vxlan.xml b/introspection/org.freedesktop.NetworkManager.Device.Vxlan.xml
index 8eae63c6..8eae63c6 100644
--- a/introspection/nm-device-vxlan.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.Vxlan.xml
diff --git a/introspection/nm-device-wimax.xml b/introspection/org.freedesktop.NetworkManager.Device.WiMax.xml
index 844856cc..844856cc 100644
--- a/introspection/nm-device-wimax.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.WiMax.xml
diff --git a/introspection/nm-device-ethernet.xml b/introspection/org.freedesktop.NetworkManager.Device.Wired.xml
index 3aa4540f..3aa4540f 100644
--- a/introspection/nm-device-ethernet.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.Wired.xml
diff --git a/introspection/nm-device-wifi.xml b/introspection/org.freedesktop.NetworkManager.Device.Wireless.xml
index 1973b417..1973b417 100644
--- a/introspection/nm-device-wifi.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.Wireless.xml
diff --git a/introspection/nm-device.xml b/introspection/org.freedesktop.NetworkManager.Device.xml
index d4535a84..d4535a84 100644
--- a/introspection/nm-device.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.xml
diff --git a/introspection/org.freedesktop.NetworkManager.DnsManager.xml b/introspection/org.freedesktop.NetworkManager.DnsManager.xml
new file mode 100644
index 00000000..3a0c757b
--- /dev/null
+++ b/introspection/org.freedesktop.NetworkManager.DnsManager.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<node name="/org/freedesktop/NetworkManager/DnsManager">
+
+  <!--
+      org.freedesktop.NetworkManager.DnsManager:
+
+      The interface contains DNS-related information.
+  -->
+  <interface name="org.freedesktop.NetworkManager.DnsManager">
+
+    <!--
+        Mode:
+
+        The current DNS processing mode.
+    -->
+    <property name="Mode" type="s" access="read"/>
+
+    <!--
+        RcManager:
+
+        The current resolv.conf management mode.
+    -->
+    <property name="RcManager" type="s" access="read"/>
+
+    <!--
+        Configuration:
+
+        The current DNS configuration represented as an array of
+        dictionaries.  Each dictionary has the "nameservers",
+        "priority" keys and, optionally, "interface" and "vpn".
+        "nameservers" is the list of DNS servers, "priority" their
+        relative priority, "interface" the interface on which these
+        servers are contacted, "vpn" a boolean telling whether the
+        configuration was obtained from a VPN connection.
+    -->
+    <property name="Configuration" type="aa{sv}" access="read"/>
+
+  </interface>
+</node>
diff --git a/introspection/nm-ip4-config.xml b/introspection/org.freedesktop.NetworkManager.IP4Config.xml
index 17f57bc6..17f57bc6 100644
--- a/introspection/nm-ip4-config.xml
+++ b/introspection/org.freedesktop.NetworkManager.IP4Config.xml
diff --git a/introspection/nm-ip6-config.xml b/introspection/org.freedesktop.NetworkManager.IP6Config.xml
index e5cab713..e5cab713 100644
--- a/introspection/nm-ip6-config.xml
+++ b/introspection/org.freedesktop.NetworkManager.IP6Config.xml
diff --git a/introspection/nm-ppp-manager.xml b/introspection/org.freedesktop.NetworkManager.PPP.xml
index e4c6a2c8..e4c6a2c8 100644
--- a/introspection/nm-ppp-manager.xml
+++ b/introspection/org.freedesktop.NetworkManager.PPP.xml
diff --git a/introspection/nm-secret-agent.xml b/introspection/org.freedesktop.NetworkManager.SecretAgent.xml
index 33296fb0..33296fb0 100644
--- a/introspection/nm-secret-agent.xml
+++ b/introspection/org.freedesktop.NetworkManager.SecretAgent.xml
diff --git a/introspection/nm-settings-connection.xml b/introspection/org.freedesktop.NetworkManager.Settings.Connection.xml
index cf33120c..cf33120c 100644
--- a/introspection/nm-settings-connection.xml
+++ b/introspection/org.freedesktop.NetworkManager.Settings.Connection.xml
diff --git a/introspection/nm-settings.xml b/introspection/org.freedesktop.NetworkManager.Settings.xml
index 32675e02..32675e02 100644
--- a/introspection/nm-settings.xml
+++ b/introspection/org.freedesktop.NetworkManager.Settings.xml
diff --git a/introspection/nm-vpn-connection.xml b/introspection/org.freedesktop.NetworkManager.VPN.Connection.xml
index 897cea0b..897cea0b 100644
--- a/introspection/nm-vpn-connection.xml
+++ b/introspection/org.freedesktop.NetworkManager.VPN.Connection.xml
diff --git a/introspection/nm-vpn-plugin.xml b/introspection/org.freedesktop.NetworkManager.VPN.Plugin.xml
index 7eed9721..7eed9721 100644
--- a/introspection/nm-vpn-plugin.xml
+++ b/introspection/org.freedesktop.NetworkManager.VPN.Plugin.xml
diff --git a/introspection/nm-wimax-nsp.xml b/introspection/org.freedesktop.NetworkManager.WiMax.Nsp.xml
index a7669279..a7669279 100644
--- a/introspection/nm-wimax-nsp.xml
+++ b/introspection/org.freedesktop.NetworkManager.WiMax.Nsp.xml
diff --git a/introspection/nm-manager.xml b/introspection/org.freedesktop.NetworkManager.xml
index cf178c39..1c299362 100644
--- a/introspection/nm-manager.xml
+++ b/introspection/org.freedesktop.NetworkManager.xml
@@ -209,7 +209,7 @@
     <!--
         CheckpointCreate:
 
-        @devices: a list of device paths for which a checkpoint should be created. An empty list means all managed devices.
+        @devices: a list of device paths for which a checkpoint should be created. An empty list means all devices.
         @rollback_timeout: the time in seconds until NetworkManager will automatically rollback to the checkpoint. Set to zero for infinite.
         @flags: optional flags that influence the creation.
         @checkpoint: on success, returns the path of the checkpoint.
@@ -381,6 +381,16 @@
     <property name="Version" type="s" access="read"/>
 
     <!--
+        Capabilities:
+
+        The current set of capabilities. See <link
+        linkend="NMCapability">NMCapability</link> for currently
+        defined capability numbers. The array is guaranteed to
+        be sorted in ascending order without duplicates.
+    -->
+    <property name="Capabilities" type="au" access="read"/>
+
+    <!--
         State:
 
         The overall state of the NetworkManager daemon.
author	Michael Biebl <biebl@debian.org>	2017-01-17 20:25:09 +0100
committer	Michael Biebl <biebl@debian.org>	2017-01-17 20:25:09 +0100
commit	58f8be580039b0575b197b9573a1c92745d96d30 (patch)
tree	2c226233f623a0dcb529be0eb8cdf97e4a2ae0c0 /introspection
parent	45cb5bb3c0e6edb887cf69b417fcaf7053814a9b (diff)