From 6e2b1883611b024527d7e8802cad0dac8ee43506 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@v3.sk>
Date: Tue, 5 Apr 2016 01:09:48 +0200
Subject: [PATCH] dbus: convert the annotations to gtk-doc blocks

---
 callouts/nm-dispatcher.xml                    |  106 +-
 introspection/nm-access-point.xml             |  178 ++-
 introspection/nm-active-connection.xml        |  256 ++--
 introspection/nm-agent-manager.xml            |   64 +-
 introspection/nm-device-adsl.xml              |   24 +-
 introspection/nm-device-bond.xml              |   49 +-
 introspection/nm-device-bridge.xml            |   49 +-
 introspection/nm-device-bt.xml                |   59 +-
 introspection/nm-device-ethernet.xml          |   63 +-
 introspection/nm-device-generic.xml           |   33 +-
 introspection/nm-device-infiniband.xml        |   36 +-
 introspection/nm-device-ip-tunnel.xml         |  131 +-
 introspection/nm-device-macvlan.xml           |   53 +-
 introspection/nm-device-modem.xml             |   76 +-
 introspection/nm-device-olpc-mesh.xml         |   50 +-
 introspection/nm-device-team.xml              |   49 +-
 introspection/nm-device-tun.xml               |   93 +-
 introspection/nm-device-veth.xml              |   26 +-
 introspection/nm-device-vlan.xml              |   54 +-
 introspection/nm-device-vxlan.xml             |  204 ++--
 introspection/nm-device-wifi.xml              |  234 ++--
 introspection/nm-device-wimax.xml             |  174 +--
 introspection/nm-device.xml                   | 1065 +++++------------
 introspection/nm-dhcp4-config.xml             |   36 +-
 introspection/nm-dhcp6-config.xml             |   36 +-
 introspection/nm-ip4-config.xml               |  151 ++-
 introspection/nm-ip6-config.xml               |  128 +-
 introspection/nm-manager.xml                  |  729 +++++------
 introspection/nm-secret-agent.xml             |  289 ++---
 introspection/nm-settings-connection.xml      |  223 ++--
 introspection/nm-settings.xml                 |  277 ++---
 introspection/nm-vpn-connection.xml           |  172 +--
 introspection/nm-vpn-plugin.xml               |  382 +++---
 introspection/nm-wimax-nsp.xml                |   65 +-
 src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.xml |   46 +-
 35 files changed, 2304 insertions(+), 3356 deletions(-)

diff --git a/callouts/nm-dispatcher.xml b/callouts/nm-dispatcher.xml
index e2e89a89ad..383374de3d 100644
--- a/callouts/nm-dispatcher.xml
+++ b/callouts/nm-dispatcher.xml
@@ -1,92 +1,52 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+<?xml version="1.0" encoding="UTF-8"?>
+<node name="/">
   <interface name="org.freedesktop.nm_dispatcher">
     <annotation name="org.gtk.GDBus.C.Name" value="Dispatcher"/>
 
+    <!--
+        Action:
+        @action: The action being performed.
+        @connection: The connection for which this action was triggered.
+        @connection_properties: Properties of the connection, including service and path.
+        @device_properties: Properties of the device, including type, path, interface, and state.
+        @device_ip4_config: Properties of the device's IPv4 configuration.
+        @device_ip6_config: Properties of the device's IPv6 configuration.
+        @device_dhcp4_config: Properties of the device's DHCPv4 configuration.
+        @device_dhcp6_config: Properties of the device's DHCPv6 configuration.
+        @vpn_ip_iface: VPN interface name.
+        @vpn_ip4_config: Properties of the VPN's IPv4 configuration.
+        @vpn_ip6_config: Properties of the VPN's IPv6 configuration.
+        @debug: Whether to log debug output.
+        @results: Results of dispatching operations. Each element of the returned array is a struct containing the path of an executed script (s), the result of running that script (u), and a description of the result (s).
+
+        INTERNAL; not public API. Perform an action.
+    -->
     <method name="Action">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        INTERNAL; not public API.  Perform an action.
-      " />
+      <arg name="action" type="s" direction="in"/>
 
-      <arg name="action" type="s" direction="in">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The action being performed.
-        " />
-      </arg>
+      <arg name="connection" type="a{sa{sv}}" direction="in"/>
 
-      <arg name="connection" type="a{sa{sv}}" direction="in">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The connection for which this action was triggered.
-        " />
-      </arg>
+      <arg name="connection_properties" type="a{sv}" direction="in"/>
 
-      <arg name="connection_properties" type="a{sv}" direction="in">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Properties of the connection, including service and path.
-        " />
-      </arg>
+      <arg name="device_properties" type="a{sv}" direction="in"/>
 
-      <arg name="device_properties" type="a{sv}" direction="in">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Properties of the device, including type, path, interface, and state.
-        " />
-      </arg>
+      <arg name="device_ip4_config" type="a{sv}" direction="in"/>
 
-      <arg name="device_ip4_config" type="a{sv}" direction="in">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Properties of the device's IPv4 configuration.
-        " />
-      </arg>
+      <arg name="device_ip6_config" type="a{sv}" direction="in"/>
 
-      <arg name="device_ip6_config" type="a{sv}" direction="in">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Properties of the device's IPv6 configuration.
-        " />
-      </arg>
+      <arg name="device_dhcp4_config" type="a{sv}" direction="in"/>
 
-      <arg name="device_dhcp4_config" type="a{sv}" direction="in">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Properties of the device's DHCPv4 configuration.
-        " />
-      </arg>
+      <arg name="device_dhcp6_config" type="a{sv}" direction="in"/>
 
-      <arg name="device_dhcp6_config" type="a{sv}" direction="in">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Properties of the device's DHCPv6 configuration.
-        " />
-      </arg>
+      <arg name="vpn_ip_iface" type="s" direction="in"/>
 
-      <arg name="vpn_ip_iface" type="s" direction="in">
-        <annotation name="org.gtk.GDBus.DocString" value="VPN interface name." />
-      </arg>
+      <arg name="vpn_ip4_config" type="a{sv}" direction="in"/>
 
-      <arg name="vpn_ip4_config" type="a{sv}" direction="in">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Properties of the VPN's IPv4 configuration.
-        " />
-      </arg>
+      <arg name="vpn_ip6_config" type="a{sv}" direction="in"/>
 
-      <arg name="vpn_ip6_config" type="a{sv}" direction="in">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Properties of the VPN's IPv6 configuration.
-        " />
-      </arg>
+      <arg name="debug" type="b" direction="in"/>
 
-      <arg name="debug" type="b" direction="in">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Whether to log debug output.
-        " />
-      </arg>
-
-      <arg name="results" type="a(sus)" direction="out">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Results of dispatching operations.  Each element of the returned
-          array is a struct containing the path of an executed script (s),
-          the result of running that script (u), and a description of the
-          result (s).
-        " />
-      </arg>
+      <arg name="results" type="a(sus)" direction="out"/>
 
     </method>
   </interface>
diff --git a/introspection/nm-access-point.xml b/introspection/nm-access-point.xml
index 603be7132e..2acd0e39af 100644
--- a/introspection/nm-access-point.xml
+++ b/introspection/nm-access-point.xml
@@ -1,103 +1,101 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+<?xml version="1.0" encoding="UTF-8"?>
+<node name="/">
   <interface name="org.freedesktop.NetworkManager.AccessPoint">
-    <property name="Flags" type="u" access="read" tp:type="NM_802_11_AP_FLAGS">
-      <annotation name="org.gtk.GDBus.DocString" value="Flags describing the capabilities of the access point." />
-    </property>
-    <property name="WpaFlags" type="u" access="read" tp:type="NM_802_11_AP_SEC">
-      <annotation name="org.gtk.GDBus.DocString" value="Flags describing the access point's capabilities according to WPA (Wifi Protected Access)." />
-    </property>
-    <property name="RsnFlags" type="u" access="read" tp:type="NM_802_11_AP_SEC">
-      <annotation name="org.gtk.GDBus.DocString" value="Flags describing the access point's capabilities according to the RSN (Robust Secure Network) protocol." />
-    </property>
+
+    <!--
+        Flags:
+
+        Flags describing the capabilities of the access point.
+
+        Returns: #NM80211ApFlags
+    -->
+    <property name="Flags" type="u" access="read"/>
+
+    <!--
+        WpaFlags:
+
+        Flags describing the access point's capabilities according to WPA (Wifi
+        Protected Access).
+
+        Returns: #NM80211ApSecurityFlags
+    -->
+    <property name="WpaFlags" type="u" access="read"/>
+
+    <!--
+        RsnFlags:
+
+        Flags describing the access point's capabilities according to the RSN
+        (Robust Secure Network) protocol.
+
+        Returns: #NM80211ApSecurityFlags
+    -->
+    <property name="RsnFlags" type="u" access="read"/>
+
+    <!--
+        Ssid:
+
+        The Service Set Identifier identifying the access point.
+    -->
     <property name="Ssid" type="ay" access="read">
       <!-- gdbus-codegen assumes that "ay" means "non-UTF-8 string" and
            won't deal with '\0' bytes correctly.
       -->
       <annotation name="org.gtk.GDBus.C.ForceGVariant" value="1"/>
-      <annotation name="org.gtk.GDBus.DocString" value="The Service Set Identifier identifying the access point." />
-    </property>
-    <property name="Frequency" type="u" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="The radio channel frequency in use by the access point, in MHz." />
-    </property>
-    <property name="HwAddress" type="s" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="The hardware address (BSSID) of the access point." />
-    </property>
+      </property>
+
+    <!--
+        Frequency:
+
+        The radio channel frequency in use by the access point, in MHz.
+    -->
+    <property name="Frequency" type="u" access="read"/>
+
+    <!--
+        HwAddress:
+
+        The hardware address (BSSID) of the access point.
+    -->
+    <property name="HwAddress" type="s" access="read"/>
+
+    <!--
+        Mode:
+
+        Describes the operating mode of the access point.
+
+        Returns: #NM80211Mode
+    -->
+    <property name="Mode" type="u" access="read"/>
+
+    <!--
+        MaxBitrate:
+
+        The maximum bitrate this access point is capable of, in kilobits/second
+        (Kb/s).
+    -->
+    <property name="MaxBitrate" type="u" access="read"/>
+
+    <!--
+        Strength:
+
+        The current signal quality of the access point, in percent.
+    -->
+    <property name="Strength" type="y" access="read"/>
+
+    <!--
+        LastSeen:
 
-    <property name="Mode" type="u" access="read" tp:type="NM_802_11_MODE">
-      <annotation name="org.gtk.GDBus.DocString" value="Describes the operating mode of the access point." />
-    </property>
-    <property name="MaxBitrate" type="u" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="The maximum bitrate this access point is capable of, in kilobits/second (Kb/s)." />
-    </property>
-    <property name="Strength" type="y" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="The current signal quality of the access point, in percent." />
-    </property>
-    <property name="LastSeen" type="i" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
         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.
-      " />
-    </property>
+        point was found in scan results. A value of -1 means the access point has
+        never been found in scan results.
+    -->
+    <property name="LastSeen" type="i" access="read"/>
 
+    <!--
+        PropertiesChanged:
+        @properties: A dictionary mapping property names to variant boxed values
+    -->
     <signal name="PropertiesChanged">
-        <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
-            <annotation name="org.gtk.GDBus.DocString" value="
-                A dictionary mapping property names to variant boxed values
-            " />
-        </arg>
+        <arg name="properties" type="a{sv}"/>
     </signal>
-    <tp:flags name="NM_802_11_AP_FLAGS" value-prefix="NM_802_11_AP_FLAGS" type="u">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        Flags describing the general capabilities of the access point.
-      " />
-      <tp:flag suffix="NONE" value="0x0">
-        <annotation name="org.gtk.GDBus.DocString" value="Null capability - says nothing about the access point." />
-      </tp:flag>
-      <tp:flag suffix="PRIVACY" value="0x1">
-        <annotation name="org.gtk.GDBus.DocString" value="Access point supports privacy measures." />
-      </tp:flag>
-    </tp:flags>
-    <tp:flags name="NM_802_11_AP_SEC" value-prefix="NM_802_11_AP_SEC" type="u">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        Flags describing the security capabilities of the access point.
-      " />
-      <tp:flag suffix="NONE" value="0x0">
-        <annotation name="org.gtk.GDBus.DocString" value="Null flag." />
-      </tp:flag>
-      <tp:flag suffix="PAIR_WEP40" value="0x1">
-        <annotation name="org.gtk.GDBus.DocString" value="Access point supports pairwise 40-bit WEP encryption." />
-      </tp:flag>
-      <tp:flag suffix="PAIR_WEP104" value="0x2">
-        <annotation name="org.gtk.GDBus.DocString" value="Access point supports pairwise 104-bit WEP encryption." />
-      </tp:flag>
-      <tp:flag suffix="PAIR_TKIP" value="0x4">
-        <annotation name="org.gtk.GDBus.DocString" value="Access point supports pairwise TKIP encryption." />
-      </tp:flag>
-      <tp:flag suffix="PAIR_CCMP" value="0x8">
-        <annotation name="org.gtk.GDBus.DocString" value="Access point supports pairwise CCMP encryption." />
-      </tp:flag>
-      <tp:flag suffix="GROUP_WEP40" value="0x10">
-        <annotation name="org.gtk.GDBus.DocString" value="Access point supports a group 40-bit WEP cipher." />
-      </tp:flag>
-      <tp:flag suffix="GROUP_WEP104" value="0x20">
-        <annotation name="org.gtk.GDBus.DocString" value="Access point supports a group 104-bit WEP cipher." />
-      </tp:flag>
-      <tp:flag suffix="GROUP_TKIP" value="0x40">
-        <annotation name="org.gtk.GDBus.DocString" value="Access point supports a group TKIP cipher." />
-      </tp:flag>
-      <tp:flag suffix="GROUP_CCMP" value="0x80">
-        <annotation name="org.gtk.GDBus.DocString" value="Access point supports a group CCMP cipher." />
-      </tp:flag>
-      <tp:flag suffix="KEY_MGMT_PSK" value="0x100">
-        <annotation name="org.gtk.GDBus.DocString" value="Access point supports PSK key management." />
-      </tp:flag>
-      <tp:flag suffix="KEY_MGMT_802_1X" value="0x200">
-        <annotation name="org.gtk.GDBus.DocString" value="Access point supports 802.1x key management." />
-      </tp:flag>
-    </tp:flags>
   </interface>
 </node>
-
diff --git a/introspection/nm-active-connection.xml b/introspection/nm-active-connection.xml
index 59bf78f4d0..343e6afed8 100644
--- a/introspection/nm-active-connection.xml
+++ b/introspection/nm-active-connection.xml
@@ -1,154 +1,156 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
+<node name="/">
 
-<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+  <!--
+      org.freedesktop.NetworkManager.Connection.Active:
+
+      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.
+  -->
   <interface name="org.freedesktop.NetworkManager.Connection.Active">
     <annotation name="org.gtk.GDBus.C.Name" value="ActiveConnection"/>
-    <annotation name="org.gtk.GDBus.DocString" value="
-      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
-      &quot;default&quot; 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.
-    " />
 
-    <property name="Connection" type="o" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
+    <!--
+        Connection:
+
         The path of the connection.
-      " />
-    </property>
-    <property name="SpecificObject" type="o" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        A specific object associated with the active connection.  This property
+    -->
+    <property name="Connection" type="o" access="read"/>
+
+    <!--
+        SpecificObject:
+
+        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.
-      " />
-    </property>
-    <property name="Id" type="s" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        The ID of the connection, provided as a convenience so that clients
-        do not have to retrieve all connection details.
-      " />
-    </property>
-    <property name="Uuid" type="s" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        The UUID of the connection, provided as a convenience so that clients
-        do not have to retrieve all connection details.
-      " />
-    </property>
-    <property name="Type" type="s" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        The type of the connection, provided as a convenience so that clients
-        do not have to retrieve all connection details.
-      " />
-    </property>
-    <property name="Devices" type="ao" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
+    -->
+    <property name="SpecificObject" type="o" access="read"/>
+
+    <!--
+        Id:
+
+        The ID of the connection, provided as a convenience so that clients do not
+        have to retrieve all connection details.
+    -->
+    <property name="Id" type="s" access="read"/>
+
+    <!--
+        Uuid:
+
+        The UUID of the connection, provided as a convenience so that clients do
+        not have to retrieve all connection details.
+    -->
+    <property name="Uuid" type="s" access="read"/>
+
+    <!--
+        Type:
+
+        The type of the connection, provided as a convenience so that clients do
+        not have to retrieve all connection details.
+    -->
+    <property name="Type" type="s" access="read"/>
+
+    <!--
+        Devices:
+
         Array of object paths representing devices which are part of this active
         connection.
-      " />
-    </property>
-    <property name="State" type="u" access="read" tp:type="NM_ACTIVE_CONNECTION_STATE">
-      <annotation name="org.gtk.GDBus.DocString" value="
+    -->
+    <property name="Devices" type="ao" access="read"/>
+
+    <!--
+        State:
+
         The state of this active connection.
-      " />
-    </property>
-    <property name="Default" type="b" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
+
+        Returns: #NMActiveConnectionState
+    -->
+    <property name="State" type="u" access="read"/>
+
+    <!--
+        Default:
+
         Whether this active connection is the default IPv4 connection, i.e.
         whether it currently owns the default IPv4 route.
-      " />
-    </property>
-    <property name="Ip4Config" type="o" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
+    -->
+    <property name="Default" type="b" access="read"/>
+
+    <!--
+        Ip4Config:
+
         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.
-      " />
-    </property>
-    <property name="Dhcp4Config" type="o" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        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.
-      " />
-    </property>
-    <property name="Default6" type="b" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
+    -->
+    <property name="Ip4Config" type="o" access="read"/>
+
+    <!--
+        Dhcp4Config:
+
+        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.
+    -->
+    <property name="Dhcp4Config" type="o" access="read"/>
+
+    <!--
+        Default6:
+
         Whether this active connection is the default IPv6 connection, i.e.
         whether it currently owns the default IPv6 route.
-      " />
-    </property>
-    <property name="Ip6Config" type="o" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
+    -->
+    <property name="Default6" type="b" access="read"/>
+
+    <!--
+        Ip6Config:
+
         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.
-      " />
-    </property>
-    <property name="Dhcp6Config" type="o" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        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.
-      " />
-    </property>
-    <property name="Vpn" type="b" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
+    -->
+    <property name="Ip6Config" type="o" access="read"/>
+
+    <!--
+        Dhcp6Config:
+
+        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.
+    -->
+    <property name="Dhcp6Config" type="o" access="read"/>
+
+    <!--
+        Vpn:
+
         Whether this active connection is also a VPN connection.
-      " />
-    </property>
-    <property name="Master" type="o" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
+    -->
+    <property name="Vpn" type="b" access="read"/>
+
+    <!--
+        Master:
+
         The path to the master device if the connection is a slave.
-      " />
-    </property>
+    -->
+    <property name="Master" type="o" access="read"/>
 
+    <!--
+        PropertiesChanged:
+        @properties: A dictionary mapping property names to variant boxed values
+    -->
     <signal name="PropertiesChanged">
-        <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
-            <annotation name="org.gtk.GDBus.DocString" value="
-                A dictionary mapping property names to variant boxed values
-            " />
-        </arg>
+        <arg name="properties" type="a{sv}"/>
     </signal>
-
-    <tp:enum name="NM_ACTIVE_CONNECTION_STATE" type="u">
-      <tp:enumvalue suffix="UNKNOWN" value="0">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The active connection is in an unknown state.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="ACTIVATING" value="1">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The connection is activating.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="ACTIVATED" value="2">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The connection is activated.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="DEACTIVATING" value="3">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The connection is being torn down and cleaned up.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="DEACTIVATED" value="4">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The connection is no longer active.
-        " />
-      </tp:enumvalue>
-    </tp:enum>
   </interface>
 </node>
-
diff --git a/introspection/nm-agent-manager.xml b/introspection/nm-agent-manager.xml
index 52460eeeec..183fb3b83b 100644
--- a/introspection/nm-agent-manager.xml
+++ b/introspection/nm-agent-manager.xml
@@ -1,50 +1,38 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<node name="/org/freedesktop/NetworkManager/AgentManager" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+<?xml version="1.0" encoding="UTF-8"?>
+<node name="/org/freedesktop/NetworkManager/AgentManager">
   <interface name="org.freedesktop.NetworkManager.AgentManager">
 
-    <method name="Register">
-      <annotation name="org.gtk.GDBus.DocString" value="
+    <!--
+        Register:
+        @identifier: 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).
+
         Called by secret Agents to register their ability to provide and save
         network secrets.
-      " />
-      <arg name="identifier" type="s" direction="in">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          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 &quot;[A-Z][a-z][0-9]_-.&quot; 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).
-        " />
-      </arg>
+    -->
+    <method name="Register">
+      <arg name="identifier" type="s" direction="in"/>
     </method>
 
-    <method name="RegisterWithCapabilities">
-      <annotation name="org.gtk.GDBus.DocString" value="
+    <!--
+        RegisterWithCapabilities:
+        @identifier: See the Register() method's identifier argument.
+        @capabilities: (#NMSecretAgentCapabilities) Indicates various agent capabilities to NetworkManager.
+
         Like Register() but indicates agent capabilities to NetworkManager.
-      " />
-      <arg name="identifier" type="s" direction="in">
-        <annotation name="org.gtk.GDBus.DocString" value="
-            See the Register() method's identifier argument.
-        " />
-      </arg>
-      <arg name="capabilities" type="u" direction="in" tp:type="NM_SECRET_AGENT_CAPABILITIES">
-        <annotation name="org.gtk.GDBus.DocString" value="
-            Indicates various agent capabilities to NetworkManager.
-        " />
-      </arg>
+    -->
+    <method name="RegisterWithCapabilities">
+      <arg name="identifier" type="s" direction="in"/>
+      <arg name="capabilities" type="u" direction="in"/>
     </method>
 
-    <method name="Unregister">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        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.
-      " />
-    </method>
+    <!--
+        Unregister:
+
+        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.
+    -->
+    <method name="Unregister"/>
 
   </interface>
 </node>
-
diff --git a/introspection/nm-device-adsl.xml b/introspection/nm-device-adsl.xml
index 68859d3bea..68802b62bb 100644
--- a/introspection/nm-device-adsl.xml
+++ b/introspection/nm-device-adsl.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+<?xml version="1.0" encoding="UTF-8"?>
+<node name="/">
   <interface name="org.freedesktop.NetworkManager.Device.Adsl">
 
+    <!--
+        PropertiesChanged:
+        @properties: A dictionary mapping property names to variant boxed values
+    -->
     <signal name="PropertiesChanged">
-        <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
-            <annotation name="org.gtk.GDBus.DocString" value="
-                A dictionary mapping property names to variant boxed values
-            " />
-        </arg>
+        <arg name="properties" type="a{sv}"/>
     </signal>
 
-    <property name="Carrier" type="b" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
+    <!--
+        Carrier:
+
         Indicates whether the physical carrier is found.
-      " />
-    </property>
+    -->
+    <property name="Carrier" type="b" access="read"/>
 
   </interface>
 </node>
diff --git a/introspection/nm-device-bond.xml b/introspection/nm-device-bond.xml
index 9bc21225a3..763978f613 100644
--- a/introspection/nm-device-bond.xml
+++ b/introspection/nm-device-bond.xml
@@ -1,33 +1,36 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+<?xml version="1.0" encoding="UTF-8"?>
+<node name="/">
   <interface name="org.freedesktop.NetworkManager.Device.Bond">
 
-    <property name="HwAddress" type="s" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
+    <!--
+        HwAddress:
+
         Hardware address of the device.
-      " />
-    </property>
+    -->
+    <property name="HwAddress" type="s" access="read"/>
 
-    <property name="Carrier" type="b" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        Indicates whether the physical carrier is found (e.g. whether a cable is plugged in or not).
-      " />
-    </property>
+    <!--
+        Carrier:
 
-    <property name="Slaves" type="ao" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        Array of object paths representing devices which are currently
-	slaved to this device.
-      " />
-    </property>
+        Indicates whether the physical carrier is found (e.g. whether a cable is
+        plugged in or not).
+    -->
+    <property name="Carrier" type="b" access="read"/>
 
+    <!--
+        Slaves:
+
+        Array of object paths representing devices which are currently slaved to
+        this device.
+    -->
+    <property name="Slaves" type="ao" access="read"/>
+
+    <!--
+        PropertiesChanged:
+        @properties: A dictionary mapping property names to variant boxed values
+    -->
     <signal name="PropertiesChanged">
-        <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
-            <annotation name="org.gtk.GDBus.DocString" value="
-                A dictionary mapping property names to variant boxed values
-            " />
-        </arg>
+        <arg name="properties" type="a{sv}"/>
     </signal>
 
   </interface>
diff --git a/introspection/nm-device-bridge.xml b/introspection/nm-device-bridge.xml
index 6cf99a10c2..4d8e9b4434 100644
--- a/introspection/nm-device-bridge.xml
+++ b/introspection/nm-device-bridge.xml
@@ -1,33 +1,36 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+<?xml version="1.0" encoding="UTF-8"?>
+<node name="/">
   <interface name="org.freedesktop.NetworkManager.Device.Bridge">
 
-    <property name="HwAddress" type="s" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
+    <!--
+        HwAddress:
+
         Hardware address of the device.
-      " />
-    </property>
+    -->
+    <property name="HwAddress" type="s" access="read"/>
 
-    <property name="Carrier" type="b" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        Indicates whether the physical carrier is found (e.g. whether a cable is plugged in or not).
-      " />
-    </property>
+    <!--
+        Carrier:
 
-    <property name="Slaves" type="ao" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        Array of object paths representing devices which are currently
-	slaved to this device.
-      " />
-    </property>
+        Indicates whether the physical carrier is found (e.g. whether a cable is
+        plugged in or not).
+    -->
+    <property name="Carrier" type="b" access="read"/>
 
+    <!--
+        Slaves:
+
+        Array of object paths representing devices which are currently slaved to
+        this device.
+    -->
+    <property name="Slaves" type="ao" access="read"/>
+
+    <!--
+        PropertiesChanged:
+        @properties: A dictionary mapping property names to variant boxed values
+    -->
     <signal name="PropertiesChanged">
-        <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
-            <annotation name="org.gtk.GDBus.DocString" value="
-                A dictionary mapping property names to variant boxed values
-            " />
-        </arg>
+        <arg name="properties" type="a{sv}"/>
     </signal>
 
   </interface>
diff --git a/introspection/nm-device-bt.xml b/introspection/nm-device-bt.xml
index 3b487158e8..80b9020f4f 100644
--- a/introspection/nm-device-bt.xml
+++ b/introspection/nm-device-bt.xml
@@ -1,48 +1,37 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+<?xml version="1.0" encoding="UTF-8"?>
+<node name="/">
   <interface name="org.freedesktop.NetworkManager.Device.Bluetooth">
 
-    <property name="HwAddress" type="s" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
+    <!--
+        HwAddress:
+
         Bluetooth hardware address of the device.
-      " />
-    </property>
+    -->
+    <property name="HwAddress" type="s" access="read"/>
+
+    <!--
+        Name:
 
-    <property name="Name" type="s" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
         Bluetooth name of the device.
-      " />
-    </property>
+    -->
+    <property name="Name" type="s" access="read"/>
+
+    <!--
+        BtCapabilities:
 
-    <property name="BtCapabilities" type="u" access="read" tp:type="NM_BT_CAPABILITIES">
-      <annotation name="org.gtk.GDBus.DocString" value="
         Bluetooth capabilities of the device (either DUN or NAP).
-      " />
-    </property>
 
+        Returns: #NMBluetoothCapabilities
+    -->
+    <property name="BtCapabilities" type="u" access="read"/>
+
+    <!--
+        PropertiesChanged:
+        @properties: A dictionary mapping property names to variant boxed values
+    -->
     <signal name="PropertiesChanged">
-        <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
-            <annotation name="org.gtk.GDBus.DocString" value="
-                A dictionary mapping property names to variant boxed values
-            " />
-        </arg>
+        <arg name="properties" type="a{sv}"/>
     </signal>
 
-    <tp:flags name="NM_BT_CAPABILITIES" value-prefix="NM_BT_CAPABILITY" type="u">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        Flags describing the capabilities of a Bluetooth device.
-      " />
-      <tp:flag suffix="NONE" value="0x0">
-        <annotation name="org.gtk.GDBus.DocString" value="The device has no recognized capabilities." />
-      </tp:flag>
-      <tp:flag suffix="DUN" value="0x1">
-        <annotation name="org.gtk.GDBus.DocString" value="The device supports Bluetooth Dial-Up Networking." />
-      </tp:flag>
-      <tp:flag suffix="PAN" value="0x2">
-        <annotation name="org.gtk.GDBus.DocString" value="The device supports Bluetooth Personal Area Networking." />
-      </tp:flag>
-    </tp:flags>
-
   </interface>
 </node>
diff --git a/introspection/nm-device-ethernet.xml b/introspection/nm-device-ethernet.xml
index 87b7f755d6..b5b374fa6f 100644
--- a/introspection/nm-device-ethernet.xml
+++ b/introspection/nm-device-ethernet.xml
@@ -1,45 +1,50 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+<?xml version="1.0" encoding="UTF-8"?>
+<node name="/">
   <interface name="org.freedesktop.NetworkManager.Device.Wired">
     <annotation name="org.gtk.GDBus.C.Name" value="DeviceEthernet"/>
 
-    <property name="HwAddress" type="s" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
+    <!--
+        HwAddress:
+
         Active hardware address of the device.
-      " />
-    </property>
+    -->
+    <property name="HwAddress" type="s" access="read"/>
+
+    <!--
+        PermHwAddress:
 
-    <property name="PermHwAddress" type="s" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
         Permanent hardware address of the device.
-      " />
-    </property>
+    -->
+    <property name="PermHwAddress" type="s" access="read"/>
+
+    <!--
+        Speed:
 
-    <property name="Speed" type="u" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
         Design speed of the device, in megabits/second (Mb/s).
-      " />
-    </property>
+    -->
+    <property name="Speed" type="u" access="read"/>
+
+    <!--
+        S390Subchannels:
 
-    <property name="S390Subchannels" type="as" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
         Array of S/390 subchannels for S/390 or z/Architecture devices.
-      " />
-    </property>
+    -->
+    <property name="S390Subchannels" type="as" access="read"/>
 
-    <property name="Carrier" type="b" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        Indicates whether the physical carrier is found (e.g. whether a cable is plugged in or not).
-      " />
-    </property>
+    <!--
+        Carrier:
 
+        Indicates whether the physical carrier is found (e.g. whether a cable is
+        plugged in or not).
+    -->
+    <property name="Carrier" type="b" access="read"/>
+
+    <!--
+        PropertiesChanged:
+        @properties: A dictionary mapping property names to variant boxed values
+    -->
     <signal name="PropertiesChanged">
-        <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
-            <annotation name="org.gtk.GDBus.DocString" value="
-                A dictionary mapping property names to variant boxed values
-            " />
-        </arg>
+        <arg name="properties" type="a{sv}"/>
     </signal>
 
   </interface>
diff --git a/introspection/nm-device-generic.xml b/introspection/nm-device-generic.xml
index 2f8fc7eead..0dd20b31a8 100644
--- a/introspection/nm-device-generic.xml
+++ b/introspection/nm-device-generic.xml
@@ -1,26 +1,27 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+<?xml version="1.0" encoding="UTF-8"?>
+<node name="/">
   <interface name="org.freedesktop.NetworkManager.Device.Generic">
 
-    <property name="HwAddress" type="s" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
+    <!--
+        HwAddress:
+
         Hardware address of the device.
-      " />
-    </property>
+    -->
+    <property name="HwAddress" type="s" access="read"/>
+
+    <!--
+        TypeDescription:
 
-    <property name="TypeDescription" type="s" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
         A (non-localized) description of the interface type, if known.
-      " />
-    </property>
+    -->
+    <property name="TypeDescription" type="s" access="read"/>
 
+    <!--
+        PropertiesChanged:
+        @properties: A dictionary mapping property names to variant boxed values
+    -->
     <signal name="PropertiesChanged">
-        <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
-            <annotation name="org.gtk.GDBus.DocString" value="
-                A dictionary mapping property names to variant boxed values
-            " />
-        </arg>
+        <arg name="properties" type="a{sv}"/>
     </signal>
 
   </interface>
diff --git a/introspection/nm-device-infiniband.xml b/introspection/nm-device-infiniband.xml
index 169c2c66cc..408f4b1e8c 100644
--- a/introspection/nm-device-infiniband.xml
+++ b/introspection/nm-device-infiniband.xml
@@ -1,26 +1,28 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+<?xml version="1.0" encoding="UTF-8"?>
+<node name="/">
   <interface name="org.freedesktop.NetworkManager.Device.Infiniband">
 
-    <property name="HwAddress" type="s" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
+    <!--
+        HwAddress:
+
         Hardware address of the device.
-      " />
-    </property>
+    -->
+    <property name="HwAddress" type="s" access="read"/>
 
-    <property name="Carrier" type="b" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        Indicates whether the physical carrier is found (e.g. whether a cable is plugged in or not).
-      " />
-    </property>
+    <!--
+        Carrier:
 
+        Indicates whether the physical carrier is found (e.g. whether a cable is
+        plugged in or not).
+    -->
+    <property name="Carrier" type="b" access="read"/>
+
+    <!--
+        PropertiesChanged:
+        @properties: A dictionary mapping property names to variant boxed values
+    -->
     <signal name="PropertiesChanged">
-        <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
-            <annotation name="org.gtk.GDBus.DocString" value="
-                A dictionary mapping property names to variant boxed values
-            " />
-        </arg>
+        <arg name="properties" type="a{sv}"/>
     </signal>
 
   </interface>
diff --git a/introspection/nm-device-ip-tunnel.xml b/introspection/nm-device-ip-tunnel.xml
index 3ca04ee66c..8fc622a5ca 100644
--- a/introspection/nm-device-ip-tunnel.xml
+++ b/introspection/nm-device-ip-tunnel.xml
@@ -1,85 +1,94 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+<?xml version="1.0" encoding="UTF-8"?>
+<node name="/">
   <interface name="org.freedesktop.NetworkManager.Device.IPTunnel">
 
-    <property name="Mode" type="u" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
+    <!--
+        Mode:
+
         The tunneling mode.
-      " />
-    </property>
+    -->
+    <property name="Mode" type="u" access="read"/>
+
+    <!--
+        Parent:
 
-    <property name="Parent" type="o" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
         The object path of the parent device.
-      " />
-    </property>
+    -->
+    <property name="Parent" type="o" access="read"/>
+
+    <!--
+        Local:
 
-    <property name="Local" type="s" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
         The local endpoint of the tunnel.
-      " />
-    </property>
+    -->
+    <property name="Local" type="s" access="read"/>
+
+    <!--
+        Remote:
 
-    <property name="Remote" type="s" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
         The remote endpoint of the tunnel.
-      " />
-    </property>
+    -->
+    <property name="Remote" type="s" access="read"/>
 
-    <property name="Ttl" type="y" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        The TTL assigned to tunneled packets. 0 is a special value
-        meaning that packets inherit the TTL value
-      " />
-    </property>
+    <!--
+        Ttl:
 
-    <property name="Tos" type="y" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        The type of service (IPv4) or traffic class (IPv6) assigned to
-        tunneled packets.
-      " />
-    </property>
+        The TTL assigned to tunneled packets. 0 is a special value meaning that
+        packets inherit the TTL value
+    -->
+    <property name="Ttl" type="y" access="read"/>
+
+    <!--
+        Tos:
+
+        The type of service (IPv4) or traffic class (IPv6) assigned to tunneled
+        packets.
+    -->
+    <property name="Tos" type="y" access="read"/>
+
+    <!--
+        PathMtuDiscovery:
 
-    <property name="PathMtuDiscovery" type="b" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
         Whether path MTU discovery is enabled on this tunnel.
-      " />
-    </property>
+    -->
+    <property name="PathMtuDiscovery" type="b" access="read"/>
+
+    <!--
+        InputKey:
 
-    <property name="InputKey" type="s" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
         The key used for incoming packets.
-      " />
-    </property>
+    -->
+    <property name="InputKey" type="s" access="read"/>
+
+    <!--
+        OutputKey:
 
-    <property name="OutputKey" type="s" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
         The key used for outgoing packets.
-      " />
-    </property>
+    -->
+    <property name="OutputKey" type="s" access="read"/>
 
-    <property name="EncapsulationLimit" type="y" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        How many additional levels of encapsulation are permitted to
-        be prepended to packets. This property applies only to IPv6
-        tunnels.
-      " />
-    </property>
+    <!--
+        EncapsulationLimit:
 
-    <property name="FlowLabel" type="u" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        The flow label to assign to tunnel packets. This property
-        applies only to IPv6 tunnels.
-      " />
-    </property>
+        How many additional levels of encapsulation are permitted to be prepended
+        to packets. This property applies only to IPv6 tunnels.
+    -->
+    <property name="EncapsulationLimit" type="y" access="read"/>
 
+    <!--
+        FlowLabel:
+
+        The flow label to assign to tunnel packets. This property applies only to
+        IPv6 tunnels.
+    -->
+    <property name="FlowLabel" type="u" access="read"/>
+
+    <!--
+        PropertiesChanged:
+        @properties: A dictionary mapping property names to variant boxed values
+    -->
     <signal name="PropertiesChanged">
-        <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
-            <annotation name="org.gtk.GDBus.DocString" value="
-                A dictionary mapping property names to variant boxed values
-            " />
-        </arg>
+        <arg name="properties" type="a{sv}"/>
     </signal>
 
   </interface>
diff --git a/introspection/nm-device-macvlan.xml b/introspection/nm-device-macvlan.xml
index d5d66068df..6881887760 100644
--- a/introspection/nm-device-macvlan.xml
+++ b/introspection/nm-device-macvlan.xml
@@ -1,38 +1,41 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+<?xml version="1.0" encoding="UTF-8"?>
+<node name="/">
   <interface name="org.freedesktop.NetworkManager.Device.Macvlan">
 
-    <property name="Parent" type="o" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
+    <!--
+        Parent:
+
         The object path of the parent device.
-      " />
-    </property>
+    -->
+    <property name="Parent" type="o" access="read"/>
 
-    <property name="Mode" type="s" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        The macvlan mode, one of &quot;private&quot;, &quot;vepa&quot;, &quot;bridge&quot;, or &quot;passthru&quot;.
-      " />
-    </property>
+    <!--
+        Mode:
+
+        The macvlan mode, one of "private", "vepa", "bridge", or "passthru".
+    -->
+    <property name="Mode" type="s" access="read"/>
+
+    <!--
+        NoPromisc:
 
-    <property name="NoPromisc" type="b" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
         Whether the device is blocked from going into promiscuous mode.
-      " />
-    </property>
+    -->
+    <property name="NoPromisc" type="b" access="read"/>
+
+    <!--
+        Tap:
 
-    <property name="Tap" type="b" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
         Whether the device is a macvtap.
-      " />
-    </property>
+    -->
+    <property name="Tap" type="b" access="read"/>
 
+    <!--
+        PropertiesChanged:
+        @properties: A dictionary mapping property names to variant boxed values
+    -->
     <signal name="PropertiesChanged">
-        <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
-            <annotation name="org.gtk.GDBus.DocString" value="
-                A dictionary mapping property names to variant boxed values
-            " />
-        </arg>
+        <arg name="properties" type="a{sv}"/>
     </signal>
 
   </interface>
diff --git a/introspection/nm-device-modem.xml b/introspection/nm-device-modem.xml
index 67742c463d..3478bb3c7c 100644
--- a/introspection/nm-device-modem.xml
+++ b/introspection/nm-device-modem.xml
@@ -1,64 +1,36 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+<?xml version="1.0" encoding="UTF-8"?>
+<node name="/">
   <interface name="org.freedesktop.NetworkManager.Device.Modem">
 
+    <!--
+        PropertiesChanged:
+        @properties: A dictionary mapping property names to variant boxed values
+    -->
     <signal name="PropertiesChanged">
-        <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
-            <annotation name="org.gtk.GDBus.DocString" value="
-                A dictionary mapping property names to variant boxed values
-            " />
-        </arg>
+        <arg name="properties" type="a{sv}"/>
     </signal>
 
-    <property name="ModemCapabilities" type="u" access="read" tp:type="NM_DEVICE_MODEM_CAPABILITIES">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        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.
-      " />
-    </property>
+    <!--
+        ModemCapabilities:
+
+        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.
+
+        Returns: #NMDeviceModemCapabilities
+    -->
+    <property name="ModemCapabilities" type="u" access="read"/>
+
+    <!--
+        CurrentCapabilities:
 
-    <property name="CurrentCapabilities" type="u" access="read" tp:type="NM_DEVICE_MODEM_CAPABILITIES">
-      <annotation name="org.gtk.GDBus.DocString" value="
         The generic family of access technologies the modem currently supports
         without a firmware reload or reinitialization.
-      " />
-    </property>
 
-    <tp:flags name="NM_DEVICE_MODEM_CAPABILITIES" value-prefix="NM_DEVICE_MODEM_CAPABILITY" type="u">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        Flags describing one or more of the general access technology families
-        that a modem device supports.
-      " />
-      <tp:flag suffix="NONE" value="0x0">
-        <annotation name="org.gtk.GDBus.DocString" value="Modem has no capabilties." />
-      </tp:flag>
-      <tp:flag suffix="POTS" value="0x1">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Modem supports the analog wired telephone network (ie 56k dialup) and
-          does not have wireless/cellular capabilities.
-        " />
-      </tp:flag>
-      <tp:flag suffix="CDMA_EVDO" value="0x2">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Modem supports at least one of CDMA 1xRTT, EVDO revision 0, EVDO
-          revision A, or EVDO revision B.
-        " />
-      </tp:flag>
-      <tp:flag suffix="GSM_UMTS" value="0x4">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Modem supports at least one of GSM, GPRS, EDGE, UMTS, HSDPA, HSUPA, or
-          HSPA+ packet switched data capability.
-        " />
-      </tp:flag>
-      <tp:flag suffix="LTE" value="0x8">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Modem has at LTE data capability.
-        " />
-      </tp:flag>
-    </tp:flags>
+        Returns: #NMDeviceModemCapabilities
+    -->
+    <property name="CurrentCapabilities" type="u" access="read"/>
 
   </interface>
 </node>
diff --git a/introspection/nm-device-olpc-mesh.xml b/introspection/nm-device-olpc-mesh.xml
index a92e73709a..effee008a1 100644
--- a/introspection/nm-device-olpc-mesh.xml
+++ b/introspection/nm-device-olpc-mesh.xml
@@ -1,34 +1,36 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+<?xml version="1.0" encoding="UTF-8"?>
+<node name="/">
   <interface name="org.freedesktop.NetworkManager.Device.OlpcMesh">
-    <property name="HwAddress" type="s" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
+
+    <!--
+        HwAddress:
+
         The hardware address of the device.
-      " />
-    </property>
+    -->
+    <property name="HwAddress" type="s" access="read"/>
+
+    <!--
+        Companion:
 
-    <property name="Companion" type="o" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
         The object path of the companion device.
-      " />
-    </property>
+    -->
+    <property name="Companion" type="o" access="read"/>
+
+    <!--
+        ActiveChannel:
 
-    <property name="ActiveChannel" type="u" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
         The currently active channel.
-      " />
-    </property>
+    -->
+    <property name="ActiveChannel" type="u" access="read"/>
 
+    <!--
+        PropertiesChanged:
+        @properties: A dictionary containing the FIXME: check changed parameters.
+
+        Emitted when the wireless device's properties changed.
+    -->
     <signal name="PropertiesChanged">
-        <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
-            <annotation name="org.gtk.GDBus.DocString" value="
-                A dictionary containing the FIXME: check changed parameters.
-            " />
-        </arg>
-        <annotation name="org.gtk.GDBus.DocString" value="
-            Emitted when the wireless device's properties changed.
-        " />
-    </signal>
+        <arg name="properties" type="a{sv}"/>
+        </signal>
   </interface>
 </node>
diff --git a/introspection/nm-device-team.xml b/introspection/nm-device-team.xml
index 982b767018..25079122cd 100644
--- a/introspection/nm-device-team.xml
+++ b/introspection/nm-device-team.xml
@@ -1,33 +1,36 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+<?xml version="1.0" encoding="UTF-8"?>
+<node name="/">
   <interface name="org.freedesktop.NetworkManager.Device.Team">
 
-    <property name="HwAddress" type="s" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
+    <!--
+        HwAddress:
+
         Hardware address of the device.
-      " />
-    </property>
+    -->
+    <property name="HwAddress" type="s" access="read"/>
 
-    <property name="Carrier" type="b" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        Indicates whether the physical carrier is found (e.g. whether a cable is plugged in or not).
-      " />
-    </property>
+    <!--
+        Carrier:
 
-    <property name="Slaves" type="ao" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        Array of object paths representing devices which are currently
-	slaved to this device.
-      " />
-    </property>
+        Indicates whether the physical carrier is found (e.g. whether a cable is
+        plugged in or not).
+    -->
+    <property name="Carrier" type="b" access="read"/>
 
+    <!--
+        Slaves:
+
+        Array of object paths representing devices which are currently slaved to
+        this device.
+    -->
+    <property name="Slaves" type="ao" access="read"/>
+
+    <!--
+        PropertiesChanged:
+        @properties: A dictionary mapping property names to variant boxed values
+    -->
     <signal name="PropertiesChanged">
-        <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
-            <annotation name="org.gtk.GDBus.DocString" value="
-                A dictionary mapping property names to variant boxed values
-            " />
-        </arg>
+        <arg name="properties" type="a{sv}"/>
     </signal>
 
   </interface>
diff --git a/introspection/nm-device-tun.xml b/introspection/nm-device-tun.xml
index 0f74cf8c41..e7ce36c224 100644
--- a/introspection/nm-device-tun.xml
+++ b/introspection/nm-device-tun.xml
@@ -1,60 +1,65 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+<?xml version="1.0" encoding="UTF-8"?>
+<node name="/">
   <interface name="org.freedesktop.NetworkManager.Device.Tun">
 
-    <property name="Owner" type="x" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
+    <!--
+        Owner:
+
         The uid of the tunnel owner, or -1 if it has no owner.
-      " />
-    </property>
+    -->
+    <property name="Owner" type="x" access="read"/>
+
+    <!--
+        Group:
 
-    <property name="Group" type="x" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
         The gid of the tunnel group, or -1 if it has no owner.
-      " />
-    </property>
+    -->
+    <property name="Group" type="x" access="read"/>
 
-    <property name="Mode" type="s" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        The tunnel mode, either &quot;tun&quot; or &quot;tap&quot;.
-      " />
-    </property>
+    <!--
+        Mode:
 
-    <property name="NoPi" type="b" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        The tunnel's &quot;TUN_NO_PI&quot; flag; true if no protocol info is
-	prepended to the tunnel packets.
-      " />
-    </property>
+        The tunnel mode, either "tun" or "tap".
+    -->
+    <property name="Mode" type="s" access="read"/>
 
-    <property name="VnetHdr" type="b" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        The tunnel's &quot;TUN_VNET_HDR&quot; flag; true if the tunnel packets
-	include a virtio network header.
-      " />
-    </property>
+    <!--
+        NoPi:
 
-    <property name="MultiQueue" type="b" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        The tunnel's &quot;TUN_TAP_MQ&quot; flag; true if callers can connect to
-        the tap device multiple times, for multiple send/receive
-        queues.
-      " />
-    </property>
+        The tunnel's "TUN_NO_PI" flag; true if no protocol info is prepended to
+        the tunnel packets.
+    -->
+    <property name="NoPi" type="b" access="read"/>
+
+    <!--
+        VnetHdr:
+
+        The tunnel's "TUN_VNET_HDR" flag; true if the tunnel packets include a
+        virtio network header.
+    -->
+    <property name="VnetHdr" type="b" access="read"/>
+
+    <!--
+        MultiQueue:
+
+        The tunnel's "TUN_TAP_MQ" flag; true if callers can connect to the tap
+        device multiple times, for multiple send/receive queues.
+    -->
+    <property name="MultiQueue" type="b" access="read"/>
+
+    <!--
+        HwAddress:
 
-    <property name="HwAddress" type="s" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
         Hardware address of the device.
-      " />
-    </property>
+    -->
+    <property name="HwAddress" type="s" access="read"/>
 
+    <!--
+        PropertiesChanged:
+        @properties: A dictionary mapping property names to variant boxed values
+    -->
     <signal name="PropertiesChanged">
-        <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
-            <annotation name="org.gtk.GDBus.DocString" value="
-                A dictionary mapping property names to variant boxed values
-            " />
-        </arg>
+        <arg name="properties" type="a{sv}"/>
     </signal>
 
   </interface>
diff --git a/introspection/nm-device-veth.xml b/introspection/nm-device-veth.xml
index a3cff6da08..5f85d48e04 100644
--- a/introspection/nm-device-veth.xml
+++ b/introspection/nm-device-veth.xml
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+<?xml version="1.0" encoding="UTF-8"?>
+<node name="/">
   <interface name="org.freedesktop.NetworkManager.Device.Veth">
 
-    <property name="Peer" type="o" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        The object path of the device's peer.
-      " />
-    </property>
+    <!--
+        Peer:
 
+        The object path of the device's peer.
+    -->
+    <property name="Peer" type="o" access="read"/>
+
+    <!--
+        PropertiesChanged:
+        @properties: A dictionary mapping property names to variant boxed values
+    -->
     <signal name="PropertiesChanged">
-        <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
-            <annotation name="org.gtk.GDBus.DocString" value="
-                A dictionary mapping property names to variant boxed values
-            " />
-        </arg>
+        <arg name="properties" type="a{sv}"/>
     </signal>
 
   </interface>
diff --git a/introspection/nm-device-vlan.xml b/introspection/nm-device-vlan.xml
index bac220e899..2260da546f 100644
--- a/introspection/nm-device-vlan.xml
+++ b/introspection/nm-device-vlan.xml
@@ -1,38 +1,42 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+<?xml version="1.0" encoding="UTF-8"?>
+<node name="/">
   <interface name="org.freedesktop.NetworkManager.Device.Vlan">
 
-    <property name="HwAddress" type="s" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
+    <!--
+        HwAddress:
+
         Hardware address of the device.
-      " />
-    </property>
+    -->
+    <property name="HwAddress" type="s" access="read"/>
 
-    <property name="Carrier" type="b" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        Indicates whether the physical carrier is found (e.g. whether a cable is plugged in or not).
-      " />
-    </property>
+    <!--
+        Carrier:
+
+        Indicates whether the physical carrier is found (e.g. whether a cable is
+        plugged in or not).
+    -->
+    <property name="Carrier" type="b" access="read"/>
+
+    <!--
+        Parent:
 
-    <property name="Parent" type="o" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
         Object path of the parent device of this VLAN device.
-      " />
-    </property>
+    -->
+    <property name="Parent" type="o" access="read"/>
+
+    <!--
+        VlanId:
 
-    <property name="VlanId" type="u" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
         The VLAN ID of this VLAN interface.
-      " />
-    </property>
+    -->
+    <property name="VlanId" type="u" access="read"/>
 
+    <!--
+        PropertiesChanged:
+        @properties: A dictionary mapping property names to variant boxed values
+    -->
     <signal name="PropertiesChanged">
-        <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
-            <annotation name="org.gtk.GDBus.DocString" value="
-                A dictionary mapping property names to variant boxed values
-            " />
-        </arg>
+        <arg name="properties" type="a{sv}"/>
     </signal>
 
   </interface>
diff --git a/introspection/nm-device-vxlan.xml b/introspection/nm-device-vxlan.xml
index de23020d5b..00bba5a444 100644
--- a/introspection/nm-device-vxlan.xml
+++ b/introspection/nm-device-vxlan.xml
@@ -1,127 +1,139 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+<?xml version="1.0" encoding="UTF-8"?>
+<node name="/">
   <interface name="org.freedesktop.NetworkManager.Device.Vxlan">
 
-    <property name="Parent" type="o" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        The object path of the parent device (if the VXLAN is not
-	purely internal to this host).
-      " />
-    </property>
+    <!--
+        Parent:
+
+        The object path of the parent device (if the VXLAN is not purely internal
+        to this host).
+    -->
+    <property name="Parent" type="o" access="read"/>
+
+    <!--
+        HwAddress:
 
-    <property name="HwAddress" type="s" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
         Hardware address of the device.
-      " />
-    </property>
+    -->
+    <property name="HwAddress" type="s" access="read"/>
+
+    <!--
+        Id:
 
-    <property name="Id" type="u" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
         The VXLAN Network Identifier (VNI).
-      " />
-    </property>
+    -->
+    <property name="Id" type="u" access="read"/>
+
+    <!--
+        Group:
 
-    <property name="Group" type="s" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
         The IP (v4 or v6) multicast group used to communicate with other physical
-	hosts on this VXLAN.
-      " />
-    </property>
+        hosts on this VXLAN.
+    -->
+    <property name="Group" type="s" access="read"/>
+
+    <!--
+        Local:
 
-    <property name="Local" type="s" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
         The local IPv4 or IPv6 address to use when sending VXLAN packets to other
-	physical hosts.
-      " />
-    </property>
+        physical hosts.
+    -->
+    <property name="Local" type="s" access="read"/>
 
-    <property name="Tos" type="y" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        The value to use in the IP ToS field for VXLAN packets sent to
-	other physical hosts.
-      " />
-    </property>
+    <!--
+        Tos:
 
-    <property name="Ttl" type="y" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        The value to use in the IP TTL field for VXLAN packets sent to
-	other physical hosts.
-      " />
-    </property>
+        The value to use in the IP ToS field for VXLAN packets sent to other
+        physical hosts.
+    -->
+    <property name="Tos" type="y" access="read"/>
+
+    <!--
+        Ttl:
+
+        The value to use in the IP TTL field for VXLAN packets sent to other
+        physical hosts.
+    -->
+    <property name="Ttl" type="y" access="read"/>
+
+    <!--
+        Learning:
 
-    <property name="Learning" type="b" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
         True if the VXLAN dynamically learns remote IP addresses.
-      " />
-    </property>
+    -->
+    <property name="Learning" type="b" access="read"/>
 
-    <property name="Ageing" type="u" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        The interval in seconds at which the kernel purges stale
-        cached addresses.
-      " />
-    </property>
+    <!--
+        Ageing:
 
-    <property name="Limit" type="u" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        The maximum number of entries that can be added to the VXLAN's
-	forwarding table.
-      " />
-    </property>
+        The interval in seconds at which the kernel purges stale cached addresses.
+    -->
+    <property name="Ageing" type="u" access="read"/>
+
+    <!--
+        Limit:
+
+        The maximum number of entries that can be added to the VXLAN's forwarding
+        table.
+    -->
+    <property name="Limit" type="u" access="read"/>
+
+    <!--
+        DstPort:
 
-    <property name="DstPort" type="q" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
         Destination port for outgoing VXLAN packets.
-      " />
-    </property>
+    -->
+    <property name="DstPort" type="q" access="read"/>
+
+    <!--
+        SrcPortMin:
 
-    <property name="SrcPortMin" type="q" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
         The lowest source port number to use for outgoing VXLAN packets.
-      " />
-    </property>
+    -->
+    <property name="SrcPortMin" type="q" access="read"/>
+
+    <!--
+        SrcPortMax:
 
-    <property name="SrcPortMax" type="q" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
         The highest source port number to use for outgoing VXLAN packets.
-      " />
-    </property>
+    -->
+    <property name="SrcPortMax" type="q" access="read"/>
 
-    <property name="Proxy" type="b" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        True if the VXLAN is implementing DOVE ARP proxying for remote
-        clients.
-      " />
-    </property>
+    <!--
+        Proxy:
 
-    <property name="Rsc" type="b" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        True if the VXLAN is implementing DOVE route short-circuiting
-	of known remote IP addresses.
-      " />
-    </property>
+        True if the VXLAN is implementing DOVE ARP proxying for remote clients.
+    -->
+    <property name="Proxy" type="b" access="read"/>
 
-    <property name="L2miss" type="b" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        True if the VXLAN will emit netlink notifications of L2 switch
-        misses.
-      " />
-    </property>
+    <!--
+        Rsc:
 
-    <property name="L3miss" type="b" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        True if the VXLAN will emit netlink notifications of L3 switch
-        misses.
-      " />
-    </property>
+        True if the VXLAN is implementing DOVE route short-circuiting of known
+        remote IP addresses.
+    -->
+    <property name="Rsc" type="b" access="read"/>
 
+    <!--
+        L2miss:
+
+        True if the VXLAN will emit netlink notifications of L2 switch misses.
+    -->
+    <property name="L2miss" type="b" access="read"/>
+
+    <!--
+        L3miss:
+
+        True if the VXLAN will emit netlink notifications of L3 switch misses.
+    -->
+    <property name="L3miss" type="b" access="read"/>
+
+    <!--
+        PropertiesChanged:
+        @properties: A dictionary mapping property names to variant boxed values
+    -->
     <signal name="PropertiesChanged">
-        <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
-            <annotation name="org.gtk.GDBus.DocString" value="
-                A dictionary mapping property names to variant boxed values
-            " />
-        </arg>
+        <arg name="properties" type="a{sv}"/>
     </signal>
 
   </interface>
diff --git a/introspection/nm-device-wifi.xml b/introspection/nm-device-wifi.xml
index 2ece0ef0ae..d72e376a22 100644
--- a/introspection/nm-device-wifi.xml
+++ b/introspection/nm-device-wifi.xml
@@ -1,170 +1,124 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+<?xml version="1.0" encoding="UTF-8"?>
+<node name="/">
   <interface name="org.freedesktop.NetworkManager.Device.Wireless">
     <annotation name="org.gtk.GDBus.C.Name" value="DeviceWifi"/>
 
-    <method name="GetAccessPoints">
-      <arg name="access_points" type="ao" direction="out">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          List of access point object paths.
-        " />
-      </arg>
-      <annotation name="org.gtk.GDBus.DocString" value="
-        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
+    <!--
+        GetAccessPoints:
+        @access_points: List of access point object paths.
+
+        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.
-      " />
-    </method>
+    -->
+    <method name="GetAccessPoints">
+      <arg name="access_points" type="ao" direction="out"/>
+      </method>
 
+    <!--
+        GetAllAccessPoints:
+        @access_points: List of access point object paths.
+
+        Get the list of all access points visible to this device, including hidden
+        ones for which the SSID is not yet known.
+    -->
     <method name="GetAllAccessPoints">
-      <arg name="access_points" type="ao" direction="out">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          List of access point object paths.
-        " />
-      </arg>
-      <annotation name="org.gtk.GDBus.DocString" value="
-        Get the list of all access points visible to this device, including
-        hidden ones for which the SSID is not yet known.
-      " />
-    </method>
+      <arg name="access_points" type="ao" direction="out"/>
+      </method>
+
+    <!--
+        RequestScan:
+        @options: Options of scan. Currently 'ssids' option with value of "aay" type is supported.
 
-    <method name="RequestScan">
-      <arg name="options" type="a{sv}" direction="in">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Options of scan.
-          Currently 'ssids' option with value of &quot;aay&quot; type is supported.
-        " />
-      </arg>
-      <annotation name="org.gtk.GDBus.DocString" value="
         Request the device to scan
-      " />
-    </method>
+    -->
+    <method name="RequestScan">
+      <arg name="options" type="a{sv}" direction="in"/>
+      </method>
+
+    <!--
+        HwAddress:
 
-    <property name="HwAddress" type="s" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
         The active hardware address of the device.
-      " />
-    </property>
+    -->
+    <property name="HwAddress" type="s" access="read"/>
+
+    <!--
+        PermHwAddress:
 
-    <property name="PermHwAddress" type="s" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
         The permanent hardware address of the device.
-      " />
-    </property>
+    -->
+    <property name="PermHwAddress" type="s" access="read"/>
+
+    <!--
+        Mode:
 
-    <property name="Mode" type="u" access="read" tp:type="NM_802_11_MODE">
-      <annotation name="org.gtk.GDBus.DocString" value="
         The operating mode of the wireless device.
-      " />
-    </property>
 
-    <property name="Bitrate" type="u" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        The bit rate currently used by the wireless device, in kilobits/second (Kb/s).
-      " />
-    </property>
+        Returns: #NM80211Mode
+    -->
+    <property name="Mode" type="u" access="read"/>
+
+    <!--
+        Bitrate:
+
+        The bit rate currently used by the wireless device, in kilobits/second
+        (Kb/s).
+    -->
+    <property name="Bitrate" type="u" access="read"/>
+
+    <!--
+        AccessPoints:
 
-    <property name="AccessPoints" type="ao" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
         List of object paths of access point visible to this wireless device.
-      " />
-    </property>
+    -->
+    <property name="AccessPoints" type="ao" access="read"/>
+
+    <!--
+        ActiveAccessPoint:
 
-    <property name="ActiveAccessPoint" type="o" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
         Object path of the access point currently used by the wireless device.
-      " />
-    </property>
+    -->
+    <property name="ActiveAccessPoint" type="o" access="read"/>
+
+    <!--
+        WirelessCapabilities:
 
-    <property name="WirelessCapabilities" type="u" access="read" tp:type="NM_802_11_DEVICE_CAP">
-      <annotation name="org.gtk.GDBus.DocString" value="
         The capabilities of the wireless device.
-      " />
-    </property>
 
+        Returns: #NMDeviceWifiCapabilities
+    -->
+    <property name="WirelessCapabilities" type="u" access="read"/>
+
+    <!--
+        PropertiesChanged:
+        @properties: A dictionary containing the FIXME: check changed parameters.
+
+        Emitted when the wireless device's properties changed.
+    -->
     <signal name="PropertiesChanged">
-        <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
-            <annotation name="org.gtk.GDBus.DocString" value="
-                A dictionary containing the FIXME: check changed parameters.
-            " />
-        </arg>
-        <annotation name="org.gtk.GDBus.DocString" value="
-            Emitted when the wireless device's properties changed.
-        " />
-    </signal>
+        <arg name="properties" type="a{sv}"/>
+        </signal>
 
+    <!--
+        AccessPointAdded:
+        @access_point: The object path of the newly found access point.
+
+        Emitted when a new access point is found by the device.
+    -->
     <signal name="AccessPointAdded">
-        <arg name="access_point" type="o">
-            <annotation name="org.gtk.GDBus.DocString" value="
-                The object path of the newly found access point.
-            " />
-        </arg>
-        <annotation name="org.gtk.GDBus.DocString" value="
-            Emitted when a new access point is found by the device.
-        " />
-    </signal>
+        <arg name="access_point" type="o"/>
+        </signal>
 
+    <!--
+        AccessPointRemoved:
+        @access_point: The object path of the access point that has disappeared.
+
+        Emitted when an access point disappears from view of the device.
+    -->
     <signal name="AccessPointRemoved">
-      <arg name="access_point" type="o">
-            <annotation name="org.gtk.GDBus.DocString" value="
-                The object path of the access point that has disappeared.
-            " />
-        </arg>
-        <annotation name="org.gtk.GDBus.DocString" value="
-            Emitted when an access point disappears from view of the device.
-        " />
-    </signal>
-
-    <tp:flags name="NM_802_11_DEVICE_CAP" type="u">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        Flags describing the capabilities of a wireless device.
-      " />
-      <tp:flag suffix="NONE" value="0x0">
-        <annotation name="org.gtk.GDBus.DocString" value="Null capability - syntactic sugar for no capabilities supported.  Do not AND this with other capabilities!" />
-      </tp:flag>
-      <tp:flag suffix="CIPHER_WEP40" value="0x1">
-        <annotation name="org.gtk.GDBus.DocString" value="The device supports the 40-bit WEP cipher." />
-      </tp:flag>
-      <tp:flag suffix="CIPHER_WEP104" value="0x2">
-        <annotation name="org.gtk.GDBus.DocString" value="The device supports the 104-bit WEP cipher." />
-      </tp:flag>
-      <tp:flag suffix="CIPHER_TKIP" value="0x4">
-        <annotation name="org.gtk.GDBus.DocString" value="The device supports the TKIP cipher." />
-      </tp:flag>
-      <tp:flag suffix="CIPHER_CCMP" value="0x8">
-        <annotation name="org.gtk.GDBus.DocString" value="The device supports the CCMP cipher." />
-      </tp:flag>
-      <tp:flag suffix="WPA" value="0x10">
-        <annotation name="org.gtk.GDBus.DocString" value="The device supports the WPA encryption/authentication protocol." />
-      </tp:flag>
-      <tp:flag suffix="RSN" value="0x20">
-        <annotation name="org.gtk.GDBus.DocString" value="The device supports the RSN encryption/authentication protocol." />
-      </tp:flag>
-      <tp:flag suffix="AP" value="0x40">
-        <annotation name="org.gtk.GDBus.DocString" value="The device supports Access Point mode." />
-      </tp:flag>
-      <tp:flag suffix="ADHOC" value="0x80">
-        <annotation name="org.gtk.GDBus.DocString" value="The device supports Ad-Hoc mode." />
-      </tp:flag>
-      <tp:flag suffix="FREQ_VALID" value="0x100">
-	<annotation name="org.gtk.GDBus.DocString" value="
-	  The device properly reports information about supported
-	  frequencies and thus both NM_802_11_DEVICE_CAP_FREQ_2GHZ and
-	  NM_802_11_DEVICE_CAP_FREQ_5GHZ are valid.
-	" />
-      </tp:flag>
-      <tp:flag suffix="FREQ_2GHZ" value="0x200">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The device supports 2.4GHz frequencies.
-        " />
-      </tp:flag>
-      <tp:flag suffix="FREQ_5GHZ" value="0x400">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The device supports 5GHz frequencies.
-        " />
-      </tp:flag>
-    </tp:flags>
+      <arg name="access_point" type="o"/>
+        </signal>
   </interface>
 </node>
diff --git a/introspection/nm-device-wimax.xml b/introspection/nm-device-wimax.xml
index e790e4fc62..2d5e3e1fe6 100644
--- a/introspection/nm-device-wimax.xml
+++ b/introspection/nm-device-wimax.xml
@@ -1,109 +1,113 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+<?xml version="1.0" encoding="UTF-8"?>
+<node name="/">
   <interface name="org.freedesktop.NetworkManager.Device.WiMax">
-    <method name="GetNspList">
-      <arg name="nsps" type="ao" direction="out">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          List of NSP object paths
-        " />
-      </arg>
-      <annotation name="org.gtk.GDBus.DocString" value="
-        Get the list of NSPs visible to this device.
-      " />
-    </method>
 
-    <property name="Nsps" type="ao" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
+    <!--
+        GetNspList:
+        @nsps: List of NSP object paths
+
+        Get the list of NSPs visible to this device.
+    -->
+    <method name="GetNspList">
+      <arg name="nsps" type="ao" direction="out"/>
+      </method>
+
+    <!--
+        Nsps:
+
         List of object paths of Network Service Providers (NSPs) visible to this
         WiMAX device.
-      " />
-    </property>
+    -->
+    <property name="Nsps" type="ao" access="read"/>
+
+    <!--
+        HwAddress:
 
-    <property name="HwAddress" type="s" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
         Hardware address of the device.
-      " />
-    </property>
+    -->
+    <property name="HwAddress" type="s" access="read"/>
+
+    <!--
+        CenterFrequency:
 
-    <property name="CenterFrequency" type="u" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
         Center frequency (in KHz) of the radio channel the device is using to
-        communicate with the network when connected.  Has no meaning when the
+        communicate with the network when connected. Has no meaning when the
         device is not connected.
-      " />
-    </property>
+    -->
+    <property name="CenterFrequency" type="u" access="read"/>
 
-    <property name="Rssi" type="i" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        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.
-      " />
-    </property>
+    <!--
+        Rssi:
 
-    <property name="Cinr" type="i" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        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
+        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.
+    -->
+    <property name="Rssi" type="i" access="read"/>
+
+    <!--
+        Cinr:
+
+        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.
+    -->
+    <property name="Cinr" type="i" access="read"/>
+
+    <!--
+        TxPower:
+
+        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.
+    -->
+    <property name="TxPower" type="i" access="read"/>
+
+    <!--
+        Bsid:
+
+        The ID of the serving base station as received from the network. Has no
         meaning when the device is not connected.
-      " />
-    </property>
+    -->
+    <property name="Bsid" type="s" access="read"/>
 
-    <property name="TxPower" type="i" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        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.
-      " />
-    </property>
+    <!--
+        ActiveNsp:
 
-    <property name="Bsid" type="s" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        The ID of the serving base station as received from the network.  Has
-        no meaning when the device is not connected.
-      " />
-    </property>
-
-    <property name="ActiveNsp" type="o" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
         Object path of the NSP currently used by the WiMax device.
-      " />
-    </property>
+    -->
+    <property name="ActiveNsp" type="o" access="read"/>
 
+    <!--
+        PropertiesChanged:
+        @properties: A dictionary mapping property names to variant boxed values.
+
+        Emitted when the WiMax device's properties changed.
+    -->
     <signal name="PropertiesChanged">
-        <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
-            <annotation name="org.gtk.GDBus.DocString" value="
-                A dictionary mapping property names to variant boxed values.
-            " />
-        </arg>
-        <annotation name="org.gtk.GDBus.DocString" value="
-            Emitted when the WiMax device's properties changed.
-        " />
-    </signal>
+        <arg name="properties" type="a{sv}"/>
+        </signal>
 
+    <!--
+        NspAdded:
+        @nsp: The object path of the newly found NSP.
+
+        Emitted when a new NSP is found by the device.
+    -->
     <signal name="NspAdded">
-        <arg name="nsp" type="o">
-            <annotation name="org.gtk.GDBus.DocString" value="
-                The object path of the newly found NSP.
-            " />
-        </arg>
-        <annotation name="org.gtk.GDBus.DocString" value="
-            Emitted when a new NSP is found by the device.
-        " />
-    </signal>
+        <arg name="nsp" type="o"/>
+        </signal>
 
+    <!--
+        NspRemoved:
+        @nsp: The object path of the NSP that has disappeared.
+
+        Emitted when an NSP disappears from view of the device.
+    -->
     <signal name="NspRemoved">
-      <arg name="nsp" type="o">
-            <annotation name="org.gtk.GDBus.DocString" value="
-                The object path of the NSP that has disappeared.
-            " />
-        </arg>
-        <annotation name="org.gtk.GDBus.DocString" value="
-            Emitted when an NSP disappears from view of the device.
-        " />
-    </signal>
+      <arg name="nsp" type="o"/>
+        </signal>
 
   </interface>
 </node>
diff --git a/introspection/nm-device.xml b/introspection/nm-device.xml
index 321cace13b..08bec827fe 100644
--- a/introspection/nm-device.xml
+++ b/introspection/nm-device.xml
@@ -1,798 +1,321 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+<?xml version="1.0" encoding="UTF-8"?>
+<node name="/">
   <interface name="org.freedesktop.NetworkManager.Device">
-    <property name="Udi" type="s" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        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.
-      " />
-    </property>
-    <property name="Interface" type="s" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
+
+    <!--
+        Udi:
+
+        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.
+    -->
+    <property name="Udi" type="s" access="read"/>
+
+    <!--
+        Interface:
+
         The name of the device's control (and often data) interface.
-      " />
-    </property>
-    <property name="IpInterface" type="s" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        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.
-      " />
-    </property>
-    <property name="Driver" type="s" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
+    -->
+    <property name="Interface" type="s" access="read"/>
+
+    <!--
+        IpInterface:
+
+        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.
+    -->
+    <property name="IpInterface" type="s" access="read"/>
+
+    <!--
+        Driver:
+
         The driver handling the device.
-      " />
-    </property>
-    <property name="DriverVersion" type="s" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
+    -->
+    <property name="Driver" type="s" access="read"/>
+
+    <!--
+        DriverVersion:
+
         The version of the driver handling the device.
-      " />
-    </property>
-    <property name="FirmwareVersion" type="s" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
+    -->
+    <property name="DriverVersion" type="s" access="read"/>
+
+    <!--
+        FirmwareVersion:
+
         The firmware version for the device.
-      " />
-    </property>
-    <property name="Capabilities" type="u" access="read" tp:type="NM_DEVICE_CAP">
-      <annotation name="org.gtk.GDBus.DocString" value="
+    -->
+    <property name="FirmwareVersion" type="s" access="read"/>
+
+    <!--
+        Capabilities:
+
         Flags describing the capabilities of the device.
-      " />
-    </property>
-    <property name="Ip4Address" type="u" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        DEPRECATED; use the 'Addresses' property of the 'Ip4Config' object instead.
-      " />
-    </property>
-    <property name="State" type="u" access="read" tp:type="NM_DEVICE_STATE">
-      <annotation name="org.gtk.GDBus.DocString" value="
+
+        Returns: #NMDeviceCapabilities
+    -->
+    <property name="Capabilities" type="u" access="read"/>
+
+    <!--
+        Ip4Address:
+
+        DEPRECATED; use the 'Addresses' property of the 'Ip4Config' object
+        instead.
+    -->
+    <property name="Ip4Address" type="u" access="read"/>
+
+    <!--
+        State:
+
         The current state of the device.
-      " />
-    </property>
-    <property name="StateReason" type="(uu)" access="read" tp:type="NM_DEVICE_STATE_REASON_STRUCT">
-      <annotation name="org.gtk.GDBus.DocString" value="
+
+        Returns: #NMDeviceState
+    -->
+    <property name="State" type="u" access="read"/>
+
+    <!--
+        StateReason:
+
         The current state and reason for changing to that state.
-      " />
-    </property>
-    <property name="ActiveConnection" type="o" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        Object path of an ActiveConnection object that &quot;owns&quot; this device during
-        activation.  The ActiveConnection object tracks the life-cycle of a
+
+        Returns: #NMDeviceStateReasonStruct
+    -->
+    <property name="StateReason" type="(uu)" access="read"/>
+
+    <!--
+        ActiveConnection:
+
+        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.
-      " />
-    </property>
-    <property name="Ip4Config" type="o" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        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.
-      " />
-    </property>
-    <property name="Dhcp4Config" type="o" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        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.
-      " />
-    </property>
-    <property name="Ip6Config" type="o" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        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.
-      " />
-    </property>
-    <property name="Dhcp6Config" type="o" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        Object path of the Dhcp6Config object describing the DHCP options
-        returned by the DHCP server.  Only valid when the device is in the
+    -->
+    <property name="ActiveConnection" type="o" access="read"/>
+
+    <!--
+        Ip4Config:
+
+        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.
+    -->
+    <property name="Ip4Config" type="o" access="read"/>
+
+    <!--
+        Dhcp4Config:
+
+        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.
-      " />
-    </property>
-    <property name="Managed" type="b" access="readwrite">
-      <annotation name="org.gtk.GDBus.DocString" value="
+    -->
+    <property name="Dhcp4Config" type="o" access="read"/>
+
+    <!--
+        Ip6Config:
+
+        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.
+    -->
+    <property name="Ip6Config" type="o" access="read"/>
+
+    <!--
+        Dhcp6Config:
+
+        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.
+    -->
+    <property name="Dhcp6Config" type="o" access="read"/>
+
+    <!--
+        Managed:
+
         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.
-      " />
-    </property>
-    <property name="Autoconnect" type="b" access="readwrite">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        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.
-      " />
-    </property>
-    <property name="FirmwareMissing" type="b" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        If TRUE, indicates the device is likely missing firmware necessary for
-        its operation.
-      " />
-    </property>
-    <property name="NmPluginMissing" type="b" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
+        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.
+    -->
+    <property name="Managed" type="b" access="readwrite"/>
+
+    <!--
+        Autoconnect:
+
+        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.
+    -->
+    <property name="Autoconnect" type="b" access="readwrite"/>
+
+    <!--
+        FirmwareMissing:
+
+        If TRUE, indicates the device is likely missing firmware necessary for its
+        operation.
+    -->
+    <property name="FirmwareMissing" type="b" access="read"/>
+
+    <!--
+        NmPluginMissing:
+
         If TRUE, indicates the NetworkManager plugin for the device is likely
         missing or misconfigured.
-      " />
-    </property>
-    <property name="DeviceType" type="u" access="read" tp:type="NM_DEVICE_TYPE">
-      <annotation name="org.gtk.GDBus.DocString" value="
+    -->
+    <property name="NmPluginMissing" type="b" access="read"/>
+
+    <!--
+        DeviceType:
+
         The general type of the network device; ie Ethernet, WiFi, etc.
-      " />
-    </property>
-    <property name="AvailableConnections" type="ao" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        An array of object paths of every configured connection that is currently 'available' through this device.
-      " />
-    </property>
-    <property name="PhysicalPortId" type="s" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        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.
-      " />
-    </property>
-    <property name="Mtu" type="u" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
+
+        Returns: #NMDeviceType
+    -->
+    <property name="DeviceType" type="u" access="read"/>
+
+    <!--
+        AvailableConnections:
+
+        An array of object paths of every configured connection that is currently
+        'available' through this device.
+    -->
+    <property name="AvailableConnections" type="ao" access="read"/>
+
+    <!--
+        PhysicalPortId:
+
+        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.
+    -->
+    <property name="PhysicalPortId" type="s" access="read"/>
+
+    <!--
+        Mtu:
+
         The device MTU (maximum transmission unit).
-      " />
-    </property>
-    <property name="Metered" type="u" access="read" tp:type="NM_METERED">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        Whether the amount of traffic flowing through the device is
-        subject to limitations, for example set by service providers.
-      " />
-    </property>
-    <property name="LldpNeighbors" type="aa{sv}" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        Array of LLDP neighbors; each element is a dictionary mapping
-        LLDP TLV names to variant boxed values.
-      " />
-    </property>
-    <property name="Real" type="b" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        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.
-      " />
-    </property>
+    -->
+    <property name="Mtu" type="u" access="read"/>
 
+    <!--
+        Metered:
+
+        Whether the amount of traffic flowing through the device is subject to
+        limitations, for example set by service providers.
+
+        Returns: #NMMetered
+    -->
+    <property name="Metered" type="u" access="read"/>
+
+    <!--
+        LldpNeighbors:
+
+        Array of LLDP neighbors; each element is a dictionary mapping LLDP TLV
+        names to variant boxed values.
+    -->
+    <property name="LldpNeighbors" type="aa{sv}" access="read"/>
+
+    <!--
+        Real:
+
+        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.
+    -->
+    <property name="Real" type="b" access="read"/>
+
+    <!--
+        Reapply:
+        @connection: 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.
+        @version_id: 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.
+        @flags: 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.
+
+        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.
+    -->
     <method name="Reapply">
-      <arg name="connection" type="a{sa{sv}}" direction="in">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          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.
-        " />
-      </arg>
-      <arg name="version_id" type="t" direction="in">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          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.
-        " />
-      </arg>
-      <arg name="flags" type="u" direction="in">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          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.
-        " />
-      </arg>
-      <annotation name="org.gtk.GDBus.DocString" value="
-        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.
-      " />
-    </method>
+      <arg name="connection" type="a{sa{sv}}" direction="in"/>
+      <arg name="version_id" type="t" direction="in"/>
+      <arg name="flags" type="u" direction="in"/>
+      </method>
 
+    <!--
+        GetAppliedConnection:
+        @flags: 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.
+        @connection: The effective connection settings that the connection has currently applied.
+        @version_id: 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.
+
+        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.
+    -->
     <method name="GetAppliedConnection">
-      <arg name="flags" type="u" direction="in">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          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.
-        " />
-      </arg>
-      <arg name="connection" type="a{sa{sv}}" direction="out">
-        <annotation name="org.gtk.GDBus.DocString" value="
-            The effective connection settings that the connection has currently applied.
-        " />
-      </arg>
-      <arg name="version_id" type="t" direction="out">
-        <annotation name="org.gtk.GDBus.DocString" value="
-            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.
-        " />
-      </arg>
-      <annotation name="org.gtk.GDBus.DocString" value="
-        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.
-      " />
-    </method>
+      <arg name="flags" type="u" direction="in"/>
+      <arg name="connection" type="a{sa{sv}}" direction="out"/>
+      <arg name="version_id" type="t" direction="out"/>
+      </method>
 
-    <method name="Disconnect">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        Disconnects a device and prevents the device from automatically activating further connections without user intervention.
-      " />
-    </method>
+    <!--
+        Disconnect:
 
-    <method name="Delete">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        Deletes a software device from NetworkManager and removes the interface from the system.
-        The method returns an error when called for a hardware device.
-      " />
-    </method>
+        Disconnects a device and prevents the device from automatically activating
+        further connections without user intervention.
+    -->
+    <method name="Disconnect"/>
 
+    <!--
+        Delete:
+
+        Deletes a software device from NetworkManager and removes the interface
+        from the system. The method returns an error when called for a hardware
+        device.
+    -->
+    <method name="Delete"/>
+
+    <!--
+        StateChanged:
+        @new_state: (#NMDeviceState) The new state of the device.
+        @old_state: (#NMDeviceState) The previous state of the device.
+        @reason: (#NMDeviceStateReason) A reason for the state transition.
+    -->
     <signal name="StateChanged">
-      <arg name="new_state" type="u" tp:type="NM_DEVICE_STATE">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The new state of the device.
-        " />
-      </arg>
-      <arg name="old_state" type="u" tp:type="NM_DEVICE_STATE">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The previous state of the device.
-        " />
-      </arg>
-      <arg name="reason" type="u" tp:type="NM_DEVICE_STATE_REASON">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          A reason for the state transition.
-        " />
-      </arg>
+      <arg name="new_state" type="u"/>
+      <arg name="old_state" type="u"/>
+      <arg name="reason" type="u"/>
     </signal>
-
-    <tp:enum name="NM_DEVICE_STATE" type="u">
-      <tp:enumvalue suffix="UNKNOWN" value="0">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The device is in an unknown state.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="UNMANAGED" value="10">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The device is recognized but not managed by NetworkManager.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="UNAVAILABLE" value="20">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The device cannot be used (carrier off, rfkill, etc).
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="DISCONNECTED" value="30">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The device is not connected.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="PREPARE" value="40">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The device is preparing to connect.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="CONFIG" value="50">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The device is being configured.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="NEED_AUTH" value="60">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The device is awaiting secrets necessary to continue connection.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="IP_CONFIG" value="70">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The IP settings of the device are being requested and configured.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="IP_CHECK" value="80">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The device's IP connectivity ability is being determined.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="SECONDARIES" value="90">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The device is waiting for secondary connections to be activated.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="ACTIVATED" value="100">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The device is active.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="DEACTIVATING" value="110">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The device's network connection is being torn down.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="FAILED" value="120">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The device is in a failure state following an attempt to activate it.
-        " />
-      </tp:enumvalue>
-    </tp:enum>
-
-    <tp:enum name="NM_DEVICE_TYPE" type="u">
-      <tp:enumvalue suffix="UNKNOWN" value="0">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The device type is unknown.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="ETHERNET" value="1">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The device is wired Ethernet device.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="WIFI" value="2">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The device is an 802.11 WiFi device.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="UNUSED1" value="3">
-        <annotation name="org.gtk.GDBus.DocString" value="Unused" />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="UNUSED2" value="4">
-        <annotation name="org.gtk.GDBus.DocString" value="Unused" />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="BT" value="5">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The device is Bluetooth device that provides PAN or DUN capabilities.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="OLPC_MESH" value="6">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The device is an OLPC mesh networking device.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="WIMAX" value="7">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The device is an 802.16e Mobile WiMAX device.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="MODEM" value="8">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The device is a modem supporting one or more of analog telephone,
-          CDMA/EVDO, GSM/UMTS/HSPA, or LTE standards to access a cellular or
-          wireline data network.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="INFINIBAND" value="9">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The device is an IP-capable InfiniBand interface.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="BOND" value="10">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The device is a bond master interface.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="VLAN" value="11">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The device is a VLAN interface.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="ADSL" value="12">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The device is an ADSL device supporting PPPoE and PPPoATM protocols.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="BRIDGE" value="13">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The device is a bridge interface.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="GENERIC" value="14">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The device is a generic interface type unrecognized by NetworkManager.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="TEAM" value="15">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The device is a team master interface.
-        " />
-      </tp:enumvalue>
-    </tp:enum>
-
-    <tp:flags name="NM_DEVICE_CAP" value-prefix="NM_DEVICE_CAP" type="u">
-      <tp:flag suffix="NONE" value="0x0">
-        <annotation name="org.gtk.GDBus.DocString" value="Null capability." />
-      </tp:flag>
-      <tp:flag suffix="NM_SUPPORTED" value="0x1">
-        <annotation name="org.gtk.GDBus.DocString" value="The device is supported by NetworkManager." />
-      </tp:flag>
-      <tp:flag suffix="CARRIER_DETECT" value="0x2">
-        <annotation name="org.gtk.GDBus.DocString" value="The device supports carrier detection." />
-      </tp:flag>
-    </tp:flags>
-
-    <tp:enum name="NM_DEVICE_STATE_REASON" type="u">
-      <tp:enumvalue suffix="UNKNOWN" value="0">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The reason for the device state change is unknown.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="NONE" value="1">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The state change is normal.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="NOW_MANAGED" value="2">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The device is now managed.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="NOW_UNMANAGED" value="3">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The device is no longer managed.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="CONFIG_FAILED" value="4">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The device could not be readied for configuration.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="CONFIG_UNAVAILABLE" value="5">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          IP configuration could not be reserved (no available address, timeout, etc).
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="CONFIG_EXPIRED" value="6">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The IP configuration is no longer valid.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="NO_SECRETS" value="7">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Secrets were required, but not provided.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="SUPPLICANT_DISCONNECT" value="8">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The 802.1X supplicant disconnected from the access point or authentication server.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="SUPPLICANT_CONFIG_FAILED" value="9">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Configuration of the 802.1X supplicant failed.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="SUPPLICANT_FAILED" value="10">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The 802.1X supplicant quit or failed unexpectedly.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="SUPPLICANT_TIMEOUT" value="11">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The 802.1X supplicant took too long to authenticate.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="PPP_START_FAILED" value="12">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The PPP service failed to start within the allowed time.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="PPP_DISCONNECT" value="13">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The PPP service disconnected unexpectedly.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="PPP_FAILED" value="14">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The PPP service quit or failed unexpectedly.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="DHCP_START_FAILED" value="15">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The DHCP service failed to start within the allowed time.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="DHCP_ERROR" value="16">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The DHCP service reported an unexpected error.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="DHCP_FAILED" value="17">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The DHCP service quit or failed unexpectedly.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="SHARED_START_FAILED" value="18">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The shared connection service failed to start.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="SHARED_FAILED" value="19">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The shared connection service quit or failed unexpectedly.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="AUTOIP_START_FAILED" value="20">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The AutoIP service failed to start.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="AUTOIP_ERROR" value="21">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The AutoIP service reported an unexpected error.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="AUTOIP_FAILED" value="22">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The AutoIP service quit or failed unexpectedly.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="MODEM_BUSY" value="23">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Dialing failed because the line was busy.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="MODEM_NO_DIAL_TONE" value="24">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Dialing failed because there was no dial tone.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="MODEM_NO_CARRIER" value="25">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Dialing failed because there was carrier.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="MODEM_DIAL_TIMEOUT" value="26">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Dialing timed out.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="MODEM_DIAL_FAILED" value="27">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Dialing failed.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="MODEM_INIT_FAILED" value="28">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Modem initialization failed.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="GSM_APN_FAILED" value="29">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Failed to select the specified GSM APN.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="GSM_REGISTRATION_NOT_SEARCHING" value="30">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Not searching for networks.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="GSM_REGISTRATION_DENIED" value="31">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Network registration was denied.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="GSM_REGISTRATION_TIMEOUT" value="32">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Network registration timed out.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="GSM_REGISTRATION_FAILED" value="33">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Failed to register with the requested GSM network.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="GSM_PIN_CHECK_FAILED" value="34">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          PIN check failed.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="FIRMWARE_MISSING" value="35">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Necessary firmware for the device may be missing.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="REMOVED" value="36">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The device was removed.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="SLEEPING" value="37">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          NetworkManager went to sleep.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="CONNECTION_REMOVED" value="38">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The device's active connection was removed or disappeared.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="USER_REQUESTED" value="39">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          A user or client requested the disconnection.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="CARRIER" value="40">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The device's carrier/link changed.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="CONNECTION_ASSUMED" value="41">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The device's existing connection was assumed.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="SUPPLICANT_AVAILABLE" value="42">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The 802.1x supplicant is now available.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="MODEM_NOT_FOUND" value="43">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The modem could not be found.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="BT_FAILED" value="44">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The Bluetooth connection timed out or failed.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="GSM_SIM_NOT_INSERTED" value="45">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          GSM Modem's SIM Card not inserted.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="GSM_SIM_PIN_REQUIRED" value="46">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          GSM Modem's SIM Pin required.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="GSM_SIM_PUK_REQUIRED" value="47">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          GSM Modem's SIM Puk required.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="GSM_SIM_WRONG" value="48">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          GSM Modem's SIM wrong
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="INFINIBAND_MODE" value="49">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          InfiniBand device does not support connected mode.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="DEPENDENCY_FAILED" value="50">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          A dependency of the connection failed.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="BR2684_FAILED" value="51">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Problem with the RFC 2684 Ethernet over ADSL bridge.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="MODEM_MANAGER_UNAVAILABLE" value="52">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          ModemManager was not running or quit unexpectedly.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="SSID_NOT_FOUND" value="53">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The 802.11 Wi-Fi network could not be found.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="SECONDARY_CONNECTION_FAILED" value="54">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          A secondary connection of the base connection failed.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="DCB_FCOE_FAILED" value="55">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          DCB or FCoE setup failed.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="TEAMD_CONTROL_FAILED" value="56">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          teamd control failed.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="MODEM_FAILED" value="57">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Modem failed or no longer available.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="MODEM_AVAILABLE" value="58">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Modem now ready and available.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="SIM_PIN_INCORRECT" value="59">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The SIM PIN was incorrect.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="NEW_ACTIVATION" value="60">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          A new connection activation was enqueued.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="PARENT_CHANGED" value="61">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The device's parent changed.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="PARENT_MANAGED_CHANGED" value="62">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The device parent's management changed.
-        " />
-      </tp:enumvalue>
-    </tp:enum>
-
-    <tp:enum name="NM_METERED" type="u">
-      <tp:enumvalue suffix="UNKNOWN" value="0">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The device metered status is unknown.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="YES" value="1">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The device is metered and the value was statically set.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="NO" value="2">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The device is not metered and the value was statically set.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="GUESS_YES" value="3">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The device is metered and the value was guessed.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="GUESS_NO" value="4">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The device is not metered and the value was guessed.
-        " />
-      </tp:enumvalue>
-    </tp:enum>
-
-    <tp:struct name="NM_DEVICE_STATE_REASON_STRUCT">
-      <tp:member type="u" name="state" tp:type="NM_DEVICE_STATE">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The device state.
-        " />
-      </tp:member>
-      <tp:member type="u" name="reason" tp:type="NM_DEVICE_STATE_REASON">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The reason for originally changing to the device state.
-        " />
-      </tp:member>
-    </tp:struct>
   </interface>
 </node>
diff --git a/introspection/nm-dhcp4-config.xml b/introspection/nm-dhcp4-config.xml
index bca34fc53f..1811613e95 100644
--- a/introspection/nm-dhcp4-config.xml
+++ b/introspection/nm-dhcp4-config.xml
@@ -1,21 +1,27 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
+<node name="/">
 
-<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
-    <interface name="org.freedesktop.NetworkManager.DHCP4Config">
+  <!--
+      org.freedesktop.NetworkManager.DHCP4Config:
+
+      Options and configuration returned by the IPv4 DHCP server.
+  -->
+  <interface name="org.freedesktop.NetworkManager.DHCP4Config">
         <annotation name="org.gtk.GDBus.C.Name" value="Dhcp4Config"/>
-        <annotation name="org.gtk.GDBus.DocString" value="
-            Options and configuration returned by the IPv4 DHCP server.
-        " />
-        <property name="Options" type="a{sv}" access="read">
-            <annotation name="org.gtk.GDBus.DocString" value="Configuration options returned by a DHCP server, if any." />
-        </property>
 
-        <signal name="PropertiesChanged">
-            <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
-                <annotation name="org.gtk.GDBus.DocString" value="
-                    A dictionary mapping property names to variant boxed values
-                " />
-            </arg>
+    <!--
+        Options:
+
+        Configuration options returned by a DHCP server, if any.
+    -->
+    <property name="Options" type="a{sv}" access="read"/>
+
+    <!--
+        PropertiesChanged:
+        @properties: A dictionary mapping property names to variant boxed values
+    -->
+    <signal name="PropertiesChanged">
+            <arg name="properties" type="a{sv}"/>
         </signal>
     </interface>
 </node>
diff --git a/introspection/nm-dhcp6-config.xml b/introspection/nm-dhcp6-config.xml
index 84e13b77b1..d6a6417797 100644
--- a/introspection/nm-dhcp6-config.xml
+++ b/introspection/nm-dhcp6-config.xml
@@ -1,21 +1,27 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
+<node name="/">
 
-<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
-    <interface name="org.freedesktop.NetworkManager.DHCP6Config">
+  <!--
+      org.freedesktop.NetworkManager.DHCP6Config:
+
+      Options and configuration returned by the IPv6 DHCP server.
+  -->
+  <interface name="org.freedesktop.NetworkManager.DHCP6Config">
         <annotation name="org.gtk.GDBus.C.Name" value="Dhcp6Config"/>
-        <annotation name="org.gtk.GDBus.DocString" value="
-            Options and configuration returned by the IPv6 DHCP server.
-        " />
-        <property name="Options" type="a{sv}" access="read">
-            <annotation name="org.gtk.GDBus.DocString" value="Configuration options returned by a DHCP server, if any." />
-        </property>
 
-        <signal name="PropertiesChanged">
-            <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
-                <annotation name="org.gtk.GDBus.DocString" value="
-                    A dictionary mapping property names to variant boxed values
-                " />
-            </arg>
+    <!--
+        Options:
+
+        Configuration options returned by a DHCP server, if any.
+    -->
+    <property name="Options" type="a{sv}" access="read"/>
+
+    <!--
+        PropertiesChanged:
+        @properties: A dictionary mapping property names to variant boxed values
+    -->
+    <signal name="PropertiesChanged">
+            <arg name="properties" type="a{sv}"/>
         </signal>
     </interface>
 </node>
diff --git a/introspection/nm-ip4-config.xml b/introspection/nm-ip4-config.xml
index 111e1acf78..c2a0f06828 100644
--- a/introspection/nm-ip4-config.xml
+++ b/introspection/nm-ip4-config.xml
@@ -1,72 +1,95 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+<?xml version="1.0" encoding="UTF-8"?>
+<node name="/">
   <interface name="org.freedesktop.NetworkManager.IP4Config">
-    <property name="Addresses" type="aau" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
-	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
-      " />
-    </property>
-    <property name="AddressData" type="aa{sv}" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
-	Array of IP address data objects. All addresses will include
-	&quot;address&quot; (an IP address string), and &quot;prefix&quot; (a uint). Some
-	addresses may include additional attributes.
-      " />
-    </property>
-    <property name="Gateway" type="s" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="The gateway in use." />
-    </property>
-    <property name="Routes" type="aau" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
-	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), ...]
+    <!--
+        Addresses:
 
-	Deprecated: use RouteData
-      " />
-    </property>
-    <property name="RouteData" type="aa{sv}" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
-	Array of IP route data objects. All routes will include &quot;dest&quot;
-	(an IP address string) and &quot;prefix&quot; (a uint). Some routes may
-	include &quot;next-hop&quot; (an IP address string), &quot;metric&quot; (a uint),
-	and additional attributes.
-      " />
-    </property>
-    <property name="Nameservers" type="au" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="The nameservers in use." />
-    </property>
-    <property name="Domains" type="as" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="A list of domains this address belongs to." />
-    </property>
-    <property name="Searches" type="as" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="A list of dns searches." />
-    </property>
-    <property name="DnsOptions" type="as" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
-	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.
-      " />
-    </property>
-    <property name="WinsServers" type="au" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="The Windows Internet Name Service servers associated with the connection.  Each address is in network byte order." />
-    </property>
+        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
+    -->
+    <property name="Addresses" type="aau" access="read"/>
 
+    <!--
+        AddressData:
+
+        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.
+    -->
+    <property name="AddressData" type="aa{sv}" access="read"/>
+
+    <!--
+        Gateway:
+
+        The gateway in use.
+    -->
+    <property name="Gateway" type="s" access="read"/>
+
+    <!--
+        Routes:
+
+        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
+    -->
+    <property name="Routes" type="aau" access="read"/>
+
+    <!--
+        RouteData:
+
+        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.
+    -->
+    <property name="RouteData" type="aa{sv}" access="read"/>
+
+    <!--
+        Nameservers:
+
+        The nameservers in use.
+    -->
+    <property name="Nameservers" type="au" access="read"/>
+
+    <!--
+        Domains:
+
+        A list of domains this address belongs to.
+    -->
+    <property name="Domains" type="as" access="read"/>
+
+    <!--
+        Searches:
+
+        A list of dns searches.
+    -->
+    <property name="Searches" type="as" access="read"/>
+
+    <!--
+        DnsOptions:
+
+        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.
+    -->
+    <property name="DnsOptions" type="as" access="read"/>
+
+    <!--
+        WinsServers:
+
+        The Windows Internet Name Service servers associated with the connection.
+        Each address is in network byte order.
+    -->
+    <property name="WinsServers" type="au" access="read"/>
+
+    <!--
+        PropertiesChanged:
+        @properties: A dictionary mapping property names to variant boxed values
+    -->
     <signal name="PropertiesChanged">
-      <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          A dictionary mapping property names to variant boxed values
-        " />
-      </arg>
+      <arg name="properties" type="a{sv}"/>
     </signal>
   </interface>
 </node>
-
diff --git a/introspection/nm-ip6-config.xml b/introspection/nm-ip6-config.xml
index 0cca33c4f9..606761dd2b 100644
--- a/introspection/nm-ip6-config.xml
+++ b/introspection/nm-ip6-config.xml
@@ -1,67 +1,87 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+<?xml version="1.0" encoding="UTF-8"?>
+<node name="/">
   <interface name="org.freedesktop.NetworkManager.IP6Config">
-    <property name="Addresses" type="a(ayuay)" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
-	Array of tuples of IPv6 address/prefix/gateway.
 
-	Deprecated: use AddressData and Gateway.
-      " />
-    </property>
-    <property name="AddressData" type="aa{sv}" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
-	Array of IP address data objects. All addresses will include
-	&quot;address&quot; (an IP address string), and &quot;prefix&quot; (a uint). Some
-	addresses may include additional attributes.
-      " />
-    </property>
-    <property name="Gateway" type="s" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="The gateway in use." />
-    </property>
-    <property name="Routes" type="a(ayuayu)" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
-	Tuples of IPv6 route/prefix/next-hop/metric.
+    <!--
+        Addresses:
 
-	Deprecated: use RouteData
-      " />
-    </property>
-    <property name="RouteData" type="aa{sv}" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
-	Array of IP route data objects. All routes will include &quot;dest&quot;
-	(an IP address string) and &quot;prefix&quot; (a uint). Some routes may
-	include &quot;next-hop&quot; (an IP address string), &quot;metric&quot; (a uint),
-	and additional attributes.
-      " />
-    </property>
+        Array of tuples of IPv6 address/prefix/gateway. Deprecated: use
+        AddressData and Gateway.
+    -->
+    <property name="Addresses" type="a(ayuay)" access="read"/>
+
+    <!--
+        AddressData:
+
+        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.
+    -->
+    <property name="AddressData" type="aa{sv}" access="read"/>
+
+    <!--
+        Gateway:
+
+        The gateway in use.
+    -->
+    <property name="Gateway" type="s" access="read"/>
+
+    <!--
+        Routes:
+
+        Tuples of IPv6 route/prefix/next-hop/metric. Deprecated: use RouteData
+    -->
+    <property name="Routes" type="a(ayuayu)" access="read"/>
+
+    <!--
+        RouteData:
+
+        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.
+    -->
+    <property name="RouteData" type="aa{sv}" access="read"/>
+
+    <!--
+        Nameservers:
+
+        The nameservers in use.
+    -->
     <property name="Nameservers" type="aay" access="read">
       <!-- gdbus-codegen assumes that "aay" means "array of non-UTF-8
 	   string&quot; and so would make this a char **.
       -->
       <annotation name="org.gtk.GDBus.C.ForceGVariant" value="1"/>
-      <annotation name="org.gtk.GDBus.DocString" value="The nameservers in use." />
-    </property>
-    <property name="Domains" type="as" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="A list of domains this address belongs to." />
-    </property>
-    <property name="Searches" type="as" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="A list of dns searches." />
-    </property>
-    <property name="DnsOptions" type="as" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
-	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.
-      " />
-    </property>
+      </property>
 
+    <!--
+        Domains:
+
+        A list of domains this address belongs to.
+    -->
+    <property name="Domains" type="as" access="read"/>
+
+    <!--
+        Searches:
+
+        A list of dns searches.
+    -->
+    <property name="Searches" type="as" access="read"/>
+
+    <!--
+        DnsOptions:
+
+        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.
+    -->
+    <property name="DnsOptions" type="as" access="read"/>
+
+    <!--
+        PropertiesChanged:
+        @properties: A dictionary mapping property names to variant boxed values
+    -->
     <signal name="PropertiesChanged">
-      <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          A dictionary mapping property names to variant boxed values
-        " />
-      </arg>
+      <arg name="properties" type="a{sv}"/>
     </signal>
   </interface>
 </node>
-
diff --git a/introspection/nm-manager.xml b/introspection/nm-manager.xml
index 8203020b39..a0b22efc18 100644
--- a/introspection/nm-manager.xml
+++ b/introspection/nm-manager.xml
@@ -1,533 +1,386 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<node name="/org/freedesktop/NetworkManager" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+<?xml version="1.0" encoding="UTF-8"?>
+<node name="/org/freedesktop/NetworkManager">
   <interface name="org.freedesktop.NetworkManager">
     <annotation name="org.gtk.GDBus.C.Name" value="Manager"/>
 
-    <method name="GetDevices">
-      <annotation name="org.gtk.GDBus.DocString" value="
+    <!--
+        GetDevices:
+        @devices: List of object paths of network devices known to the system. This list does not include device placeholders (see GetAllDevices()).
+
         Get the list of realized network devices.
-      " />
-      <arg name="devices" type="ao" direction="out">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          List of object paths of network devices known to the system.  This
-          list does not include device placeholders (see GetAllDevices()).
-        " />
-      </arg>
+    -->
+    <method name="GetDevices">
+      <arg name="devices" type="ao" direction="out"/>
     </method>
 
-    <method name="GetAllDevices">
-      <annotation name="org.gtk.GDBus.DocString" value="
+    <!--
+        GetAllDevices:
+        @devices: 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).
+
         Get the list of all network devices.
-      " />
+    -->
+    <method name="GetAllDevices">
       <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_get_all_devices"/>
-      <arg name="devices" type="ao" direction="out">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          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).
-        " />
-      </arg>
+      <arg name="devices" type="ao" direction="out"/>
     </method>
 
-    <method name="GetDeviceByIpIface">
-      <annotation name="org.gtk.GDBus.DocString" value="
+    <!--
+        GetDeviceByIpIface:
+        @iface: Interface name of the device to find.
+        @device: Object path of the network device.
+
         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.
-      " />
-      <arg name="iface" type="s" direction="in">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Interface name of the device to find.
-        " />
-      </arg>
-      <arg name="device" type="o" direction="out">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Object path of the network device.
-        " />
-      </arg>
+        interface name. Note that some devices (usually modems) only have an IP
+        interface name when they are connected.
+    -->
+    <method name="GetDeviceByIpIface">
+      <arg name="iface" type="s" direction="in"/>
+      <arg name="device" type="o" direction="out"/>
     </method>
 
-    <method name="ActivateConnection">
-      <annotation name="org.gtk.GDBus.DocString" value="
+    <!--
+        ActivateConnection:
+        @connection: 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.
+        @device: 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.
+        @specific_object: 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.
+        @active_connection: The path of the active connection object representing this active connection.
+
         Activate a connection using the supplied device.
-      " />
-      <arg name="connection" type="o" direction="in">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The connection to activate.  If &quot;/&quot; 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.
-        " />
-      </arg>
-      <arg name="device" type="o" direction="in">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          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.
-        " />
-      </arg>
-      <arg name="specific_object" type="o" direction="in">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          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 &quot;/&quot; 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 &quot;/&quot; to pick an AP automatically.  For VPN connections, pass
-          the object path of an ActiveConnection object that should serve as the
-          &quot;base&quot; connection (to which the VPN connections lifetime will be tied),
-          or pass &quot;/&quot; and NM will automatically use the current default device.
-        " />
-      </arg>
-      <arg name="active_connection" type="o" direction="out">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The path of the active connection object representing this active connection.
-        " />
-      </arg>
+    -->
+    <method name="ActivateConnection">
+      <arg name="connection" type="o" direction="in"/>
+      <arg name="device" type="o" direction="in"/>
+      <arg name="specific_object" type="o" direction="in"/>
+      <arg name="active_connection" type="o" direction="out"/>
     </method>
 
-    <method name="AddAndActivateConnection">
-      <annotation name="org.gtk.GDBus.DocString" value="
+    <!--
+        AddAndActivateConnection:
+        @connection: Connection settings and properties; if incomplete missing settings will be automatically completed using the given device and specific object.
+        @device: The object path of device to be activated using the given connection.
+        @specific_object: 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.
+        @path: Object path of the new connection that was just added.
+        @active_connection: The path of the active connection object representing this active connection.
+
         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.
-      " />
-      <arg name="connection" type="a{sa{sv}}" direction="in">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Connection settings and properties; if incomplete missing settings will
-          be automatically completed using the given device and specific object.
-        " />
-      </arg>
-      <arg name="device" type="o" direction="in">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The object path of device to be activated using the given connection.
-        " />
-      </arg>
-      <arg name="specific_object" type="o" direction="in">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          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 &quot;/&quot; 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.
-        " />
-      </arg>
-      <arg name="path" type="o" direction="out">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Object path of the new connection that was just added.
-        " />
-      </arg>
-      <arg name="active_connection" type="o" direction="out">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The path of the active connection object representing this active connection.
-        " />
-      </arg>
+    -->
+    <method name="AddAndActivateConnection">
+      <arg name="connection" type="a{sa{sv}}" direction="in"/>
+      <arg name="device" type="o" direction="in"/>
+      <arg name="specific_object" type="o" direction="in"/>
+      <arg name="path" type="o" direction="out"/>
+      <arg name="active_connection" type="o" direction="out"/>
     </method>
 
-    <method name="DeactivateConnection">
-      <annotation name="org.gtk.GDBus.DocString" value="
+    <!--
+        DeactivateConnection:
+        @active_connection: The currently active connection to deactivate.
+
         Deactivate an active connection.
-      " />
-      <arg name="active_connection" type="o" direction="in">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The currently active connection to deactivate.
-        " />
-      </arg>
+    -->
+    <method name="DeactivateConnection">
+      <arg name="active_connection" type="o" direction="in"/>
     </method>
 
+    <!--
+        Sleep:
+        @sleep: Indicates whether the NetworkManager daemon should sleep or wake.
+
+        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.
+    -->
     <method name="Sleep">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        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.
-      " />
-      <arg name="sleep" type="b" direction="in">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Indicates whether the NetworkManager daemon should sleep or wake.
-        " />
-      </arg>
+      <arg name="sleep" type="b" direction="in"/>
     </method>
 
+    <!--
+        Enable:
+        @enable: If FALSE, indicates that all networking should be disabled. If TRUE, indicates that NetworkManager should begin managing network devices.
+
+        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.
+    -->
     <method name="Enable">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        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.
-      " />
-      <arg name="enable" type="b" direction="in">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          If FALSE, indicates that all networking should be disabled.  If TRUE,
-          indicates that NetworkManager should begin managing network devices.
-        " />
-      </arg>
+      <arg name="enable" type="b" direction="in"/>
     </method>
 
-    <method name="GetPermissions">
-      <annotation name="org.gtk.GDBus.DocString" value="
+    <!--
+        GetPermissions:
+        @permissions: 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.
+
         Returns the permissions a caller has for various authenticated operations
         that NetworkManager provides, like Enable/Disable networking, changing
         WiFi, WWAN, and WiMAX state, etc.
-      " />
-      <arg name="permissions" type="a{ss}" direction="out">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Dictionary of available permissions and results.  Each permission
-          is represented by a name (ie &quot;org.freedesktop.NetworkManager.Foobar&quot;)
-          and each result is one of the following values: &quot;yes&quot; (the permission
-          is available), &quot;auth&quot; (the permission is available after a successful
-          authentication), or &quot;no&quot; (the permission is denied).  Clients may use
-          these values in the UI to indicate the ability to perform certain
-          operations.
-        " />
-      </arg>
+    -->
+    <method name="GetPermissions">
+      <arg name="permissions" type="a{ss}" direction="out"/>
     </method>
 
-    <signal name="CheckPermissions">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        Emitted when system authorization details change, indicating that
-        clients may wish to recheck permissions with GetPermissions.
-      " />
-    </signal>
+    <!--
+        CheckPermissions:
+
+        Emitted when system authorization details change, indicating that clients
+        may wish to recheck permissions with GetPermissions.
+    -->
+    <signal name="CheckPermissions"/>
+
+    <!--
+        SetLogging:
+        @level: 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.
+        @domains: 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.
 
-    <method name="SetLogging">
-      <annotation name="org.gtk.GDBus.DocString" value="
         Set logging verbosity and which operations are logged.
-      " />
-      <arg name="level" type="s" direction="in">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          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 &quot;KEEP&quot;, all unmentioned
-          domains are disabled entirely. &quot;KEEP&quot; 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.
-        " />
-      </arg>
-      <arg name="domains" type="s" direction="in">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          A combination of logging domains separated by commas (','), or &quot;NONE&quot;
-          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.
-        " />
-      </arg>
+    -->
+    <method name="SetLogging">
+      <arg name="level" type="s" direction="in"/>
+      <arg name="domains" type="s" direction="in"/>
     </method>
 
-    <method name="GetLogging">
-      <annotation name="org.gtk.GDBus.DocString" value="
+    <!--
+        GetLogging:
+        @level: One of [ERR, WARN, INFO, DEBUG, TRACE].
+        @domains: For available domains see SetLogging() call.
+
         Get current logging verbosity level and operations domains.
-      " />
-      <arg name="level" type="s" direction="out">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          One of [ERR, WARN, INFO, DEBUG, TRACE].
-        " />
-      </arg>
-      <arg name="domains" type="s" direction="out">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          For available domains see SetLogging() call.
-        " />
-      </arg>
+    -->
+    <method name="GetLogging">
+      <arg name="level" type="s" direction="out"/>
+      <arg name="domains" type="s" direction="out"/>
     </method>
 
+    <!--
+        CheckConnectivity:
+        @connectivity: (#NMConnectivityState) The current connectivity state.
+
+        Re-check the network connectivity state.
+    -->
     <method name="CheckConnectivity">
-      <annotation name="org.gtk.GDBus.DocString" value="
-	Re-check the network connectivity state.
-      " />
-      <arg name="connectivity" type="u" tp:type="NM_CONNECTIVITY" direction="out">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The current connectivity state.
-        " />
-      </arg>
+      <arg name="connectivity" type="u" direction="out"/>
     </method>
 
-    <method name="state">
-      <annotation name="org.gtk.GDBus.DocString" value="
+    <!--
+        state:
+        @state: #NMState
+
         The overall networking state as determined by the NetworkManager daemon,
         based on the state of network devices under it's management.
-      " />
-      <arg name="state" type="u" direction="out" tp:type="NM_STATE"/>
+    -->
+    <method name="state">
+      <arg name="state" type="u" direction="out"/>
     </method>
 
-    <property name="Devices" type="ao" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
+    <!--
+        Devices:
+
         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).
-      " />
-    </property>
+    -->
+    <property name="Devices" type="ao" access="read"/>
+
+    <!--
+        AllDevices:
 
-    <property name="AllDevices" type="ao" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
         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.
-      " />
-    </property>
+        devices are software devices which do not yet have backing resources, but
+        for which backing resources can be created if the device is activated.
+    -->
+    <property name="AllDevices" type="ao" access="read"/>
 
-    <property name="NetworkingEnabled" type="b" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        Indicates if overall networking is currently enabled or not.  See the
+    <!--
+        NetworkingEnabled:
+
+        Indicates if overall networking is currently enabled or not. See the
         Enable() method.
-      " />
-    </property>
+    -->
+    <property name="NetworkingEnabled" type="b" access="read"/>
+
+    <!--
+        WirelessEnabled:
 
-    <property name="WirelessEnabled" type="b" access="readwrite">
-      <annotation name="org.gtk.GDBus.DocString" value="
         Indicates if wireless is currently enabled or not.
-      " />
-    </property>
+    -->
+    <property name="WirelessEnabled" type="b" access="readwrite"/>
 
-    <property name="WirelessHardwareEnabled" type="b" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        Indicates if the wireless hardware is currently enabled, i.e. the state of the RF kill switch.
-      " />
-    </property>
+    <!--
+        WirelessHardwareEnabled:
+
+        Indicates if the wireless hardware is currently enabled, i.e. the state of
+        the RF kill switch.
+    -->
+    <property name="WirelessHardwareEnabled" type="b" access="read"/>
+
+    <!--
+        WwanEnabled:
 
-    <property name="WwanEnabled" type="b" access="readwrite">
-      <annotation name="org.gtk.GDBus.DocString" value="
         Indicates if mobile broadband devices are currently enabled or not.
-      " />
-    </property>
+    -->
+    <property name="WwanEnabled" type="b" access="readwrite"/>
 
-    <property name="WwanHardwareEnabled" type="b" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        Indicates if the mobile broadband hardware is currently enabled, i.e. the state of the RF kill switch.
-      " />
-    </property>
+    <!--
+        WwanHardwareEnabled:
+
+        Indicates if the mobile broadband hardware is currently enabled, i.e. the
+        state of the RF kill switch.
+    -->
+    <property name="WwanHardwareEnabled" type="b" access="read"/>
+
+    <!--
+        WimaxEnabled:
 
-    <property name="WimaxEnabled" type="b" access="readwrite">
-      <annotation name="org.gtk.GDBus.DocString" value="
         Indicates if WiMAX devices are currently enabled or not.
-      " />
-    </property>
+    -->
+    <property name="WimaxEnabled" type="b" access="readwrite"/>
 
-    <property name="WimaxHardwareEnabled" type="b" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        Indicates if the WiMAX hardware is currently enabled, i.e. the state of the RF kill switch.
-      " />
-    </property>
+    <!--
+        WimaxHardwareEnabled:
+
+        Indicates if the WiMAX hardware is currently enabled, i.e. the state of
+        the RF kill switch.
+    -->
+    <property name="WimaxHardwareEnabled" type="b" access="read"/>
+
+    <!--
+        ActiveConnections:
 
-    <property name="ActiveConnections" type="ao" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
         List of active connection object paths.
-      " />
-    </property>
+    -->
+    <property name="ActiveConnections" type="ao" access="read"/>
 
-    <property name="PrimaryConnection" type="o" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        The object path of the &quot;primary&quot; 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.
-      " />
-    </property>
+    <!--
+        PrimaryConnection:
 
-    <property name="PrimaryConnectionType" type="s" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        The connection type of the &quot;primary&quot; active connection being
-        used to access the network. This is the same as the Type
-        property on the object indicated by PrimaryConnection.
-      " />
-    </property>
+        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.
+    -->
+    <property name="PrimaryConnection" type="o" access="read"/>
 
-    <property name="Metered" type="u" access="read" tp:type="NM_METERED">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        Indicates whether the connectivity is metered. This is equivalent
-        to the metered property of the device associated with the primary
-        connection.
-      " />
-    </property>
+    <!--
+        PrimaryConnectionType:
 
-    <property name="ActivatingConnection" type="o" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        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.
-      " />
-    </property>
+        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.
+    -->
+    <property name="PrimaryConnectionType" type="s" access="read"/>
 
-    <property name="Startup" type="b" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        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.
-      " />
-    </property>
+    <!--
+        Metered:
+
+        Indicates whether the connectivity is metered. This is equivalent to the
+        metered property of the device associated with the primary connection.
+
+        Returns: #NMMetered
+    -->
+    <property name="Metered" type="u" access="read"/>
+
+    <!--
+        ActivatingConnection:
+
+        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.
+    -->
+    <property name="ActivatingConnection" type="o" access="read"/>
+
+    <!--
+        Startup:
+
+        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.
+    -->
+    <property name="Startup" type="b" access="read"/>
+
+    <!--
+        Version:
 
-    <property name="Version" type="s" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
         NetworkManager version.
-      " />
-    </property>
+    -->
+    <property name="Version" type="s" access="read"/>
+
+    <!--
+        State:
 
-    <property name="State" type="u" access="read" tp:type="NM_STATE">
-      <annotation name="org.gtk.GDBus.DocString" value="
         The overall state of the NetworkManager daemon.
-      " />
-    </property>
 
-    <signal name="StateChanged">
-      <annotation name="org.gtk.GDBus.DocString" value="
+        Returns: #NMState
+    -->
+    <property name="State" type="u" access="read"/>
+
+    <!--
+        StateChanged:
+        @state: (#NMState) The new state of NetworkManager.
+
         NetworkManager's state changed.
-      " />
-      <arg name="state" type="u" tp:type="NM_STATE">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The new state of NetworkManager.
-        " />
-      </arg>
+    -->
+    <signal name="StateChanged">
+      <arg name="state" type="u"/>
     </signal>
 
-    <property name="Connectivity" type="u" access="read" tp:type="NM_CONNECTIVITY">
-      <annotation name="org.gtk.GDBus.DocString" value="
+    <!--
+        Connectivity:
+
         The network connectivity state.
-      " />
-    </property>
 
-    <property name="GlobalDnsConfiguration" type="a{sv}" access="readwrite">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        Dictionary of global DNS settings where the key is one of
-        &quot;searches&quot;, &quot;options&quot; and &quot;domains&quot;.  The values for the
-        &quot;searches&quot; and &quot;options&quot; keys are string arrays describing the
-        list of search domains and resolver options, respectively.
-        The value of the &quot;domains&quot; 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 &quot;servers&quot; and
-        &quot;options&quot;. &quot;servers&quot; is a string array of DNS servers,
-        &quot;options&quot; is a string array of domain-specific options.
-      " />
-    </property>
+        Returns: #NMConnectivityState
+    -->
+    <property name="Connectivity" type="u" access="read"/>
+
+    <!--
+        GlobalDnsConfiguration:
+
+        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.
+    -->
+    <property name="GlobalDnsConfiguration" type="a{sv}" access="readwrite"/>
+
+    <!--
+        PropertiesChanged:
+        @properties: The changed properties.
 
-    <signal name="PropertiesChanged">
-      <annotation name="org.gtk.GDBus.DocString" value="
         NetworkManager's properties changed.
-      " />
-      <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The changed properties.
-        " />
-      </arg>
+    -->
+    <signal name="PropertiesChanged">
+      <arg name="properties" type="a{sv}"/>
     </signal>
 
-    <signal name="DeviceAdded">
-      <annotation name="org.gtk.GDBus.DocString" value="
+    <!--
+        DeviceAdded:
+        @device_path: The object path of the newly added device.
+
         A device was added to the system
-      " />
-      <arg name="device_path" type="o">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The object path of the newly added device.
-        " />
-      </arg>
+    -->
+    <signal name="DeviceAdded">
+      <arg name="device_path" type="o"/>
     </signal>
 
-    <signal name="DeviceRemoved">
-      <annotation name="org.gtk.GDBus.DocString" value="
+    <!--
+        DeviceRemoved:
+        @device_path: The object path of the device that was just removed.
+
         A device was removed from the system, and is no longer available.
-      " />
-      <arg name="device_path" type="o">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The object path of the device that was just removed.
-        " />
-      </arg>
+    -->
+    <signal name="DeviceRemoved">
+      <arg name="device_path" type="o"/>
     </signal>
 
-    <tp:enum name="NM_STATE" type="u">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        Describes the overall state of the daemon.
-      " />
-      <tp:enumvalue suffix="UNKNOWN" value="0">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Networking state is unknown.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="ASLEEP" value="10">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Networking is inactive and all devices are disabled.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="DISCONNECTED" value="20">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          There is no active network connection.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="DISCONNECTING" value="30">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Network connections are being cleaned up.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="CONNECTING" value="40">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          A network device is connecting to a network and there is no other
-          available network connection.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="CONNECTED_LOCAL" value="50">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          A network device is connected, but there is only link-local connectivity.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="CONNECTED_SITE" value="60">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          A network device is connected, but there is only site-local connectivity.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="CONNECTED_GLOBAL" value="70">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          A network device is connected, with global network connectivity.
-        " />
-      </tp:enumvalue>
-    </tp:enum>
-
-    <tp:enum name="NM_CONNECTIVITY" type="u">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        Describes the network-connectivity state.
-      " />
-      <tp:enumvalue suffix="UNKNOWN" value="0">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Network connectivity is unknown.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="NONE" value="1">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The host is not connected to any network.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="PORTAL" value="2">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The host is behind a captive portal and cannot reach the
-          full Internet.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="LIMITED" value="3">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The host is connected to a network, but does not appear to
-	  be able to reach the full Internet.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="FULL" value="4">
-        <annotation name="org.gtk.GDBus.DocString" value="
-	  The host is connected to a network, and appears to be able
-	  to reach the full Internet
-        " />
-      </tp:enumvalue>
-    </tp:enum>
-
   </interface>
 </node>
diff --git a/introspection/nm-secret-agent.xml b/introspection/nm-secret-agent.xml
index ec7ede0912..8fe13183f6 100644
--- a/introspection/nm-secret-agent.xml
+++ b/introspection/nm-secret-agent.xml
@@ -1,243 +1,94 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
+<node name="/">
 
-<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+  <!--
+      org.freedesktop.NetworkManager.SecretAgent:
 
-    <interface name="org.freedesktop.NetworkManager.SecretAgent">
-        <annotation name="org.gtk.GDBus.DocString" value="
-            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 &quot;agent owned&quot; 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.
-        " />
+      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.
+  -->
+  <interface name="org.freedesktop.NetworkManager.SecretAgent">
 
-        <method name="GetSecrets">
-            <annotation name="org.gtk.GDBus.DocString" value="
-                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).
-            " />
+    <!--
+        GetSecrets:
+        @connection: 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.
+        @connection_path: Object path of the connection for which secrets are being requested.
+        @setting_name: Setting name for which secrets are being requested.
+        @hints: 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:".
+        @flags: (#NMSecretAgentGetSecretsFlags) 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.
+        @secrets: 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.
+
+        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).
+    -->
+    <method name="GetSecrets">
             <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_secret_agent_get_secrets"/>
             <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-            <arg name="connection" type="a{sa{sv}}" direction="in" tp:type="String_String_Variant_Map_Map">
-                <annotation name="org.gtk.GDBus.DocString" value="
-                    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.
-                " />
-            </arg>
-            <arg name="connection_path" type="o" direction="in">
-                <annotation name="org.gtk.GDBus.DocString" value="
-                    Object path of the connection for which secrets are being
-                    requested.
-                " />
-            </arg>
-            <arg name="setting_name" type="s" direction="in">
-                <annotation name="org.gtk.GDBus.DocString" value="
-                    Setting name for which secrets are being requested.
-                " />
-            </arg>
-            <arg name="hints" type="as" direction="in">
-                <annotation name="org.gtk.GDBus.DocString" value="
-                    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
-                    &quot;x-vpn-message:&quot;.
-                " />
-            </arg>
-            <arg name="flags" type="u" direction="in" tp:type="NM_SECRET_AGENT_GET_SECRETS_FLAGS">
-                <annotation name="org.gtk.GDBus.DocString" value="
-                    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.
-                " />
-            </arg>
+            <arg name="connection" type="a{sa{sv}}" direction="in"/>
+            <arg name="connection_path" type="o" direction="in"/>
+            <arg name="setting_name" type="s" direction="in"/>
+            <arg name="hints" type="as" direction="in"/>
+            <arg name="flags" type="u" direction="in"/>
 
-            <arg name="secrets" type="a{sa{sv}}" direction="out" tp:type="String_String_Variant_Map_Map">
-                <annotation name="org.gtk.GDBus.DocString" value="
-                    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.
-                " />
-            </arg>
-
-            <tp:possible-errors>
-              <tp:error name="org.freedesktop.NetworkManager.SecretAgent.NotAuthorized">
-                  <annotation name="org.gtk.GDBus.DocString" value="
-                      Should be returned when the process requesting secrets is
-                      not authorized to do so (like if the caller is not root
-                      or not NetworkManager).
-                  " />
-              </tp:error>
-              <tp:error name="org.freedesktop.NetworkManager.SecretAgent.InvalidConnection">
-                  <annotation name="org.gtk.GDBus.DocString" value="
-                      Should be returned if the 'connection' argument is invalid.
-                  " />
-              </tp:error>
-              <tp:error name="org.freedesktop.NetworkManager.SecretAgent.UserCanceled">
-                  <annotation name="org.gtk.GDBus.DocString" value="
-                      Should be returned when the user has canceled the request.
-                  " />
-              </tp:error>
-              <tp:error name="org.freedesktop.NetworkManager.SecretAgent.AgentCanceled">
-                  <annotation name="org.gtk.GDBus.DocString" value="
-                      Should be returned when NetworkManager has requested that
-                      the agent cancel the request.
-                  " />
-              </tp:error>
-              <tp:error name="org.freedesktop.NetworkManager.SecretAgent.InternalError">
-                  <annotation name="org.gtk.GDBus.DocString" value="
-                      Should be returned if the agent has encountered some internal
-                      error processing the request.
-                  " />
-              </tp:error>
-              <tp:error name="org.freedesktop.NetworkManager.SecretAgent.NoSecrets">
-                  <annotation name="org.gtk.GDBus.DocString" value="
-                      Should be returned if there are no available secrets, for
-                      example if user interaction is not allowed and there are
-                      no secrets stored by the agent for this connection.
-                  " />
-              </tp:error>
-            </tp:possible-errors>
+            <arg name="secrets" type="a{sa{sv}}" direction="out"/>
         </method>
 
-        <tp:flags name="NM_SECRET_AGENT_GET_SECRETS_FLAGS" value-prefix="NM_SECRET_AGENT_GET_SECRETS_FLAG" type="u">
-          <annotation name="org.gtk.GDBus.DocString" value="
-            Flags modifying the behavior of GetSecrets request.
-          " />
-          <tp:flag suffix="NONE" value="0x0">
-            <annotation name="org.gtk.GDBus.DocString" value="
-              No special behavior; by default no user interaction is allowed and
-              requests for secrets are fulfilled from persistent storage, or
-              if no secrets are available an error is returned.
-            " />
-          </tp:flag>
-          <tp:flag suffix="ALLOW_INTERACTION" value="0x1">
-            <annotation name="org.gtk.GDBus.DocString" value="
-              Allows the request to interact with the user, possibly prompting
-              via UI for secrets if any are required, or if none are found in
-              persistent storage.
-            " />
-          </tp:flag>
-          <tp:flag suffix="REQUEST_NEW" value="0x2">
-            <annotation name="org.gtk.GDBus.DocString" value="
-              Explicitly prompt for new secrets from the user.  This flag
-              signals that NetworkManager thinks any existing secrets are
-              invalid or wrong.  This flag implies that interaction is allowed.
-            " />
-          </tp:flag>
-          <tp:flag suffix="USER_REQUESTED" value="0x4">
-            <annotation name="org.gtk.GDBus.DocString" value="
-              Set if the request was initiated by user-requested action via the
-              D-Bus interface, as opposed to automatically initiated by
-              NetworkManager in response to (for example) scan results or
-              carrier changes.
-            " />
-          </tp:flag>
-        </tp:flags>
+    <!--
+        CancelGetSecrets:
+        @connection_path: Object path of the connection for which, if secrets for the given 'setting_name' are being requested, the request should be canceled.
+        @setting_name: Setting name for which secrets for this connection were originally being requested.
 
-        <method name="CancelGetSecrets">
-            <annotation name="org.gtk.GDBus.DocString" value="
-                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.
-            " />
+        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.
+    -->
+    <method name="CancelGetSecrets">
             <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_secret_agent_cancel_get_secrets"/>
             <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-            <arg name="connection_path" type="o" direction="in">
-                <annotation name="org.gtk.GDBus.DocString" value="
-                    Object path of the connection for which, if secrets for
-                    the given 'setting_name' are being requested, the request
-                    should be canceled.
-                " />
-            </arg>
-            <arg name="setting_name" type="s" direction="in">
-                <annotation name="org.gtk.GDBus.DocString" value="
-                    Setting name for which secrets for this connection were
-                    originally being requested.
-                " />
-            </arg>
+            <arg name="connection_path" type="o" direction="in"/>
+            <arg name="setting_name" type="s" direction="in"/>
         </method>
 
-        <method name="SaveSecrets">
-            <annotation name="org.gtk.GDBus.DocString" value="
-                Save given secrets to backing storage.
-            " />
+    <!--
+        SaveSecrets:
+        @connection: 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.
+        @connection_path: Object path of the connection for which the agent should save secrets to backing storage.
+
+        Save given secrets to backing storage.
+    -->
+    <method name="SaveSecrets">
             <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_secret_agent_save_secrets"/>
             <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-            <arg name="connection" type="a{sa{sv}}" direction="in" tp:type="String_String_Variant_Map_Map">
-                <annotation name="org.gtk.GDBus.DocString" value="
-                    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.
-                " />
-            </arg>
-            <arg name="connection_path" type="o" direction="in">
-                <annotation name="org.gtk.GDBus.DocString" value="
-                    Object path of the connection for which the agent should
-                    save secrets to backing storage.
-                " />
-            </arg>
+            <arg name="connection" type="a{sa{sv}}" direction="in"/>
+            <arg name="connection_path" type="o" direction="in"/>
         </method>
 
-        <method name="DeleteSecrets">
-            <annotation name="org.gtk.GDBus.DocString" value="
-                Delete secrets from backing storage.
-            " />
+    <!--
+        DeleteSecrets:
+        @connection: Nested settings maps containing the connection properties (sans secrets), for which the agent should delete the secrets from backing storage.
+        @connection_path: Object path of the connection for which the agent should delete secrets from backing storage.
+
+        Delete secrets from backing storage.
+    -->
+    <method name="DeleteSecrets">
             <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_secret_agent_delete_secrets"/>
             <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-            <arg name="connection" type="a{sa{sv}}" direction="in" tp:type="String_String_Variant_Map_Map">
-                <annotation name="org.gtk.GDBus.DocString" value="
-                    Nested settings maps containing the connection properties
-                    (sans secrets), for which the agent should delete the
-                    secrets from backing storage.
-                " />
-            </arg>
-            <arg name="connection_path" type="o" direction="in">
-                <annotation name="org.gtk.GDBus.DocString" value="
-                    Object path of the connection for which the agent should
-                    delete secrets from backing storage.
-                " />
-            </arg>
+            <arg name="connection" type="a{sa{sv}}" direction="in"/>
+            <arg name="connection_path" type="o" direction="in"/>
         </method>
 
-        <tp:flags name="NM_SECRET_AGENT_CAPABILITIES" value-prefix="NM_SECRET_AGENT_CAPABILITY" type="u">
-            <tp:flag suffix="NONE" value="0x0">
-                <annotation name="org.gtk.GDBus.DocString" value="No special capabilities." />
-            </tp:flag>
-            <tp:flag suffix="VPN_HINTS" value="0x1">
-                <annotation name="org.gtk.GDBus.DocString" value="
-                    The agent supports passing hints to VPN plugin authentication
-                    dialogs.
-                " />
-            </tp:flag>
-        </tp:flags>
-
     </interface>
 
 </node>
diff --git a/introspection/nm-settings-connection.xml b/introspection/nm-settings-connection.xml
index fc62046c80..e68f56bc8e 100644
--- a/introspection/nm-settings-connection.xml
+++ b/introspection/nm-settings-connection.xml
@@ -1,136 +1,131 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
+<node name="/">
 
-<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+  <!--
+      org.freedesktop.NetworkManager.Settings.Connection:
 
-    <interface name="org.freedesktop.NetworkManager.Settings.Connection">
-        <annotation name="org.gtk.GDBus.DocString" value="
-            Represents a single network connection configuration.
-        " />
+      Represents a single network connection configuration.
+  -->
+  <interface name="org.freedesktop.NetworkManager.Settings.Connection">
 
-        <method name="Update">
-          <annotation name="org.gtk.GDBus.DocString" value="
-            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.
-          " />
-          <arg name="properties" type="a{sa{sv}}" direction="in">
-            <annotation name="org.gtk.GDBus.DocString" value="
-              New connection settings, properties, and (optionally) secrets.
-            " />
-          </arg>
+    <!--
+        Update:
+        @properties: New connection settings, properties, and (optionally) secrets.
+
+        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.
+    -->
+    <method name="Update">
+          <arg name="properties" type="a{sa{sv}}" direction="in"/>
         </method>
 
-        <method name="UpdateUnsaved">
-          <annotation name="org.gtk.GDBus.DocString" value="
-            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.
+    <!--
+        UpdateUnsaved:
+        @properties: New connection settings, properties, and (optionally) secrets.
 
-            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).
-          " />
-          <arg name="properties" type="a{sa{sv}}" direction="in">
-            <annotation name="org.gtk.GDBus.DocString" value="
-              New connection settings, properties, and (optionally) secrets.
-            " />
-          </arg>
+        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).
+    -->
+    <method name="UpdateUnsaved">
+          <arg name="properties" type="a{sa{sv}}" direction="in"/>
         </method>
 
-        <method name="Delete">
-          <annotation name="org.gtk.GDBus.DocString" value="
-            Delete the connection.
-          " />
+    <!--
+        Delete:
+
+        Delete the connection.
+    -->
+    <method name="Delete"/>
+
+    <!--
+        GetSettings:
+        @settings: The nested settings maps describing this object.
+
+        Get the settings maps describing this network configuration. This will
+        never include any secrets required for connection to the network, as those
+        are often protected. Secrets must be requested separately using the
+        GetSecrets() call.
+    -->
+    <method name="GetSettings">
+            <arg name="settings" type="a{sa{sv}}" direction="out"/>
         </method>
 
-        <method name="GetSettings">
-            <annotation name="org.gtk.GDBus.DocString" value="
-                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.
-            " />
-            <arg name="settings" type="a{sa{sv}}" direction="out" tp:type="String_String_Variant_Map_Map">
-                <annotation name="org.gtk.GDBus.DocString" value="
-                    The nested settings maps describing this object.
-                " />
-            </arg>
+    <!--
+        GetSecrets:
+        @setting_name: Name of the setting to return secrets for. If empty, all all secrets will be returned.
+        @secrets: Nested settings maps containing secrets.
+
+        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.
+    -->
+    <method name="GetSecrets">
+            <arg name="setting_name" type="s" direction="in"/>
+
+            <arg name="secrets" type="a{sa{sv}}" direction="out"/>
         </method>
 
-        <method name="GetSecrets">
-            <annotation name="org.gtk.GDBus.DocString" value="
-                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.
-            " />
-            <arg name="setting_name" type="s" direction="in">
-                <annotation name="org.gtk.GDBus.DocString" value="
-                    Name of the setting to return secrets for.  If empty, all
-                    all secrets will be returned.
-                " />
-            </arg>
+    <!--
+        ClearSecrets:
 
-            <arg name="secrets" type="a{sa{sv}}" direction="out" tp:type="String_String_Variant_Map_Map">
-                <annotation name="org.gtk.GDBus.DocString" value="
-                    Nested settings maps containing secrets.
-                " />
-            </arg>
-        </method>
+        Clear the secrets belonging to this network connection profile.
+    -->
+    <method name="ClearSecrets"/>
 
-        <method name="ClearSecrets">
-          <annotation name="org.gtk.GDBus.DocString" value="
-            Clear the secrets belonging to this network connection profile.
-          " />
-        </method>
+    <!--
+        Save:
 
-        <method name="Save">
-            <annotation name="org.gtk.GDBus.DocString" value="
-                Saves a &quot;dirty&quot; connection (that had previously been
-                updated with UpdateUnsaved) to persistent storage.
-            " />
-        </method>
+        Saves a "dirty" connection (that had previously been updated with
+        UpdateUnsaved) to persistent storage.
+    -->
+    <method name="Save"/>
 
-        <signal name="Updated">
-            <annotation name="org.gtk.GDBus.DocString" value="
-                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.
-            " />
-        </signal>
+    <!--
+        Updated:
 
-        <signal name="Removed">
-            <annotation name="org.gtk.GDBus.DocString" value="
-                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.
-            " />
-        </signal>
+        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.
+    -->
+    <signal name="Updated"/>
 
-        <property name="Unsaved" type="b" access="read">
-            <annotation name="org.gtk.GDBus.DocString" value="
-                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.
-            " />
-        </property>
+    <!--
+        Removed:
 
-        <signal name="PropertiesChanged">
-            <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
-                <annotation name="org.gtk.GDBus.DocString" value="
-                    A dictionary mapping property names to variant boxed values.
-                " />
-            </arg>
+        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.
+    -->
+    <signal name="Removed"/>
+
+    <!--
+        Unsaved:
+
+        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.
+    -->
+    <property name="Unsaved" type="b" access="read"/>
+
+    <!--
+        PropertiesChanged:
+        @properties: A dictionary mapping property names to variant boxed values.
+    -->
+    <signal name="PropertiesChanged">
+            <arg name="properties" type="a{sv}"/>
         </signal>
 
     </interface>
diff --git a/introspection/nm-settings.xml b/introspection/nm-settings.xml
index 6289202511..9d2ba42bb8 100644
--- a/introspection/nm-settings.xml
+++ b/introspection/nm-settings.xml
@@ -1,198 +1,171 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
+<node name="/org/freedesktop/NetworkManager/Settings">
 
-<node name="/org/freedesktop/NetworkManager/Settings" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+  <!--
+      org.freedesktop.NetworkManager.Settings:
+
+      The Settings interface allows clients to view and administrate the
+      connections stored and used by NetworkManager.
+  -->
   <interface name="org.freedesktop.NetworkManager.Settings">
-    <annotation name="org.gtk.GDBus.DocString" value="
-      The Settings interface allows clients to view and administrate the connections stored and used by NetworkManager.
-    " />
 
-    <method name="ListConnections">
-      <annotation name="org.gtk.GDBus.DocString" value="
+    <!--
+        ListConnections:
+        @connections: List of connections.
+
         List the saved network connections known to NetworkManager.
-      " />
-      <arg name="connections" type="ao" direction="out">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          List of connections.
-        " />
-      </arg>
+    -->
+    <method name="ListConnections">
+      <arg name="connections" type="ao" direction="out"/>
     </method>
 
-    <method name="GetConnectionByUuid">
-      <annotation name="org.gtk.GDBus.DocString" value="
+    <!--
+        GetConnectionByUuid:
+        @uuid: The UUID to find the connection object path for.
+        @connection: The connection's object path.
+
         Retrieve the object path of a connection, given that connection's UUID.
-      " />
-      <arg name="uuid" type="s" direction="in">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The UUID to find the connection object path for.
-        " />
-      </arg>
-      <arg name="connection" type="o" direction="out">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The connection's object path.
-        " />
-      </arg>
+    -->
+    <method name="GetConnectionByUuid">
+      <arg name="uuid" type="s" direction="in"/>
+      <arg name="connection" type="o" direction="out"/>
     </method>
 
+    <!--
+        AddConnection:
+        @connection: Connection settings and properties.
+        @path: Object path of the new connection that was just added.
+
+        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.
+    -->
     <method name="AddConnection">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        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.
-      " />
-      <arg name="connection" type="a{sa{sv}}" direction="in">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Connection settings and properties.
-        " />
-      </arg>
-      <arg name="path" type="o" direction="out">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Object path of the new connection that was just added.
-        " />
-      </arg>
+      <arg name="connection" type="a{sa{sv}}" direction="in"/>
+      <arg name="path" type="o" direction="out"/>
     </method>
 
+    <!--
+        AddConnectionUnsaved:
+        @connection: Connection settings and properties.
+        @path: Object path of the new connection that was just added.
+
+        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).
+    -->
     <method name="AddConnectionUnsaved">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        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).
-      " />
-      <arg name="connection" type="a{sa{sv}}" direction="in">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Connection settings and properties.
-        " />
-      </arg>
-      <arg name="path" type="o" direction="out">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Object path of the new connection that was just added.
-        " />
-      </arg>
+      <arg name="connection" type="a{sa{sv}}" direction="in"/>
+      <arg name="path" type="o" direction="out"/>
     </method>
 
+    <!--
+        LoadConnections:
+        @filenames: Array of paths to on-disk connection profiles in directories monitored by NetworkManager.
+        @status: 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).
+        @failures: Paths of connection files that could not be loaded.
+
+        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.
+    -->
     <method name="LoadConnections">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        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 &quot;monitor-connection-files&quot; in NetworkManager.conf
-        is &quot;true&quot;, then this will have no real effect, but is
-        harmless.) As with AddConnection(), this operation does not
-        necessarily start the network connection.
-      " />
-      <arg name="filenames" type="as" direction="in">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Array of paths to on-disk connection profiles in directories
-          monitored by NetworkManager.
-        " />
-      </arg>
-      <arg name="status" type="b" direction="out">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          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).
-        " />
-      </arg>
-      <arg name="failures" type="as" direction="out">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Paths of connection files that could not be loaded.
-        " />
-      </arg>
+      <arg name="filenames" type="as" direction="in"/>
+      <arg name="status" type="b" direction="out"/>
+      <arg name="failures" type="as" direction="out"/>
     </method>
 
+    <!--
+        ReloadConnections:
+        @status: Success or failure.
+
+        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.
+    -->
     <method name="ReloadConnections">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        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
-        &quot;monitor-connection-files=false&quot; in NetworkManager.conf.
-      " />
-      <arg name="status" type="b" direction="out">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Success or failure.
-        " />
-      </arg>
+      <arg name="status" type="b" direction="out"/>
     </method>
 
-    <method name="SaveHostname">
-      <annotation name="org.gtk.GDBus.DocString" value="
+    <!--
+        SaveHostname:
+        @hostname: The hostname to save to persistent configuration. If blank, the persistent hostname is cleared.
+
         Save the hostname to persistent configuration.
-      " />
-      <arg name="hostname" type="s" direction="in">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The hostname to save to persistent configuration.  If blank, the persistent hostname is cleared.
-        " />
-      </arg>
+    -->
+    <method name="SaveHostname">
+      <arg name="hostname" type="s" direction="in"/>
     </method>
 
-    <property name="Connections" type="ao" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
+    <!--
+        Connections:
+
         List of object paths of available network connection profiles.
-      " />
-    </property>
+    -->
+    <property name="Connections" type="ao" access="read"/>
+
+    <!--
+        Hostname:
 
-    <property name="Hostname" type="s" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
         The machine hostname stored in persistent configuration.
-      " />
-    </property>
+    -->
+    <property name="Hostname" type="s" access="read"/>
+
+    <!--
+        CanModify:
 
-    <property name="CanModify" type="b" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="
         If true, adding and modifying connections is supported.
-      " />
-    </property>
+    -->
+    <property name="CanModify" type="b" access="read"/>
 
+    <!--
+        PropertiesChanged:
+        @properties: A dictionary mapping property names to variant boxed values
+    -->
     <signal name="PropertiesChanged">
-        <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
-            <annotation name="org.gtk.GDBus.DocString" value="
-                A dictionary mapping property names to variant boxed values
-            " />
-        </arg>
+        <arg name="properties" type="a{sv}"/>
     </signal>
 
-    <signal name="NewConnection">
-      <annotation name="org.gtk.GDBus.DocString" value="
+    <!--
+        NewConnection:
+        @connection: Object path of the new connection.
+
         Emitted when a new connection has been added after NetworkManager has
-        started up and initialized.  This signal is not emitted for connections
+        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
+        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.
-      " />
-      <arg name="connection" type="o">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Object path of the new connection.
-        " />
-      </arg>
+    -->
+    <signal name="NewConnection">
+      <arg name="connection" type="o"/>
     </signal>
 
+    <!--
+        ConnectionRemoved:
+        @connection: Object path of the removed connection.
+
+        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.
+    -->
     <signal name="ConnectionRemoved">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        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.
-      " />
-      <arg name="connection" type="o">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Object path of the removed connection.
-        " />
-      </arg>
+      <arg name="connection" type="o"/>
     </signal>
 
   </interface>
 </node>
-
diff --git a/introspection/nm-vpn-connection.xml b/introspection/nm-vpn-connection.xml
index 6a4fb37db4..bdad5ccf52 100644
--- a/introspection/nm-vpn-connection.xml
+++ b/introspection/nm-vpn-connection.xml
@@ -1,148 +1,48 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
+<node name="/">
 
-<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+  <!--
+      org.freedesktop.NetworkManager.VPN.Connection:
+
+      Represents an active connection to a Virtual Private Network.
+  -->
   <interface name="org.freedesktop.NetworkManager.VPN.Connection">
     <annotation name="org.gtk.GDBus.C.Name" value="VpnConnection"/>
 
-    <annotation name="org.gtk.GDBus.DocString" value="
-      Represents an active connection to a Virtual Private Network.
-    " />
-
+    <!--
+        PropertiesChanged:
+        @properties: A dictionary mapping property names to variant boxed values
+    -->
     <signal name="PropertiesChanged">
-        <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
-            <annotation name="org.gtk.GDBus.DocString" value="
-                A dictionary mapping property names to variant boxed values
-            " />
-        </arg>
+        <arg name="properties" type="a{sv}"/>
     </signal>
 
-    <property name="VpnState" type="u" access="read" tp:type="NM_VPN_CONNECTION_STATE">
-      <annotation name="org.gtk.GDBus.DocString" value="The VPN-specific state of the connection." />
-    </property>
-    <property name="Banner" type="s" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="The banner string of the VPN connection." />
-    </property>
+    <!--
+        VpnState:
+
+        The VPN-specific state of the connection.
+
+        Returns: #NMVpnConnectionState
+    -->
+    <property name="VpnState" type="u" access="read"/>
+
+    <!--
+        Banner:
+
+        The banner string of the VPN connection.
+    -->
+    <property name="Banner" type="s" access="read"/>
+
+    <!--
+        VpnStateChanged:
+        @state: (#NMVpnConnectionState) The new state of the VPN connection.
+        @reason: (#NMVpnConnectionStateReason) Reason code describing the change to the new state.
 
-    <signal name="VpnStateChanged">
-      <annotation name="org.gtk.GDBus.DocString" value="
         Emitted when the state of the VPN connection has changed.
-      " />
-      <arg name="state" type="u" tp:type="NM_VPN_CONNECTION_STATE">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The new state of the VPN connection.
-        " />
-      </arg>
-      <arg name="reason" type="u" tp:type="NM_VPN_CONNECTION_STATE_REASON">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Reason code describing the change to the new state.
-        " />
-      </arg>
+    -->
+    <signal name="VpnStateChanged">
+      <arg name="state" type="u"/>
+      <arg name="reason" type="u"/>
     </signal>
-
-    <tp:enum name="NM_VPN_CONNECTION_STATE" type="u">
-      <tp:enumvalue suffix="UNKNOWN" value="0">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The state of the VPN connection is unknown.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="PREPARE" value="1">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The VPN connection is preparing to connect.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="NEED_AUTH" value="2">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The VPN connection needs authorization credentials.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="CONNECT" value="3">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The VPN connection is being established.  FIXME: Should be CONNECTING or CONNECTED.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="IP_CONFIG_GET" value="4">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The VPN connection is getting an IP address.  FIXME: Should be an -ING 
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="ACTIVATED" value="5">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The VPN connection is active.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="FAILED" value="6">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The VPN connection failed.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="DISCONNECTED" value="7">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The VPN connection is disconnected.
-        " />
-      </tp:enumvalue>
-    </tp:enum>
-    <tp:enum name="NM_VPN_CONNECTION_STATE_REASON" type="u">
-      <tp:enumvalue suffix="UNKNOWN" value="0">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The reason for the VPN connection state change is unknown.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="NONE" value="1">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          No reason was given for the VPN connection state change.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="USER_DISCONNECTED" value="2">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The VPN connection changed state because the user disconnected it.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="DEVICE_DISCONNECTED" value="3">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The VPN connection changed state because the device it was using was disconnected.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="SERVICE_STOPPED" value="4">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The service providing the VPN connection was stopped.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="IP_CONFIG_INVALID" value="5">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The IP config of the VPN connection was invalid.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="CONNECT_TIMEOUT" value="6">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The connection attempt to the VPN service timed out.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="SERVICE_START_TIMEOUT" value="7">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          A timeout occurred while starting the service providing the VPN connection.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="SERVICE_START_FAILED" value="8">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Starting the service starting the service providing the VPN connection failed.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="NO_SECRETS" value="9">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Necessary secrets for the VPN connection were not provided.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="LOGIN_FAILED" value="10">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Authentication to the VPN server failed.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="CONNECTION_REMOVED" value="11">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The connection was deleted from settings.
-        " />
-      </tp:enumvalue>
-    </tp:enum>
   </interface>
 </node>
-
diff --git a/introspection/nm-vpn-plugin.xml b/introspection/nm-vpn-plugin.xml
index ee8c69f8bf..063b842c7c 100644
--- a/introspection/nm-vpn-plugin.xml
+++ b/introspection/nm-vpn-plugin.xml
@@ -1,313 +1,203 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
+<node name="/">
 
-<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+  <!--
+      org.freedesktop.NetworkManager.VPN.Plugin:
+
+      This interface is provided by plugins providing VPN services to the
+      NetworkManager daemon.
+  -->
   <interface name="org.freedesktop.NetworkManager.VPN.Plugin">
     <annotation name="org.gtk.GDBus.C.Name" value="VpnPlugin"/>
 
-    <annotation name="org.gtk.GDBus.DocString" value="
-      This interface is provided by plugins providing VPN services to the NetworkManager daemon.
-    " />
+    <!--
+        Connect:
+        @connection: Describes the connection to be established.
 
-    <method name="Connect">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        Tells the plugin to connect.  Interactive secrets requests (eg, emitting
+        Tells the plugin to connect. Interactive secrets requests (eg, emitting
         the SecretsRequired signal) are not allowed.
-      " />
+    -->
+    <method name="Connect">
       <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_vpn_plugin_connect"/>
-      <arg name="connection" type="a{sa{sv}}" direction="in" tp:type="String_String_Variant_Map_Map">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Describes the connection to be established.
-        " />
-      </arg>
-      <tp:possible-errors>
-        <tp:error name="org.freedesktop.NetworkManager.VPN.Error.StartingInProgress"/>
-        <tp:error name="org.freedesktop.NetworkManager.VPN.Error.AlreadyStarted"/>
-        <tp:error name="org.freedesktop.NetworkManager.VPN.Error.StoppingInProgress"/>
-        <tp:error name="org.freedesktop.NetworkManager.VPN.Error.BadArguments"/>
-        <tp:error name="org.freedesktop.NetworkManager.VPN.Error.LaunchFailed"/>
-        <tp:error name="org.freedesktop.NetworkManager.VPN.Error.WrongState"/>
-      </tp:possible-errors>
+      <arg name="connection" type="a{sa{sv}}" direction="in"/>
     </method>
 
+    <!--
+        ConnectInteractive:
+        @connection: Describes the connection to be established.
+        @details: Additional details about the Connect process.
+
+        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).
+    -->
     <method name="ConnectInteractive">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        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).
-      " />
       <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_vpn_plugin_connect_interactive"/>
-      <arg name="connection" type="a{sa{sv}}" direction="in" tp:type="String_String_Variant_Map_Map">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Describes the connection to be established.
-        " />
-      </arg>
-      <arg name="details" type="a{sv}" direction="in" tp:type="String_Variant_Map">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Additional details about the Connect process.
-        " />
-      </arg>
-      <tp:possible-errors>
-        <tp:error name="org.freedesktop.NetworkManager.VPN.Error.StartingInProgress"/>
-        <tp:error name="org.freedesktop.NetworkManager.VPN.Error.AlreadyStarted"/>
-        <tp:error name="org.freedesktop.NetworkManager.VPN.Error.StoppingInProgress"/>
-        <tp:error name="org.freedesktop.NetworkManager.VPN.Error.BadArguments"/>
-        <tp:error name="org.freedesktop.NetworkManager.VPN.Error.LaunchFailed"/>
-        <tp:error name="org.freedesktop.NetworkManager.VPN.Error.WrongState"/>
-        <tp:error name="org.freedesktop.NetworkManager.VPN.Error.InteractiveNotSupported"/>
-      </tp:possible-errors>
+      <arg name="connection" type="a{sa{sv}}" direction="in"/>
+      <arg name="details" type="a{sv}" direction="in"/>
     </method>
 
+    <!--
+        NeedSecrets:
+        @settings: Describes the connection that may need secrets.
+        @setting_name: The setting name within the provided connection that requires secrets, if any.
+
+        Asks the plugin whether the provided connection will require secrets to
+        connect successfully.
+    -->
     <method name="NeedSecrets">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        Asks the plugin whether the provided connection will require secrets to connect successfully.
-      " />
       <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_vpn_plugin_need_secrets"/>
-      <arg name="settings" type="a{sa{sv}}" direction="in" tp:type="String_String_Variant_Map_Map">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Describes the connection that may need secrets.
-        " />
-      </arg>
-      <arg name="setting_name" type="s" direction="out">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The setting name within the provided connection that requires secrets, if any.
-        " />
-      </arg>
-      <tp:possible-errors>
-        <tp:error name="org.freedesktop.NetworkManager.VPN.Error.ConnectionInvalid"/>
-      </tp:possible-errors>
+      <arg name="settings" type="a{sa{sv}}" direction="in"/>
+      <arg name="setting_name" type="s" direction="out"/>
     </method>
 
-    <method name="Disconnect">
-      <annotation name="org.gtk.GDBus.DocString" value="
+    <!--
+        Disconnect:
+
         Disconnect the plugin.
-      " />
+    -->
+    <method name="Disconnect">
       <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_vpn_plugin_disconnect"/>
-      <tp:possible-errors>
-        <tp:error name="org.freedesktop.NetworkManager.VPN.Error.StoppingInProgress"/>
-        <tp:error name="org.freedesktop.NetworkManager.VPN.Error.AlreadyStopped"/>
-      </tp:possible-errors>
     </method>
 
-    <method name="SetConfig">
-      <annotation name="org.gtk.GDBus.DocString" value="
+    <!--
+        SetConfig:
+        @config: Generic configuration details for the connection.
+
         Set generic connection details on the connection.
-      " />
+    -->
+    <method name="SetConfig">
       <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_vpn_plugin_set_config"/>
-      <arg name="config" type="a{sv}" direction="in" tp:type="String_Variant_Map">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Generic configuration details for the connection.
-        " />
-      </arg>
+      <arg name="config" type="a{sv}" direction="in"/>
     </method>
 
-    <method name="SetIp4Config">
-      <annotation name="org.gtk.GDBus.DocString" value="
+    <!--
+        SetIp4Config:
+        @config: Ip4Config details for the connection. You must call SetConfig() before calling this.
+
         Set IPv4 details on the connection.
-      " />
+    -->
+    <method name="SetIp4Config">
       <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_vpn_plugin_set_ip4_config"/>
-      <arg name="config" type="a{sv}" direction="in" tp:type="String_Variant_Map">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Ip4Config details for the connection. You must call
-	  SetConfig() before calling this.
-        " />
-      </arg>
+      <arg name="config" type="a{sv}" direction="in"/>
     </method>
 
-    <method name="SetIp6Config">
-      <annotation name="org.gtk.GDBus.DocString" value="
+    <!--
+        SetIp6Config:
+        @config: Ip6Config details for the connection. You must call SetConfig() before calling this.
+
         Set IPv6 details on the connection.
-      " />
+    -->
+    <method name="SetIp6Config">
       <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_vpn_plugin_set_ip6_config"/>
-      <arg name="config" type="a{sv}" direction="in" tp:type="String_Variant_Map">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Ip6Config details for the connection. You must call
-	  SetConfig() before calling this.
-        " />
-      </arg>
+      <arg name="config" type="a{sv}" direction="in"/>
     </method>
 
-    <method name="SetFailure">
-      <annotation name="org.gtk.GDBus.DocString" value="
+    <!--
+        SetFailure:
+        @reason: The reason for the failure.
+
         Indicate a failure to the plugin.
-      " />
+    -->
+    <method name="SetFailure">
       <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_vpn_plugin_set_failure"/>
-      <arg name="reason" type="s" direction="in">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The reason for the failure.
-        " />
-      </arg>
+      <arg name="reason" type="s" direction="in"/>
     </method>
 
-    <property name="State" type="u" access="read" tp:type="NM_VPN_SERVICE_STATE">
-      <annotation name="org.gtk.GDBus.DocString" value="
+    <!--
+        State:
+
         The state of the plugin.
-      " />
-    </property>
 
-    <signal name="StateChanged">
-      <annotation name="org.gtk.GDBus.DocString" value="
+        Returns: #NMVpnServiceState
+    -->
+    <property name="State" type="u" access="read"/>
+
+    <!--
+        StateChanged:
+        @state: (#NMVpnServiceState) The new state of the plugin.
+
         Emitted when the plugin state changes.
-      " />
-      <arg name="state" type="u" tp:type="NM_VPN_SERVICE_STATE">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The new state of the plugin.
-        " />
-      </arg>
+    -->
+    <signal name="StateChanged">
+      <arg name="state" type="u"/>
     </signal>
 
+    <!--
+        SecretsRequired:
+        @message: 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.
+        @secrets: 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.
+
+        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.
+    -->
     <signal name="SecretsRequired">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        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.
-      " />
-      <arg name="message" type="s" direction="out">
-          <annotation name="org.gtk.GDBus.DocString" value="
-              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.
-          " />
-      </arg>
-      <arg name="secrets" type="as" direction="out">
-          <annotation name="org.gtk.GDBus.DocString" value="
-              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.
-          " />
-      </arg>
+      <arg name="message" type="s" direction="out"/>
+      <arg name="secrets" type="as" direction="out"/>
     </signal>
 
-    <method name="NewSecrets">
-      <annotation name="org.gtk.GDBus.DocString" value="
+    <!--
+        NewSecrets:
+        @connection: Describes the connection including the new secrets.
+
         Called in response to a SecretsRequired signal to deliver updated secrets
         or other information to the plugin.
-      " />
+    -->
+    <method name="NewSecrets">
       <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_vpn_plugin_new_secrets"/>
-      <arg name="connection" type="a{sa{sv}}" direction="in" tp:type="String_String_Variant_Map_Map">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Describes the connection including the new secrets.
-        " />
-      </arg>
-      <tp:possible-errors>
-        <tp:error name="org.freedesktop.NetworkManager.VPN.Error.WrongState"/>
-        <tp:error name="org.freedesktop.NetworkManager.VPN.Error.BadArguments"/>
-        <tp:error name="org.freedesktop.NetworkManager.VPN.Error.LaunchFailed"/>
-        <tp:error name="org.freedesktop.NetworkManager.VPN.Error.InteractiveNotSupported"/>
-      </tp:possible-errors>
+      <arg name="connection" type="a{sa{sv}}" direction="in"/>
     </method>
 
-    <signal name="Config">
-      <annotation name="org.gtk.GDBus.DocString" value="
+    <!--
+        Config:
+        @config: The configuration information.
+
         The plugin obtained generic configuration information.
-      " />
-      <arg name="config" type="a{sv}" tp:type="String_Variant_Map">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The configuration information.
-        " />
-      </arg>
+    -->
+    <signal name="Config">
+      <arg name="config" type="a{sv}"/>
     </signal>
 
-    <signal name="Ip4Config">
-      <annotation name="org.gtk.GDBus.DocString" value="
+    <!--
+        Ip4Config:
+        @ip4config: The IPv4 configuration.
+
         The plugin obtained an IPv4 configuration.
-      " />
-      <arg name="ip4config" type="a{sv}" tp:type="String_Variant_Map">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The IPv4 configuration.
-        " />
-      </arg>
+    -->
+    <signal name="Ip4Config">
+      <arg name="ip4config" type="a{sv}"/>
     </signal>
 
-    <signal name="Ip6Config">
-      <annotation name="org.gtk.GDBus.DocString" value="
+    <!--
+        Ip6Config:
+        @ip6config: The IPv6 configuration.
+
         The plugin obtained an IPv6 configuration.
-      " />
-      <arg name="ip6config" type="a{sv}" tp:type="String_Variant_Map">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The IPv6 configuration.
-        " />
-      </arg>
+    -->
+    <signal name="Ip6Config">
+      <arg name="ip6config" type="a{sv}"/>
     </signal>
 
-    <signal name="LoginBanner">
-      <annotation name="org.gtk.GDBus.DocString" value="
+    <!--
+        LoginBanner:
+        @banner: The login banner string.
+
         Emitted when the plugin receives a login banner from the VPN service.
-      " />
-      <arg name="banner" type="s">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The login banner string.
-        " />
-      </arg>
+    -->
+    <signal name="LoginBanner">
+      <arg name="banner" type="s"/>
     </signal>
 
-    <signal name="Failure">
-      <annotation name="org.gtk.GDBus.DocString" value="
+    <!--
+        Failure:
+        @reason: (#NMVpnPluginFailure) Reason code for the failure.
+
         Emitted when a failure in the VPN plugin occurs.
-      " />
-      <arg name="reason" type="u" tp:type="NM_VPN_PLUGIN_FAILURE">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Reason code for the failure.
-        " />
-      </arg>
+    -->
+    <signal name="Failure">
+      <arg name="reason" type="u"/>
     </signal>
 
-    <tp:enum name="NM_VPN_SERVICE_STATE" type="u">
-      <tp:enumvalue suffix="UNKNOWN" value="0">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The state of the VPN plugin is unknown.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="INIT" value="1">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The VPN plugin is initialized.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="SHUTDOWN" value="2">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          (Not used.)
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="STARTING" value="3">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The plugin is attempting to connect to a VPN server.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="STARTED" value="4">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The plugin has connected to a VPN server.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="STOPPING" value="5">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The plugin is disconnecting from the VPN server.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="STOPPED" value="6">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The plugin has disconnected from the VPN server.
-        " />
-      </tp:enumvalue>
-    </tp:enum>
-
-    <tp:enum name="NM_VPN_PLUGIN_FAILURE" type="u">
-      <tp:enumvalue suffix="LOGIN_FAILED" value="0">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Login failed.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="CONNECT_FAILED" value="1">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Connect failed.
-        " />
-      </tp:enumvalue>
-      <tp:enumvalue suffix="BAD_IP_CONFIG" value="2">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Invalid IP configuration returned from the VPN plugin.
-        " />
-      </tp:enumvalue>
-    </tp:enum>
-
   </interface>
 </node>
diff --git a/introspection/nm-wimax-nsp.xml b/introspection/nm-wimax-nsp.xml
index 6174ad6738..b655e02f77 100644
--- a/introspection/nm-wimax-nsp.xml
+++ b/introspection/nm-wimax-nsp.xml
@@ -1,44 +1,37 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+<?xml version="1.0" encoding="UTF-8"?>
+<node name="/">
   <interface name="org.freedesktop.NetworkManager.WiMax.Nsp">
 
-    <property name="Name" type="s" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="The name of the NSP." />
-    </property>
-    <property name="SignalQuality" type="u" access="read">
-      <annotation name="org.gtk.GDBus.DocString" value="The current signal quality of the NSP, in percent." />
-    </property>
-    <property name="NetworkType" type="u" access="read" tp:type="NM_WIMAX_NSP_NETWORK_TYPE">
-      <annotation name="org.gtk.GDBus.DocString" value="The network type of the NSP." />
-    </property>
+    <!--
+        Name:
 
+        The name of the NSP.
+    -->
+    <property name="Name" type="s" access="read"/>
+
+    <!--
+        SignalQuality:
+
+        The current signal quality of the NSP, in percent.
+    -->
+    <property name="SignalQuality" type="u" access="read"/>
+
+    <!--
+        NetworkType:
+
+        The network type of the NSP.
+
+        Returns: #NMWimaxNspNetworkType
+    -->
+    <property name="NetworkType" type="u" access="read"/>
+
+    <!--
+        PropertiesChanged:
+        @properties: A dictionary mapping property names to variant boxed values.
+    -->
     <signal name="PropertiesChanged">
-        <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
-            <annotation name="org.gtk.GDBus.DocString" value="
-                A dictionary mapping property names to variant boxed values.
-            " />
-        </arg>
+        <arg name="properties" type="a{sv}"/>
     </signal>
 
-    <tp:flags name="NM_WIMAX_NSP_NETWORK_TYPE" value-prefix="NM_WIMAX_NSP_NETWORK_TYPE" type="u">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        Network type of the NSP.
-      " />
-      <tp:flag suffix="UNKNOWN" value="0x0">
-        <annotation name="org.gtk.GDBus.DocString" value="Unknown network." />
-      </tp:flag>
-      <tp:flag suffix="HOME" value="0x1">
-        <annotation name="org.gtk.GDBus.DocString" value="Home network." />
-      </tp:flag>
-      <tp:flag suffix="PARTNER" value="0x2">
-        <annotation name="org.gtk.GDBus.DocString" value="Partner network." />
-      </tp:flag>
-      <tp:flag suffix="ROAMING_PARTNER" value="0x3">
-        <annotation name="org.gtk.GDBus.DocString" value="Roaming partner network." />
-      </tp:flag>
-
-    </tp:flags>
-
   </interface>
 </node>
diff --git a/src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.xml b/src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.xml
index c2a6cb34ea..fa9ba1c52b 100644
--- a/src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.xml
+++ b/src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.xml
@@ -1,30 +1,26 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
+<node name="/">
 
-<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
-    <interface name="com.redhat.ifcfgrh1">
-      <annotation name="org.gtk.GDBus.DocString" value="
-          Utility methods for handling NM integration with standard Red Hat ifcfg files.
-      " />
+  <!--
+      com.redhat.ifcfgrh1:
 
-      <method name="GetIfcfgDetails">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Given an ifcfg file, return various internal information about it.
-        " />
-        <arg name="ifcfg" type="s" direction="in">
-          <annotation name="org.gtk.GDBus.DocString" value="
-            The full path to an ifcfg file.
-          " />
-        </arg>
-        <arg name="uuid" type="s" direction="out">
-          <annotation name="org.gtk.GDBus.DocString" value="
-            The UUID of the NM connection backed by this ifcfg file.  If the ifcfg file does not contain a UUID tag, this UUID is generated by NM, otherwise the UUID from the ifcfg file is used.
-          " />
-        </arg>
-        <arg name="path" type="o" direction="out">
-          <annotation name="org.gtk.GDBus.DocString" value="
-            The object path of the NM connected backed by this ifcfg file.
-          " />
-        </arg>
+      Utility methods for handling NM integration with standard Red Hat ifcfg
+      files.
+  -->
+  <interface name="com.redhat.ifcfgrh1">
+
+    <!--
+        GetIfcfgDetails:
+        @ifcfg: The full path to an ifcfg file.
+        @uuid: The UUID of the NM connection backed by this ifcfg file. If the ifcfg file does not contain a UUID tag, this UUID is generated by NM, otherwise the UUID from the ifcfg file is used.
+        @path: The object path of the NM connected backed by this ifcfg file.
+
+        Given an ifcfg file, return various internal information about it.
+    -->
+    <method name="GetIfcfgDetails">
+        <arg name="ifcfg" type="s" direction="in"/>
+        <arg name="uuid" type="s" direction="out"/>
+        <arg name="path" type="o" direction="out"/>
       </method>
     </interface>
 </node>