diff --git a/callouts/nm-dispatcher.xml b/callouts/nm-dispatcher.xml
index b2c4a21aec..e2e89a89ad 100644
--- a/callouts/nm-dispatcher.xml
+++ b/callouts/nm-dispatcher.xml
@@ -5,87 +5,87 @@
     <annotation name="org.gtk.GDBus.C.Name" value="Dispatcher"/>
 
     <method name="Action">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         INTERNAL; not public API.  Perform an action.
-      </tp:docstring>
+      " />
 
       <arg name="action" type="s" direction="in">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The action being performed.
-        </tp:docstring>
+        " />
       </arg>
 
       <arg name="connection" type="a{sa{sv}}" direction="in">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The connection for which this action was triggered.
-        </tp:docstring>
+        " />
       </arg>
 
       <arg name="connection_properties" type="a{sv}" direction="in">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           Properties of the connection, including service and path.
-        </tp:docstring>
+        " />
       </arg>
 
       <arg name="device_properties" type="a{sv}" direction="in">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           Properties of the device, including type, path, interface, and state.
-        </tp:docstring>
+        " />
       </arg>
 
       <arg name="device_ip4_config" type="a{sv}" direction="in">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           Properties of the device's IPv4 configuration.
-        </tp:docstring>
+        " />
       </arg>
 
       <arg name="device_ip6_config" type="a{sv}" direction="in">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           Properties of the device's IPv6 configuration.
-        </tp:docstring>
+        " />
       </arg>
 
       <arg name="device_dhcp4_config" type="a{sv}" direction="in">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           Properties of the device's DHCPv4 configuration.
-        </tp:docstring>
+        " />
       </arg>
 
       <arg name="device_dhcp6_config" type="a{sv}" direction="in">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           Properties of the device's DHCPv6 configuration.
-        </tp:docstring>
+        " />
       </arg>
 
       <arg name="vpn_ip_iface" type="s" direction="in">
-        <tp:docstring>VPN interface name.</tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="VPN interface name." />
       </arg>
 
       <arg name="vpn_ip4_config" type="a{sv}" direction="in">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           Properties of the VPN's IPv4 configuration.
-        </tp:docstring>
+        " />
       </arg>
 
       <arg name="vpn_ip6_config" type="a{sv}" direction="in">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           Properties of the VPN's IPv6 configuration.
-        </tp:docstring>
+        " />
       </arg>
 
       <arg name="debug" type="b" direction="in">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           Whether to log debug output.
-        </tp:docstring>
+        " />
       </arg>
 
       <arg name="results" type="a(sus)" direction="out">
-        <tp:docstring>
+        <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).
-        </tp:docstring>
+        " />
       </arg>
 
     </method>
diff --git a/introspection/errors.xml b/introspection/errors.xml
index f2db86679f..34a0a7b96f 100644
--- a/introspection/errors.xml
+++ b/introspection/errors.xml
@@ -4,21 +4,21 @@
   <tp:copyright>Copyright (C) 2008 Novell, Inc.</tp:copyright>
 
   <tp:error name="Unknown Connection">
-    <tp:docstring>
+    <annotation name="org.gtk.GDBus.DocString" value="
         Connection was not provided by the settings service.
-    </tp:docstring>
+    " />
   </tp:error>
 
   <tp:error name="Unknown Device">
-    <tp:docstring>
+    <annotation name="org.gtk.GDBus.DocString" value="
         Unknown device.
-    </tp:docstring>
+    " />
   </tp:error>
 
   <tp:error name="Permission Denied">
-    <tp:docstring>
+    <annotation name="org.gtk.GDBus.DocString" value="
     User does not have the permission to activate this connection.
-    </tp:docstring>
+    " />
   </tp:error>
 
 </tp:errors>
diff --git a/introspection/generic-types.xml b/introspection/generic-types.xml
index 681b6662b7..2fb680af92 100644
--- a/introspection/generic-types.xml
+++ b/introspection/generic-types.xml
@@ -1,50 +1,50 @@
 <tp:generic-types
   xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <tp:mapping name="String_Variant_Map">
-    <tp:docstring>A mapping from strings to variants representing extra
-      key-value pairs.</tp:docstring>
+    <annotation name="org.gtk.GDBus.DocString" value="A mapping from strings to variants representing extra
+      key-value pairs." />
     <tp:member type="s" name="Key"/>
     <tp:member type="v" name="Value"/>
   </tp:mapping>
 
   <tp:mapping name="String_String_Map">
-    <tp:docstring>A mapping from strings to strings representing extra
-      key-value pairs.</tp:docstring>
+    <annotation name="org.gtk.GDBus.DocString" value="A mapping from strings to strings representing extra
+      key-value pairs." />
     <tp:member type="s" name="Key"/>
     <tp:member type="s" name="Value"/>
   </tp:mapping>
 
   <tp:mapping name="String_String_Variant_Map_Map">
-      <tp:docstring>A mapping from strings to a map of string to variant.</tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="A mapping from strings to a map of string to variant." />
       <tp:member type="s" name="Key"/>
       <tp:member type="a{sv}" name="Value" tp:type="String_Variant_Map"/>
   </tp:mapping>
 
   <tp:enum name="NM_802_11_MODE" type="u">
-    <tp:docstring></tp:docstring>
+    <annotation name="org.gtk.GDBus.DocString" value="" />
     <tp:enumvalue suffix="UNKNOWN" value="0">
-      <tp:docstring>Mode is unknown.</tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="Mode is unknown." />
     </tp:enumvalue>
     <tp:enumvalue suffix="ADHOC" value="1">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         For both devices and access point objects, indicates the object is
         part of an Ad-Hoc 802.11 network without a central coordinating access
         point.
-      </tp:docstring>
+      " />
     </tp:enumvalue>
     <tp:enumvalue suffix="INFRA" value="2">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         The wireless device or access point is in infrastructure mode.  For
         devices, this indicates the device is an 802.11 client/station.  For
         access point objects, this indicates the object is an access point that
         provides connectivity to clients.
-      </tp:docstring>
+      " />
     </tp:enumvalue>
     <tp:enumvalue suffix="AP" value="3">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         The device is an access point/hotspot.  Not valid for access point
         objects themselves.
-      </tp:docstring>
+      " />
     </tp:enumvalue>
   </tp:enum>
 </tp:generic-types>
diff --git a/introspection/nm-access-point.xml b/introspection/nm-access-point.xml
index 16eae04476..603be7132e 100644
--- a/introspection/nm-access-point.xml
+++ b/introspection/nm-access-point.xml
@@ -3,99 +3,99 @@
 <node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <interface name="org.freedesktop.NetworkManager.AccessPoint">
     <property name="Flags" type="u" access="read" tp:type="NM_802_11_AP_FLAGS">
-      <tp:docstring>Flags describing the capabilities of the access point.</tp:docstring>
+      <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">
-      <tp:docstring>Flags describing the access point's capabilities according to WPA (Wifi Protected Access).</tp:docstring>
+      <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">
-      <tp:docstring>Flags describing the access point's capabilities according to the RSN (Robust Secure Network) protocol.</tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="Flags describing the access point's capabilities according to the RSN (Robust Secure Network) protocol." />
     </property>
     <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"/>
-      <tp:docstring>The Service Set Identifier identifying the access point.</tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="The Service Set Identifier identifying the access point." />
     </property>
     <property name="Frequency" type="u" access="read">
-      <tp:docstring>The radio channel frequency in use by the access point, in MHz.</tp:docstring>
+      <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">
-      <tp:docstring>The hardware address (BSSID) of the access point.</tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="The hardware address (BSSID) of the access point." />
     </property>
 
     <property name="Mode" type="u" access="read" tp:type="NM_802_11_MODE">
-      <tp:docstring>Describes the operating mode of the access point.</tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="Describes the operating mode of the access point." />
     </property>
     <property name="MaxBitrate" type="u" access="read">
-      <tp:docstring>The maximum bitrate this access point is capable of, in kilobits/second (Kb/s).</tp:docstring>
+      <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">
-      <tp:docstring>The current signal quality of the access point, in percent.</tp:docstring>
+      <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">
-      <tp:docstring>
+      <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.
-      </tp:docstring>
+      " />
     </property>
 
     <signal name="PropertiesChanged">
         <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
-            <tp:docstring>
+            <annotation name="org.gtk.GDBus.DocString" value="
                 A dictionary mapping property names to variant boxed values
-            </tp:docstring>
+            " />
         </arg>
     </signal>
     <tp:flags name="NM_802_11_AP_FLAGS" value-prefix="NM_802_11_AP_FLAGS" type="u">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Flags describing the general capabilities of the access point.
-      </tp:docstring>
+      " />
       <tp:flag suffix="NONE" value="0x0">
-        <tp:docstring>Null capability - says nothing about the access point.</tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="Null capability - says nothing about the access point." />
       </tp:flag>
       <tp:flag suffix="PRIVACY" value="0x1">
-        <tp:docstring>Access point supports privacy measures.</tp:docstring>
+        <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">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Flags describing the security capabilities of the access point.
-      </tp:docstring>
+      " />
       <tp:flag suffix="NONE" value="0x0">
-        <tp:docstring>Null flag.</tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="Null flag." />
       </tp:flag>
       <tp:flag suffix="PAIR_WEP40" value="0x1">
-        <tp:docstring>Access point supports pairwise 40-bit WEP encryption.</tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="Access point supports pairwise 40-bit WEP encryption." />
       </tp:flag>
       <tp:flag suffix="PAIR_WEP104" value="0x2">
-        <tp:docstring>Access point supports pairwise 104-bit WEP encryption.</tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="Access point supports pairwise 104-bit WEP encryption." />
       </tp:flag>
       <tp:flag suffix="PAIR_TKIP" value="0x4">
-        <tp:docstring>Access point supports pairwise TKIP encryption.</tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="Access point supports pairwise TKIP encryption." />
       </tp:flag>
       <tp:flag suffix="PAIR_CCMP" value="0x8">
-        <tp:docstring>Access point supports pairwise CCMP encryption.</tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="Access point supports pairwise CCMP encryption." />
       </tp:flag>
       <tp:flag suffix="GROUP_WEP40" value="0x10">
-        <tp:docstring>Access point supports a group 40-bit WEP cipher.</tp:docstring>
+        <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">
-        <tp:docstring>Access point supports a group 104-bit WEP cipher.</tp:docstring>
+        <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">
-        <tp:docstring>Access point supports a group TKIP cipher.</tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="Access point supports a group TKIP cipher." />
       </tp:flag>
       <tp:flag suffix="GROUP_CCMP" value="0x80">
-        <tp:docstring>Access point supports a group CCMP cipher.</tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="Access point supports a group CCMP cipher." />
       </tp:flag>
       <tp:flag suffix="KEY_MGMT_PSK" value="0x100">
-        <tp:docstring>Access point supports PSK key management.</tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="Access point supports PSK key management." />
       </tp:flag>
       <tp:flag suffix="KEY_MGMT_802_1X" value="0x200">
-        <tp:docstring>Access point supports 802.1x key management.</tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="Access point supports 802.1x key management." />
       </tp:flag>
     </tp:flags>
   </interface>
diff --git a/introspection/nm-active-connection.xml b/introspection/nm-active-connection.xml
index 203437b7cc..59bf78f4d0 100644
--- a/introspection/nm-active-connection.xml
+++ b/introspection/nm-active-connection.xml
@@ -3,12 +3,12 @@
 <node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <interface name="org.freedesktop.NetworkManager.Connection.Active">
     <annotation name="org.gtk.GDBus.C.Name" value="ActiveConnection"/>
-    <tp:docstring>
+    <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
-      "default" or preferred network for access.
+      &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.
@@ -18,135 +18,135 @@
       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.
-    </tp:docstring>
+    " />
 
     <property name="Connection" type="o" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         The path of the connection.
-      </tp:docstring>
+      " />
     </property>
     <property name="SpecificObject" type="o" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         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.
-      </tp:docstring>
+      " />
     </property>
     <property name="Id" type="s" access="read">
-      <tp:docstring>
+      <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.
-      </tp:docstring>
+      " />
     </property>
     <property name="Uuid" type="s" access="read">
-      <tp:docstring>
+      <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.
-      </tp:docstring>
+      " />
     </property>
     <property name="Type" type="s" access="read">
-      <tp:docstring>
+      <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.
-      </tp:docstring>
+      " />
     </property>
     <property name="Devices" type="ao" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Array of object paths representing devices which are part of this active
         connection.
-      </tp:docstring>
+      " />
     </property>
     <property name="State" type="u" access="read" tp:type="NM_ACTIVE_CONNECTION_STATE">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         The state of this active connection.
-      </tp:docstring>
+      " />
     </property>
     <property name="Default" type="b" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Whether this active connection is the default IPv4 connection, i.e.
         whether it currently owns the default IPv4 route.
-      </tp:docstring>
+      " />
     </property>
     <property name="Ip4Config" type="o" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         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.
-      </tp:docstring>
+      " />
     </property>
     <property name="Dhcp4Config" type="o" access="read">
-      <tp:docstring>
+      <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.
-      </tp:docstring>
+      " />
     </property>
     <property name="Default6" type="b" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Whether this active connection is the default IPv6 connection, i.e.
         whether it currently owns the default IPv6 route.
-      </tp:docstring>
+      " />
     </property>
     <property name="Ip6Config" type="o" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         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.
-      </tp:docstring>
+      " />
     </property>
     <property name="Dhcp6Config" type="o" access="read">
-      <tp:docstring>
+      <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.
-      </tp:docstring>
+      " />
     </property>
     <property name="Vpn" type="b" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Whether this active connection is also a VPN connection.
-      </tp:docstring>
+      " />
     </property>
     <property name="Master" type="o" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         The path to the master device if the connection is a slave.
-      </tp:docstring>
+      " />
     </property>
 
     <signal name="PropertiesChanged">
         <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
-            <tp:docstring>
+            <annotation name="org.gtk.GDBus.DocString" value="
                 A dictionary mapping property names to variant boxed values
-            </tp:docstring>
+            " />
         </arg>
     </signal>
 
     <tp:enum name="NM_ACTIVE_CONNECTION_STATE" type="u">
       <tp:enumvalue suffix="UNKNOWN" value="0">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The active connection is in an unknown state.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="ACTIVATING" value="1">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The connection is activating.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="ACTIVATED" value="2">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The connection is activated.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="DEACTIVATING" value="3">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The connection is being torn down and cleaned up.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="DEACTIVATED" value="4">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The connection is no longer active.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
     </tp:enum>
   </interface>
diff --git a/introspection/nm-agent-manager.xml b/introspection/nm-agent-manager.xml
index 4b53675cfd..52460eeeec 100644
--- a/introspection/nm-agent-manager.xml
+++ b/introspection/nm-agent-manager.xml
@@ -4,45 +4,45 @@
   <interface name="org.freedesktop.NetworkManager.AgentManager">
 
     <method name="Register">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Called by secret Agents to register their ability to provide and save
         network secrets.
-      </tp:docstring>
+      " />
       <arg name="identifier" type="s" direction="in">
-        <tp:docstring>
+        <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 "[A-Z][a-z][0-9]_-." and the
+          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).
-        </tp:docstring>
+        " />
       </arg>
     </method>
 
     <method name="RegisterWithCapabilities">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Like Register() but indicates agent capabilities to NetworkManager.
-      </tp:docstring>
+      " />
       <arg name="identifier" type="s" direction="in">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
             See the Register() method's identifier argument.
-        </tp:docstring>
+        " />
       </arg>
       <arg name="capabilities" type="u" direction="in" tp:type="NM_SECRET_AGENT_CAPABILITIES">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
             Indicates various agent capabilities to NetworkManager.
-        </tp:docstring>
+        " />
       </arg>
     </method>
 
     <method name="Unregister">
-      <tp:docstring>
+      <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.
-      </tp:docstring>
+      " />
     </method>
 
   </interface>
diff --git a/introspection/nm-device-adsl.xml b/introspection/nm-device-adsl.xml
index ec50d11044..68859d3bea 100644
--- a/introspection/nm-device-adsl.xml
+++ b/introspection/nm-device-adsl.xml
@@ -5,16 +5,16 @@
 
     <signal name="PropertiesChanged">
         <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
-            <tp:docstring>
+            <annotation name="org.gtk.GDBus.DocString" value="
                 A dictionary mapping property names to variant boxed values
-            </tp:docstring>
+            " />
         </arg>
     </signal>
 
     <property name="Carrier" type="b" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Indicates whether the physical carrier is found.
-      </tp:docstring>
+      " />
     </property>
 
   </interface>
diff --git a/introspection/nm-device-bond.xml b/introspection/nm-device-bond.xml
index a804ca0b68..9bc21225a3 100644
--- a/introspection/nm-device-bond.xml
+++ b/introspection/nm-device-bond.xml
@@ -4,29 +4,29 @@
   <interface name="org.freedesktop.NetworkManager.Device.Bond">
 
     <property name="HwAddress" type="s" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Hardware address of the device.
-      </tp:docstring>
+      " />
     </property>
 
     <property name="Carrier" type="b" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Indicates whether the physical carrier is found (e.g. whether a cable is plugged in or not).
-      </tp:docstring>
+      " />
     </property>
 
     <property name="Slaves" type="ao" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Array of object paths representing devices which are currently
 	slaved to this device.
-      </tp:docstring>
+      " />
     </property>
 
     <signal name="PropertiesChanged">
         <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
-            <tp:docstring>
+            <annotation name="org.gtk.GDBus.DocString" value="
                 A dictionary mapping property names to variant boxed values
-            </tp:docstring>
+            " />
         </arg>
     </signal>
 
diff --git a/introspection/nm-device-bridge.xml b/introspection/nm-device-bridge.xml
index f3b25602f0..6cf99a10c2 100644
--- a/introspection/nm-device-bridge.xml
+++ b/introspection/nm-device-bridge.xml
@@ -4,29 +4,29 @@
   <interface name="org.freedesktop.NetworkManager.Device.Bridge">
 
     <property name="HwAddress" type="s" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Hardware address of the device.
-      </tp:docstring>
+      " />
     </property>
 
     <property name="Carrier" type="b" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Indicates whether the physical carrier is found (e.g. whether a cable is plugged in or not).
-      </tp:docstring>
+      " />
     </property>
 
     <property name="Slaves" type="ao" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Array of object paths representing devices which are currently
 	slaved to this device.
-      </tp:docstring>
+      " />
     </property>
 
     <signal name="PropertiesChanged">
         <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
-            <tp:docstring>
+            <annotation name="org.gtk.GDBus.DocString" value="
                 A dictionary mapping property names to variant boxed values
-            </tp:docstring>
+            " />
         </arg>
     </signal>
 
diff --git a/introspection/nm-device-bt.xml b/introspection/nm-device-bt.xml
index cc4a9b544a..3b487158e8 100644
--- a/introspection/nm-device-bt.xml
+++ b/introspection/nm-device-bt.xml
@@ -4,43 +4,43 @@
   <interface name="org.freedesktop.NetworkManager.Device.Bluetooth">
 
     <property name="HwAddress" type="s" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Bluetooth hardware address of the device.
-      </tp:docstring>
+      " />
     </property>
 
     <property name="Name" type="s" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Bluetooth name of the device.
-      </tp:docstring>
+      " />
     </property>
 
     <property name="BtCapabilities" type="u" access="read" tp:type="NM_BT_CAPABILITIES">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Bluetooth capabilities of the device (either DUN or NAP).
-      </tp:docstring>
+      " />
     </property>
 
     <signal name="PropertiesChanged">
         <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
-            <tp:docstring>
+            <annotation name="org.gtk.GDBus.DocString" value="
                 A dictionary mapping property names to variant boxed values
-            </tp:docstring>
+            " />
         </arg>
     </signal>
 
     <tp:flags name="NM_BT_CAPABILITIES" value-prefix="NM_BT_CAPABILITY" type="u">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Flags describing the capabilities of a Bluetooth device.
-      </tp:docstring>
+      " />
       <tp:flag suffix="NONE" value="0x0">
-        <tp:docstring>The device has no recognized capabilities.</tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="The device has no recognized capabilities." />
       </tp:flag>
       <tp:flag suffix="DUN" value="0x1">
-        <tp:docstring>The device supports Bluetooth Dial-Up Networking.</tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="The device supports Bluetooth Dial-Up Networking." />
       </tp:flag>
       <tp:flag suffix="PAN" value="0x2">
-        <tp:docstring>The device supports Bluetooth Personal Area Networking.</tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="The device supports Bluetooth Personal Area Networking." />
       </tp:flag>
     </tp:flags>
 
diff --git a/introspection/nm-device-ethernet.xml b/introspection/nm-device-ethernet.xml
index 86d68a35ab..87b7f755d6 100644
--- a/introspection/nm-device-ethernet.xml
+++ b/introspection/nm-device-ethernet.xml
@@ -5,40 +5,40 @@
     <annotation name="org.gtk.GDBus.C.Name" value="DeviceEthernet"/>
 
     <property name="HwAddress" type="s" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Active hardware address of the device.
-      </tp:docstring>
+      " />
     </property>
 
     <property name="PermHwAddress" type="s" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Permanent hardware address of the device.
-      </tp:docstring>
+      " />
     </property>
 
     <property name="Speed" type="u" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Design speed of the device, in megabits/second (Mb/s).
-      </tp:docstring>
+      " />
     </property>
 
     <property name="S390Subchannels" type="as" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Array of S/390 subchannels for S/390 or z/Architecture devices.
-      </tp:docstring>
+      " />
     </property>
 
     <property name="Carrier" type="b" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Indicates whether the physical carrier is found (e.g. whether a cable is plugged in or not).
-      </tp:docstring>
+      " />
     </property>
 
     <signal name="PropertiesChanged">
         <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
-            <tp:docstring>
+            <annotation name="org.gtk.GDBus.DocString" value="
                 A dictionary mapping property names to variant boxed values
-            </tp:docstring>
+            " />
         </arg>
     </signal>
 
diff --git a/introspection/nm-device-generic.xml b/introspection/nm-device-generic.xml
index 79d1989968..2f8fc7eead 100644
--- a/introspection/nm-device-generic.xml
+++ b/introspection/nm-device-generic.xml
@@ -4,22 +4,22 @@
   <interface name="org.freedesktop.NetworkManager.Device.Generic">
 
     <property name="HwAddress" type="s" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Hardware address of the device.
-      </tp:docstring>
+      " />
     </property>
 
     <property name="TypeDescription" type="s" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         A (non-localized) description of the interface type, if known.
-      </tp:docstring>
+      " />
     </property>
 
     <signal name="PropertiesChanged">
         <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
-            <tp:docstring>
+            <annotation name="org.gtk.GDBus.DocString" value="
                 A dictionary mapping property names to variant boxed values
-            </tp:docstring>
+            " />
         </arg>
     </signal>
 
diff --git a/introspection/nm-device-infiniband.xml b/introspection/nm-device-infiniband.xml
index 097714c69f..169c2c66cc 100644
--- a/introspection/nm-device-infiniband.xml
+++ b/introspection/nm-device-infiniband.xml
@@ -4,22 +4,22 @@
   <interface name="org.freedesktop.NetworkManager.Device.Infiniband">
 
     <property name="HwAddress" type="s" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Hardware address of the device.
-      </tp:docstring>
+      " />
     </property>
 
     <property name="Carrier" type="b" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Indicates whether the physical carrier is found (e.g. whether a cable is plugged in or not).
-      </tp:docstring>
+      " />
     </property>
 
     <signal name="PropertiesChanged">
         <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
-            <tp:docstring>
+            <annotation name="org.gtk.GDBus.DocString" value="
                 A dictionary mapping property names to variant boxed values
-            </tp:docstring>
+            " />
         </arg>
     </signal>
 
diff --git a/introspection/nm-device-ip-tunnel.xml b/introspection/nm-device-ip-tunnel.xml
index fcb42ce275..3ca04ee66c 100644
--- a/introspection/nm-device-ip-tunnel.xml
+++ b/introspection/nm-device-ip-tunnel.xml
@@ -4,81 +4,81 @@
   <interface name="org.freedesktop.NetworkManager.Device.IPTunnel">
 
     <property name="Mode" type="u" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         The tunneling mode.
-      </tp:docstring>
+      " />
     </property>
 
     <property name="Parent" type="o" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         The object path of the parent device.
-      </tp:docstring>
+      " />
     </property>
 
     <property name="Local" type="s" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         The local endpoint of the tunnel.
-      </tp:docstring>
+      " />
     </property>
 
     <property name="Remote" type="s" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         The remote endpoint of the tunnel.
-      </tp:docstring>
+      " />
     </property>
 
     <property name="Ttl" type="y" access="read">
-      <tp:docstring>
+      <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
-      </tp:docstring>
+      " />
     </property>
 
     <property name="Tos" type="y" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         The type of service (IPv4) or traffic class (IPv6) assigned to
         tunneled packets.
-      </tp:docstring>
+      " />
     </property>
 
     <property name="PathMtuDiscovery" type="b" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Whether path MTU discovery is enabled on this tunnel.
-      </tp:docstring>
+      " />
     </property>
 
     <property name="InputKey" type="s" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         The key used for incoming packets.
-      </tp:docstring>
+      " />
     </property>
 
     <property name="OutputKey" type="s" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         The key used for outgoing packets.
-      </tp:docstring>
+      " />
     </property>
 
     <property name="EncapsulationLimit" type="y" access="read">
-      <tp:docstring>
+      <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.
-      </tp:docstring>
+      " />
     </property>
 
     <property name="FlowLabel" type="u" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         The flow label to assign to tunnel packets. This property
         applies only to IPv6 tunnels.
-      </tp:docstring>
+      " />
     </property>
 
     <signal name="PropertiesChanged">
         <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
-            <tp:docstring>
+            <annotation name="org.gtk.GDBus.DocString" value="
                 A dictionary mapping property names to variant boxed values
-            </tp:docstring>
+            " />
         </arg>
     </signal>
 
diff --git a/introspection/nm-device-macvlan.xml b/introspection/nm-device-macvlan.xml
index c4dcb4e602..d5d66068df 100644
--- a/introspection/nm-device-macvlan.xml
+++ b/introspection/nm-device-macvlan.xml
@@ -4,34 +4,34 @@
   <interface name="org.freedesktop.NetworkManager.Device.Macvlan">
 
     <property name="Parent" type="o" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         The object path of the parent device.
-      </tp:docstring>
+      " />
     </property>
 
     <property name="Mode" type="s" access="read">
-      <tp:docstring>
-        The macvlan mode, one of "private", "vepa", "bridge", or "passthru".
-      </tp:docstring>
+      <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>
 
     <property name="NoPromisc" type="b" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Whether the device is blocked from going into promiscuous mode.
-      </tp:docstring>
+      " />
     </property>
 
     <property name="Tap" type="b" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Whether the device is a macvtap.
-      </tp:docstring>
+      " />
     </property>
 
     <signal name="PropertiesChanged">
         <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
-            <tp:docstring>
+            <annotation name="org.gtk.GDBus.DocString" value="
                 A dictionary mapping property names to variant boxed values
-            </tp:docstring>
+            " />
         </arg>
     </signal>
 
diff --git a/introspection/nm-device-modem.xml b/introspection/nm-device-modem.xml
index 0ca101fd74..67742c463d 100644
--- a/introspection/nm-device-modem.xml
+++ b/introspection/nm-device-modem.xml
@@ -5,58 +5,58 @@
 
     <signal name="PropertiesChanged">
         <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
-            <tp:docstring>
+            <annotation name="org.gtk.GDBus.DocString" value="
                 A dictionary mapping property names to variant boxed values
-            </tp:docstring>
+            " />
         </arg>
     </signal>
 
     <property name="ModemCapabilities" type="u" access="read" tp:type="NM_DEVICE_MODEM_CAPABILITIES">
-      <tp:docstring>
+      <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.
-      </tp:docstring>
+      " />
     </property>
 
     <property name="CurrentCapabilities" type="u" access="read" tp:type="NM_DEVICE_MODEM_CAPABILITIES">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         The generic family of access technologies the modem currently supports
         without a firmware reload or reinitialization.
-      </tp:docstring>
+      " />
     </property>
 
     <tp:flags name="NM_DEVICE_MODEM_CAPABILITIES" value-prefix="NM_DEVICE_MODEM_CAPABILITY" type="u">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Flags describing one or more of the general access technology families
         that a modem device supports.
-      </tp:docstring>
+      " />
       <tp:flag suffix="NONE" value="0x0">
-        <tp:docstring>Modem has no capabilties.</tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="Modem has no capabilties." />
       </tp:flag>
       <tp:flag suffix="POTS" value="0x1">
-        <tp:docstring>
+        <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:docstring>
+        " />
       </tp:flag>
       <tp:flag suffix="CDMA_EVDO" value="0x2">
-        <tp:docstring>
+        <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:docstring>
+        " />
       </tp:flag>
       <tp:flag suffix="GSM_UMTS" value="0x4">
-        <tp:docstring>
+        <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:docstring>
+        " />
       </tp:flag>
       <tp:flag suffix="LTE" value="0x8">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           Modem has at LTE data capability.
-        </tp:docstring>
+        " />
       </tp:flag>
     </tp:flags>
 
diff --git a/introspection/nm-device-olpc-mesh.xml b/introspection/nm-device-olpc-mesh.xml
index c30ecfc602..a92e73709a 100644
--- a/introspection/nm-device-olpc-mesh.xml
+++ b/introspection/nm-device-olpc-mesh.xml
@@ -3,32 +3,32 @@
 <node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <interface name="org.freedesktop.NetworkManager.Device.OlpcMesh">
     <property name="HwAddress" type="s" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         The hardware address of the device.
-      </tp:docstring>
+      " />
     </property>
 
     <property name="Companion" type="o" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         The object path of the companion device.
-      </tp:docstring>
+      " />
     </property>
 
     <property name="ActiveChannel" type="u" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         The currently active channel.
-      </tp:docstring>
+      " />
     </property>
 
     <signal name="PropertiesChanged">
         <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
-            <tp:docstring>
+            <annotation name="org.gtk.GDBus.DocString" value="
                 A dictionary containing the FIXME: check changed parameters.
-            </tp:docstring>
+            " />
         </arg>
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
             Emitted when the wireless device's properties changed.
-        </tp:docstring>
+        " />
     </signal>
   </interface>
 </node>
diff --git a/introspection/nm-device-team.xml b/introspection/nm-device-team.xml
index baf39fa860..982b767018 100644
--- a/introspection/nm-device-team.xml
+++ b/introspection/nm-device-team.xml
@@ -4,29 +4,29 @@
   <interface name="org.freedesktop.NetworkManager.Device.Team">
 
     <property name="HwAddress" type="s" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Hardware address of the device.
-      </tp:docstring>
+      " />
     </property>
 
     <property name="Carrier" type="b" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Indicates whether the physical carrier is found (e.g. whether a cable is plugged in or not).
-      </tp:docstring>
+      " />
     </property>
 
     <property name="Slaves" type="ao" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Array of object paths representing devices which are currently
 	slaved to this device.
-      </tp:docstring>
+      " />
     </property>
 
     <signal name="PropertiesChanged">
         <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
-            <tp:docstring>
+            <annotation name="org.gtk.GDBus.DocString" value="
                 A dictionary mapping property names to variant boxed values
-            </tp:docstring>
+            " />
         </arg>
     </signal>
 
diff --git a/introspection/nm-device-tun.xml b/introspection/nm-device-tun.xml
index 2b3ae2f521..0f74cf8c41 100644
--- a/introspection/nm-device-tun.xml
+++ b/introspection/nm-device-tun.xml
@@ -4,56 +4,56 @@
   <interface name="org.freedesktop.NetworkManager.Device.Tun">
 
     <property name="Owner" type="x" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         The uid of the tunnel owner, or -1 if it has no owner.
-      </tp:docstring>
+      " />
     </property>
 
     <property name="Group" type="x" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         The gid of the tunnel group, or -1 if it has no owner.
-      </tp:docstring>
+      " />
     </property>
 
     <property name="Mode" type="s" access="read">
-      <tp:docstring>
-        The tunnel mode, either "tun" or "tap".
-      </tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
+        The tunnel mode, either &quot;tun&quot; or &quot;tap&quot;.
+      " />
     </property>
 
     <property name="NoPi" type="b" access="read">
-      <tp:docstring>
-        The tunnel's "TUN_NO_PI" flag; true if no protocol info is
+      <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.
-      </tp:docstring>
+      " />
     </property>
 
     <property name="VnetHdr" type="b" access="read">
-      <tp:docstring>
-        The tunnel's "TUN_VNET_HDR" flag; true if the tunnel packets
+      <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.
-      </tp:docstring>
+      " />
     </property>
 
     <property name="MultiQueue" type="b" access="read">
-      <tp:docstring>
-        The tunnel's "TUN_TAP_MQ" flag; true if callers can connect to
+      <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.
-      </tp:docstring>
+      " />
     </property>
 
     <property name="HwAddress" type="s" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Hardware address of the device.
-      </tp:docstring>
+      " />
     </property>
 
     <signal name="PropertiesChanged">
         <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
-            <tp:docstring>
+            <annotation name="org.gtk.GDBus.DocString" value="
                 A dictionary mapping property names to variant boxed values
-            </tp:docstring>
+            " />
         </arg>
     </signal>
 
diff --git a/introspection/nm-device-veth.xml b/introspection/nm-device-veth.xml
index e06d0ceb7d..a3cff6da08 100644
--- a/introspection/nm-device-veth.xml
+++ b/introspection/nm-device-veth.xml
@@ -4,16 +4,16 @@
   <interface name="org.freedesktop.NetworkManager.Device.Veth">
 
     <property name="Peer" type="o" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         The object path of the device's peer.
-      </tp:docstring>
+      " />
     </property>
 
     <signal name="PropertiesChanged">
         <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
-            <tp:docstring>
+            <annotation name="org.gtk.GDBus.DocString" value="
                 A dictionary mapping property names to variant boxed values
-            </tp:docstring>
+            " />
         </arg>
     </signal>
 
diff --git a/introspection/nm-device-vlan.xml b/introspection/nm-device-vlan.xml
index 992340e009..bac220e899 100644
--- a/introspection/nm-device-vlan.xml
+++ b/introspection/nm-device-vlan.xml
@@ -4,34 +4,34 @@
   <interface name="org.freedesktop.NetworkManager.Device.Vlan">
 
     <property name="HwAddress" type="s" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Hardware address of the device.
-      </tp:docstring>
+      " />
     </property>
 
     <property name="Carrier" type="b" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Indicates whether the physical carrier is found (e.g. whether a cable is plugged in or not).
-      </tp:docstring>
+      " />
     </property>
 
     <property name="Parent" type="o" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Object path of the parent device of this VLAN device.
-      </tp:docstring>
+      " />
     </property>
 
     <property name="VlanId" type="u" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         The VLAN ID of this VLAN interface.
-      </tp:docstring>
+      " />
     </property>
 
     <signal name="PropertiesChanged">
         <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
-            <tp:docstring>
+            <annotation name="org.gtk.GDBus.DocString" value="
                 A dictionary mapping property names to variant boxed values
-            </tp:docstring>
+            " />
         </arg>
     </signal>
 
diff --git a/introspection/nm-device-vxlan.xml b/introspection/nm-device-vxlan.xml
index 97c517fb7e..de23020d5b 100644
--- a/introspection/nm-device-vxlan.xml
+++ b/introspection/nm-device-vxlan.xml
@@ -4,123 +4,123 @@
   <interface name="org.freedesktop.NetworkManager.Device.Vxlan">
 
     <property name="Parent" type="o" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         The object path of the parent device (if the VXLAN is not
 	purely internal to this host).
-      </tp:docstring>
+      " />
     </property>
 
     <property name="HwAddress" type="s" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Hardware address of the device.
-      </tp:docstring>
+      " />
     </property>
 
     <property name="Id" type="u" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         The VXLAN Network Identifier (VNI).
-      </tp:docstring>
+      " />
     </property>
 
     <property name="Group" type="s" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         The IP (v4 or v6) multicast group used to communicate with other physical
 	hosts on this VXLAN.
-      </tp:docstring>
+      " />
     </property>
 
     <property name="Local" type="s" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         The local IPv4 or IPv6 address to use when sending VXLAN packets to other
 	physical hosts.
-      </tp:docstring>
+      " />
     </property>
 
     <property name="Tos" type="y" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         The value to use in the IP ToS field for VXLAN packets sent to
 	other physical hosts.
-      </tp:docstring>
+      " />
     </property>
 
     <property name="Ttl" type="y" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         The value to use in the IP TTL field for VXLAN packets sent to
 	other physical hosts.
-      </tp:docstring>
+      " />
     </property>
 
     <property name="Learning" type="b" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         True if the VXLAN dynamically learns remote IP addresses.
-      </tp:docstring>
+      " />
     </property>
 
     <property name="Ageing" type="u" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         The interval in seconds at which the kernel purges stale
         cached addresses.
-      </tp:docstring>
+      " />
     </property>
 
     <property name="Limit" type="u" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         The maximum number of entries that can be added to the VXLAN's
 	forwarding table.
-      </tp:docstring>
+      " />
     </property>
 
     <property name="DstPort" type="q" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Destination port for outgoing VXLAN packets.
-      </tp:docstring>
+      " />
     </property>
 
     <property name="SrcPortMin" type="q" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         The lowest source port number to use for outgoing VXLAN packets.
-      </tp:docstring>
+      " />
     </property>
 
     <property name="SrcPortMax" type="q" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         The highest source port number to use for outgoing VXLAN packets.
-      </tp:docstring>
+      " />
     </property>
 
     <property name="Proxy" type="b" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         True if the VXLAN is implementing DOVE ARP proxying for remote
         clients.
-      </tp:docstring>
+      " />
     </property>
 
     <property name="Rsc" type="b" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         True if the VXLAN is implementing DOVE route short-circuiting
 	of known remote IP addresses.
-      </tp:docstring>
+      " />
     </property>
 
     <property name="L2miss" type="b" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         True if the VXLAN will emit netlink notifications of L2 switch
         misses.
-      </tp:docstring>
+      " />
     </property>
 
     <property name="L3miss" type="b" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         True if the VXLAN will emit netlink notifications of L3 switch
         misses.
-      </tp:docstring>
+      " />
     </property>
 
     <signal name="PropertiesChanged">
         <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
-            <tp:docstring>
+            <annotation name="org.gtk.GDBus.DocString" value="
                 A dictionary mapping property names to variant boxed values
-            </tp:docstring>
+            " />
         </arg>
     </signal>
 
diff --git a/introspection/nm-device-wifi.xml b/introspection/nm-device-wifi.xml
index 27f3eb9066..2ece0ef0ae 100644
--- a/introspection/nm-device-wifi.xml
+++ b/introspection/nm-device-wifi.xml
@@ -6,164 +6,164 @@
 
     <method name="GetAccessPoints">
       <arg name="access_points" type="ao" direction="out">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           List of access point object paths.
-        </tp:docstring>
+        " />
       </arg>
-      <tp:docstring>
+      <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
         retrieve a list of all access points (including hidden ones) use the
         GetAllAccessPoints() method.
-      </tp:docstring>
+      " />
     </method>
 
     <method name="GetAllAccessPoints">
       <arg name="access_points" type="ao" direction="out">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           List of access point object paths.
-        </tp:docstring>
+        " />
       </arg>
-      <tp:docstring>
+      <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.
-      </tp:docstring>
+      " />
     </method>
 
     <method name="RequestScan">
       <arg name="options" type="a{sv}" direction="in">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           Options of scan.
-          Currently 'ssids' option with value of "aay" type is supported.
-        </tp:docstring>
+          Currently 'ssids' option with value of &quot;aay&quot; type is supported.
+        " />
       </arg>
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Request the device to scan
-      </tp:docstring>
+      " />
     </method>
 
     <property name="HwAddress" type="s" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         The active hardware address of the device.
-      </tp:docstring>
+      " />
     </property>
 
     <property name="PermHwAddress" type="s" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         The permanent hardware address of the device.
-      </tp:docstring>
+      " />
     </property>
 
     <property name="Mode" type="u" access="read" tp:type="NM_802_11_MODE">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         The operating mode of the wireless device.
-      </tp:docstring>
+      " />
     </property>
 
     <property name="Bitrate" type="u" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         The bit rate currently used by the wireless device, in kilobits/second (Kb/s).
-      </tp:docstring>
+      " />
     </property>
 
     <property name="AccessPoints" type="ao" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         List of object paths of access point visible to this wireless device.
-      </tp:docstring>
+      " />
     </property>
 
     <property name="ActiveAccessPoint" type="o" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Object path of the access point currently used by the wireless device.
-      </tp:docstring>
+      " />
     </property>
 
     <property name="WirelessCapabilities" type="u" access="read" tp:type="NM_802_11_DEVICE_CAP">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         The capabilities of the wireless device.
-      </tp:docstring>
+      " />
     </property>
 
     <signal name="PropertiesChanged">
         <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
-            <tp:docstring>
+            <annotation name="org.gtk.GDBus.DocString" value="
                 A dictionary containing the FIXME: check changed parameters.
-            </tp:docstring>
+            " />
         </arg>
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
             Emitted when the wireless device's properties changed.
-        </tp:docstring>
+        " />
     </signal>
 
     <signal name="AccessPointAdded">
         <arg name="access_point" type="o">
-            <tp:docstring>
+            <annotation name="org.gtk.GDBus.DocString" value="
                 The object path of the newly found access point.
-            </tp:docstring>
+            " />
         </arg>
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
             Emitted when a new access point is found by the device.
-        </tp:docstring>
+        " />
     </signal>
 
     <signal name="AccessPointRemoved">
       <arg name="access_point" type="o">
-            <tp:docstring>
+            <annotation name="org.gtk.GDBus.DocString" value="
                 The object path of the access point that has disappeared.
-            </tp:docstring>
+            " />
         </arg>
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
             Emitted when an access point disappears from view of the device.
-        </tp:docstring>
+        " />
     </signal>
 
     <tp:flags name="NM_802_11_DEVICE_CAP" type="u">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Flags describing the capabilities of a wireless device.
-      </tp:docstring>
+      " />
       <tp:flag suffix="NONE" value="0x0">
-        <tp:docstring>Null capability - syntactic sugar for no capabilities supported.  Do not AND this with other capabilities!</tp:docstring>
+        <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">
-        <tp:docstring>The device supports the 40-bit WEP cipher.</tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="The device supports the 40-bit WEP cipher." />
       </tp:flag>
       <tp:flag suffix="CIPHER_WEP104" value="0x2">
-        <tp:docstring>The device supports the 104-bit WEP cipher.</tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="The device supports the 104-bit WEP cipher." />
       </tp:flag>
       <tp:flag suffix="CIPHER_TKIP" value="0x4">
-        <tp:docstring>The device supports the TKIP cipher.</tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="The device supports the TKIP cipher." />
       </tp:flag>
       <tp:flag suffix="CIPHER_CCMP" value="0x8">
-        <tp:docstring>The device supports the CCMP cipher.</tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="The device supports the CCMP cipher." />
       </tp:flag>
       <tp:flag suffix="WPA" value="0x10">
-        <tp:docstring>The device supports the WPA encryption/authentication protocol.</tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="The device supports the WPA encryption/authentication protocol." />
       </tp:flag>
       <tp:flag suffix="RSN" value="0x20">
-        <tp:docstring>The device supports the RSN encryption/authentication protocol.</tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="The device supports the RSN encryption/authentication protocol." />
       </tp:flag>
       <tp:flag suffix="AP" value="0x40">
-        <tp:docstring>The device supports Access Point mode.</tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="The device supports Access Point mode." />
       </tp:flag>
       <tp:flag suffix="ADHOC" value="0x80">
-        <tp:docstring>The device supports Ad-Hoc mode.</tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="The device supports Ad-Hoc mode." />
       </tp:flag>
       <tp:flag suffix="FREQ_VALID" value="0x100">
-	<tp:docstring>
+	<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:docstring>
+	" />
       </tp:flag>
       <tp:flag suffix="FREQ_2GHZ" value="0x200">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The device supports 2.4GHz frequencies.
-        </tp:docstring>
+        " />
       </tp:flag>
       <tp:flag suffix="FREQ_5GHZ" value="0x400">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The device supports 5GHz frequencies.
-        </tp:docstring>
+        " />
       </tp:flag>
     </tp:flags>
   </interface>
diff --git a/introspection/nm-device-wimax.xml b/introspection/nm-device-wimax.xml
index 3bad624530..e790e4fc62 100644
--- a/introspection/nm-device-wimax.xml
+++ b/introspection/nm-device-wimax.xml
@@ -4,105 +4,105 @@
   <interface name="org.freedesktop.NetworkManager.Device.WiMax">
     <method name="GetNspList">
       <arg name="nsps" type="ao" direction="out">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           List of NSP object paths
-        </tp:docstring>
+        " />
       </arg>
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Get the list of NSPs visible to this device.
-      </tp:docstring>
+      " />
     </method>
 
     <property name="Nsps" type="ao" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         List of object paths of Network Service Providers (NSPs) visible to this
         WiMAX device.
-      </tp:docstring>
+      " />
     </property>
 
     <property name="HwAddress" type="s" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Hardware address of the device.
-      </tp:docstring>
+      " />
     </property>
 
     <property name="CenterFrequency" type="u" access="read">
-      <tp:docstring>
+      <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
         device is not connected.
-      </tp:docstring>
+      " />
     </property>
 
     <property name="Rssi" type="i" access="read">
-      <tp:docstring>
+      <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.
-      </tp:docstring>
+      " />
     </property>
 
     <property name="Cinr" type="i" access="read">
-      <tp:docstring>
+      <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
         meaning when the device is not connected.
-      </tp:docstring>
+      " />
     </property>
 
     <property name="TxPower" type="i" access="read">
-      <tp:docstring>
+      <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.
-      </tp:docstring>
+      " />
     </property>
 
     <property name="Bsid" type="s" access="read">
-      <tp:docstring>
+      <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.
-      </tp:docstring>
+      " />
     </property>
 
     <property name="ActiveNsp" type="o" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Object path of the NSP currently used by the WiMax device.
-      </tp:docstring>
+      " />
     </property>
 
     <signal name="PropertiesChanged">
         <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
-            <tp:docstring>
+            <annotation name="org.gtk.GDBus.DocString" value="
                 A dictionary mapping property names to variant boxed values.
-            </tp:docstring>
+            " />
         </arg>
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
             Emitted when the WiMax device's properties changed.
-        </tp:docstring>
+        " />
     </signal>
 
     <signal name="NspAdded">
         <arg name="nsp" type="o">
-            <tp:docstring>
+            <annotation name="org.gtk.GDBus.DocString" value="
                 The object path of the newly found NSP.
-            </tp:docstring>
+            " />
         </arg>
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
             Emitted when a new NSP is found by the device.
-        </tp:docstring>
+        " />
     </signal>
 
     <signal name="NspRemoved">
       <arg name="nsp" type="o">
-            <tp:docstring>
+            <annotation name="org.gtk.GDBus.DocString" value="
                 The object path of the NSP that has disappeared.
-            </tp:docstring>
+            " />
         </arg>
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
             Emitted when an NSP disappears from view of the device.
-        </tp:docstring>
+        " />
     </signal>
 
   </interface>
diff --git a/introspection/nm-device.xml b/introspection/nm-device.xml
index f1033c73f2..321cace13b 100644
--- a/introspection/nm-device.xml
+++ b/introspection/nm-device.xml
@@ -3,7 +3,7 @@
 <node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <interface name="org.freedesktop.NetworkManager.Device">
     <property name="Udi" type="s" access="read">
-      <tp:docstring>
+      <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
@@ -16,183 +16,183 @@
         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.
-      </tp:docstring>
+      " />
     </property>
     <property name="Interface" type="s" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         The name of the device's control (and often data) interface.
-      </tp:docstring>
+      " />
     </property>
     <property name="IpInterface" type="s" access="read">
-      <tp:docstring>
+      <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.
-      </tp:docstring>
+      " />
     </property>
     <property name="Driver" type="s" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         The driver handling the device.
-      </tp:docstring>
+      " />
     </property>
     <property name="DriverVersion" type="s" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         The version of the driver handling the device.
-      </tp:docstring>
+      " />
     </property>
     <property name="FirmwareVersion" type="s" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         The firmware version for the device.
-      </tp:docstring>
+      " />
     </property>
     <property name="Capabilities" type="u" access="read" tp:type="NM_DEVICE_CAP">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Flags describing the capabilities of the device.
-      </tp:docstring>
+      " />
     </property>
     <property name="Ip4Address" type="u" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         DEPRECATED; use the 'Addresses' property of the 'Ip4Config' object instead.
-      </tp:docstring>
+      " />
     </property>
     <property name="State" type="u" access="read" tp:type="NM_DEVICE_STATE">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         The current state of the device.
-      </tp:docstring>
+      " />
     </property>
     <property name="StateReason" type="(uu)" access="read" tp:type="NM_DEVICE_STATE_REASON_STRUCT">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         The current state and reason for changing to that state.
-      </tp:docstring>
+      " />
     </property>
     <property name="ActiveConnection" type="o" access="read">
-      <tp:docstring>
-        Object path of an ActiveConnection object that "owns" this device during
+      <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
         connection to a specific network and implements the
         org.freedesktop.NetworkManager.Connection.Active D-Bus interface.
-      </tp:docstring>
+      " />
     </property>
     <property name="Ip4Config" type="o" access="read">
-      <tp:docstring>
+      <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.
-      </tp:docstring>
+      " />
     </property>
     <property name="Dhcp4Config" type="o" access="read">
-      <tp:docstring>
+      <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.
-      </tp:docstring>
+      " />
     </property>
     <property name="Ip6Config" type="o" access="read">
-      <tp:docstring>
+      <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.
-      </tp:docstring>
+      " />
     </property>
     <property name="Dhcp6Config" type="o" access="read">
-      <tp:docstring>
+      <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
         NM_DEVICE_STATE_ACTIVATED state.
-      </tp:docstring>
+      " />
     </property>
     <property name="Managed" type="b" access="readwrite">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         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.
-      </tp:docstring>
+      " />
     </property>
     <property name="Autoconnect" type="b" access="readwrite">
-      <tp:docstring>
+      <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.
-      </tp:docstring>
+      " />
     </property>
     <property name="FirmwareMissing" type="b" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         If TRUE, indicates the device is likely missing firmware necessary for
         its operation.
-      </tp:docstring>
+      " />
     </property>
     <property name="NmPluginMissing" type="b" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         If TRUE, indicates the NetworkManager plugin for the device is likely
         missing or misconfigured.
-      </tp:docstring>
+      " />
     </property>
     <property name="DeviceType" type="u" access="read" tp:type="NM_DEVICE_TYPE">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         The general type of the network device; ie Ethernet, WiFi, etc.
-      </tp:docstring>
+      " />
     </property>
     <property name="AvailableConnections" type="ao" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         An array of object paths of every configured connection that is currently 'available' through this device.
-      </tp:docstring>
+      " />
     </property>
     <property name="PhysicalPortId" type="s" access="read">
-      <tp:docstring>
+      <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.
-      </tp:docstring>
+      " />
     </property>
     <property name="Mtu" type="u" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         The device MTU (maximum transmission unit).
-      </tp:docstring>
+      " />
     </property>
     <property name="Metered" type="u" access="read" tp:type="NM_METERED">
-      <tp:docstring>
+      <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.
-      </tp:docstring>
+      " />
     </property>
     <property name="LldpNeighbors" type="aa{sv}" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Array of LLDP neighbors; each element is a dictionary mapping
         LLDP TLV names to variant boxed values.
-      </tp:docstring>
+      " />
     </property>
     <property name="Real" type="b" access="read">
-      <tp:docstring>
+      <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.
-      </tp:docstring>
+      " />
     </property>
 
     <method name="Reapply">
       <arg name="connection" type="a{sa{sv}}" direction="in">
-        <tp:docstring>
+        <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.
-        </tp:docstring>
+        " />
       </arg>
       <arg name="version_id" type="t" direction="in">
-        <tp:docstring>
+        <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.
-        </tp:docstring>
+        " />
       </arg>
       <arg name="flags" type="u" direction="in">
-        <tp:docstring>
+        <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.
-        </tp:docstring>
+        " />
       </arg>
-      <tp:docstring>
+      <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
@@ -211,587 +211,587 @@
         of NetworkManager).
         Reapply can make the applied-connection different from the settings-connection,
         just like updating the settings-connection can make them different.
-      </tp:docstring>
+      " />
     </method>
 
     <method name="GetAppliedConnection">
       <arg name="flags" type="u" direction="in">
-        <tp:docstring>
+        <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.
-        </tp:docstring>
+        " />
       </arg>
       <arg name="connection" type="a{sa{sv}}" direction="out">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
             The effective connection settings that the connection has currently applied.
-        </tp:docstring>
+        " />
       </arg>
       <arg name="version_id" type="t" direction="out">
-        <tp:docstring>
+        <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.
-        </tp:docstring>
+        " />
       </arg>
-      <tp:docstring>
+      <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.
-      </tp:docstring>
+      " />
     </method>
 
     <method name="Disconnect">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Disconnects a device and prevents the device from automatically activating further connections without user intervention.
-      </tp:docstring>
+      " />
     </method>
 
     <method name="Delete">
-      <tp:docstring>
+      <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.
-      </tp:docstring>
+      " />
     </method>
 
     <signal name="StateChanged">
       <arg name="new_state" type="u" tp:type="NM_DEVICE_STATE">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The new state of the device.
-        </tp:docstring>
+        " />
       </arg>
       <arg name="old_state" type="u" tp:type="NM_DEVICE_STATE">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The previous state of the device.
-        </tp:docstring>
+        " />
       </arg>
       <arg name="reason" type="u" tp:type="NM_DEVICE_STATE_REASON">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           A reason for the state transition.
-        </tp:docstring>
+        " />
       </arg>
     </signal>
 
     <tp:enum name="NM_DEVICE_STATE" type="u">
       <tp:enumvalue suffix="UNKNOWN" value="0">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The device is in an unknown state.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="UNMANAGED" value="10">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The device is recognized but not managed by NetworkManager.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="UNAVAILABLE" value="20">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The device cannot be used (carrier off, rfkill, etc).
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="DISCONNECTED" value="30">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The device is not connected.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="PREPARE" value="40">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The device is preparing to connect.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="CONFIG" value="50">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The device is being configured.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="NEED_AUTH" value="60">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The device is awaiting secrets necessary to continue connection.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="IP_CONFIG" value="70">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The IP settings of the device are being requested and configured.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="IP_CHECK" value="80">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The device's IP connectivity ability is being determined.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="SECONDARIES" value="90">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The device is waiting for secondary connections to be activated.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="ACTIVATED" value="100">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The device is active.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="DEACTIVATING" value="110">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The device's network connection is being torn down.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="FAILED" value="120">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The device is in a failure state following an attempt to activate it.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
     </tp:enum>
 
     <tp:enum name="NM_DEVICE_TYPE" type="u">
       <tp:enumvalue suffix="UNKNOWN" value="0">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The device type is unknown.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="ETHERNET" value="1">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The device is wired Ethernet device.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="WIFI" value="2">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The device is an 802.11 WiFi device.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="UNUSED1" value="3">
-        <tp:docstring>Unused</tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="Unused" />
       </tp:enumvalue>
       <tp:enumvalue suffix="UNUSED2" value="4">
-        <tp:docstring>Unused</tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="Unused" />
       </tp:enumvalue>
       <tp:enumvalue suffix="BT" value="5">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The device is Bluetooth device that provides PAN or DUN capabilities.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="OLPC_MESH" value="6">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The device is an OLPC mesh networking device.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="WIMAX" value="7">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The device is an 802.16e Mobile WiMAX device.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="MODEM" value="8">
-        <tp:docstring>
+        <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:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="INFINIBAND" value="9">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The device is an IP-capable InfiniBand interface.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="BOND" value="10">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The device is a bond master interface.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="VLAN" value="11">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The device is a VLAN interface.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="ADSL" value="12">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The device is an ADSL device supporting PPPoE and PPPoATM protocols.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="BRIDGE" value="13">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The device is a bridge interface.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="GENERIC" value="14">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The device is a generic interface type unrecognized by NetworkManager.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="TEAM" value="15">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The device is a team master interface.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
     </tp:enum>
 
     <tp:flags name="NM_DEVICE_CAP" value-prefix="NM_DEVICE_CAP" type="u">
       <tp:flag suffix="NONE" value="0x0">
-        <tp:docstring>Null capability.</tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="Null capability." />
       </tp:flag>
       <tp:flag suffix="NM_SUPPORTED" value="0x1">
-        <tp:docstring>The device is supported by NetworkManager.</tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="The device is supported by NetworkManager." />
       </tp:flag>
       <tp:flag suffix="CARRIER_DETECT" value="0x2">
-        <tp:docstring>The device supports carrier detection.</tp:docstring>
+        <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">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The reason for the device state change is unknown.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="NONE" value="1">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The state change is normal.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="NOW_MANAGED" value="2">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The device is now managed.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="NOW_UNMANAGED" value="3">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The device is no longer managed.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="CONFIG_FAILED" value="4">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The device could not be readied for configuration.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="CONFIG_UNAVAILABLE" value="5">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           IP configuration could not be reserved (no available address, timeout, etc).
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="CONFIG_EXPIRED" value="6">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The IP configuration is no longer valid.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="NO_SECRETS" value="7">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           Secrets were required, but not provided.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="SUPPLICANT_DISCONNECT" value="8">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The 802.1X supplicant disconnected from the access point or authentication server.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="SUPPLICANT_CONFIG_FAILED" value="9">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           Configuration of the 802.1X supplicant failed.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="SUPPLICANT_FAILED" value="10">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The 802.1X supplicant quit or failed unexpectedly.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="SUPPLICANT_TIMEOUT" value="11">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The 802.1X supplicant took too long to authenticate.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="PPP_START_FAILED" value="12">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The PPP service failed to start within the allowed time.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="PPP_DISCONNECT" value="13">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The PPP service disconnected unexpectedly.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="PPP_FAILED" value="14">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The PPP service quit or failed unexpectedly.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="DHCP_START_FAILED" value="15">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The DHCP service failed to start within the allowed time.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="DHCP_ERROR" value="16">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The DHCP service reported an unexpected error.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="DHCP_FAILED" value="17">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The DHCP service quit or failed unexpectedly.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="SHARED_START_FAILED" value="18">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The shared connection service failed to start.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="SHARED_FAILED" value="19">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The shared connection service quit or failed unexpectedly.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="AUTOIP_START_FAILED" value="20">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The AutoIP service failed to start.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="AUTOIP_ERROR" value="21">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The AutoIP service reported an unexpected error.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="AUTOIP_FAILED" value="22">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The AutoIP service quit or failed unexpectedly.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="MODEM_BUSY" value="23">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           Dialing failed because the line was busy.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="MODEM_NO_DIAL_TONE" value="24">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           Dialing failed because there was no dial tone.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="MODEM_NO_CARRIER" value="25">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           Dialing failed because there was carrier.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="MODEM_DIAL_TIMEOUT" value="26">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           Dialing timed out.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="MODEM_DIAL_FAILED" value="27">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           Dialing failed.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="MODEM_INIT_FAILED" value="28">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           Modem initialization failed.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="GSM_APN_FAILED" value="29">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           Failed to select the specified GSM APN.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="GSM_REGISTRATION_NOT_SEARCHING" value="30">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           Not searching for networks.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="GSM_REGISTRATION_DENIED" value="31">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           Network registration was denied.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="GSM_REGISTRATION_TIMEOUT" value="32">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           Network registration timed out.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="GSM_REGISTRATION_FAILED" value="33">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           Failed to register with the requested GSM network.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="GSM_PIN_CHECK_FAILED" value="34">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           PIN check failed.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="FIRMWARE_MISSING" value="35">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           Necessary firmware for the device may be missing.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="REMOVED" value="36">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The device was removed.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="SLEEPING" value="37">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           NetworkManager went to sleep.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="CONNECTION_REMOVED" value="38">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The device's active connection was removed or disappeared.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="USER_REQUESTED" value="39">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           A user or client requested the disconnection.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="CARRIER" value="40">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The device's carrier/link changed.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="CONNECTION_ASSUMED" value="41">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The device's existing connection was assumed.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="SUPPLICANT_AVAILABLE" value="42">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The 802.1x supplicant is now available.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="MODEM_NOT_FOUND" value="43">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The modem could not be found.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="BT_FAILED" value="44">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The Bluetooth connection timed out or failed.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="GSM_SIM_NOT_INSERTED" value="45">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           GSM Modem's SIM Card not inserted.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="GSM_SIM_PIN_REQUIRED" value="46">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           GSM Modem's SIM Pin required.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="GSM_SIM_PUK_REQUIRED" value="47">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           GSM Modem's SIM Puk required.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="GSM_SIM_WRONG" value="48">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           GSM Modem's SIM wrong
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="INFINIBAND_MODE" value="49">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           InfiniBand device does not support connected mode.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="DEPENDENCY_FAILED" value="50">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           A dependency of the connection failed.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="BR2684_FAILED" value="51">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           Problem with the RFC 2684 Ethernet over ADSL bridge.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="MODEM_MANAGER_UNAVAILABLE" value="52">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           ModemManager was not running or quit unexpectedly.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="SSID_NOT_FOUND" value="53">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The 802.11 Wi-Fi network could not be found.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="SECONDARY_CONNECTION_FAILED" value="54">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           A secondary connection of the base connection failed.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="DCB_FCOE_FAILED" value="55">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           DCB or FCoE setup failed.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="TEAMD_CONTROL_FAILED" value="56">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           teamd control failed.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="MODEM_FAILED" value="57">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           Modem failed or no longer available.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="MODEM_AVAILABLE" value="58">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           Modem now ready and available.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="SIM_PIN_INCORRECT" value="59">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The SIM PIN was incorrect.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="NEW_ACTIVATION" value="60">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           A new connection activation was enqueued.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="PARENT_CHANGED" value="61">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The device's parent changed.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="PARENT_MANAGED_CHANGED" value="62">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The device parent's management changed.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
     </tp:enum>
 
     <tp:enum name="NM_METERED" type="u">
       <tp:enumvalue suffix="UNKNOWN" value="0">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The device metered status is unknown.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="YES" value="1">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The device is metered and the value was statically set.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="NO" value="2">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The device is not metered and the value was statically set.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="GUESS_YES" value="3">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The device is metered and the value was guessed.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="GUESS_NO" value="4">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The device is not metered and the value was guessed.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
     </tp:enum>
 
     <tp:struct name="NM_DEVICE_STATE_REASON_STRUCT">
       <tp:member type="u" name="state" tp:type="NM_DEVICE_STATE">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The device state.
-        </tp:docstring>
+        " />
       </tp:member>
       <tp:member type="u" name="reason" tp:type="NM_DEVICE_STATE_REASON">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The reason for originally changing to the device state.
-        </tp:docstring>
+        " />
       </tp:member>
     </tp:struct>
   </interface>
diff --git a/introspection/nm-dhcp4-config.xml b/introspection/nm-dhcp4-config.xml
index 379c50f9b0..bca34fc53f 100644
--- a/introspection/nm-dhcp4-config.xml
+++ b/introspection/nm-dhcp4-config.xml
@@ -3,18 +3,18 @@
 <node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
     <interface name="org.freedesktop.NetworkManager.DHCP4Config">
         <annotation name="org.gtk.GDBus.C.Name" value="Dhcp4Config"/>
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
             Options and configuration returned by the IPv4 DHCP server.
-        </tp:docstring>
+        " />
         <property name="Options" type="a{sv}" access="read">
-            <tp:docstring>Configuration options returned by a DHCP server, if any.</tp:docstring>
+            <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">
-                <tp:docstring>
+                <annotation name="org.gtk.GDBus.DocString" value="
                     A dictionary mapping property names to variant boxed values
-                </tp:docstring>
+                " />
             </arg>
         </signal>
     </interface>
diff --git a/introspection/nm-dhcp6-config.xml b/introspection/nm-dhcp6-config.xml
index df75660a70..84e13b77b1 100644
--- a/introspection/nm-dhcp6-config.xml
+++ b/introspection/nm-dhcp6-config.xml
@@ -3,18 +3,18 @@
 <node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
     <interface name="org.freedesktop.NetworkManager.DHCP6Config">
         <annotation name="org.gtk.GDBus.C.Name" value="Dhcp6Config"/>
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
             Options and configuration returned by the IPv6 DHCP server.
-        </tp:docstring>
+        " />
         <property name="Options" type="a{sv}" access="read">
-            <tp:docstring>Configuration options returned by a DHCP server, if any.</tp:docstring>
+            <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">
-                <tp:docstring>
+                <annotation name="org.gtk.GDBus.DocString" value="
                     A dictionary mapping property names to variant boxed values
-                </tp:docstring>
+                " />
             </arg>
         </signal>
     </interface>
diff --git a/introspection/nm-ip4-config.xml b/introspection/nm-ip4-config.xml
index 5a9e8ea1c3..111e1acf78 100644
--- a/introspection/nm-ip4-config.xml
+++ b/introspection/nm-ip4-config.xml
@@ -3,26 +3,26 @@
 <node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <interface name="org.freedesktop.NetworkManager.IP4Config">
     <property name="Addresses" type="aau" access="read">
-      <tp:docstring>
+      <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
-      </tp:docstring>
+      " />
     </property>
     <property name="AddressData" type="aa{sv}" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
 	Array of IP address data objects. All addresses will include
-	"address" (an IP address string), and "prefix" (a uint). Some
+	&quot;address&quot; (an IP address string), and &quot;prefix&quot; (a uint). Some
 	addresses may include additional attributes.
-      </tp:docstring>
+      " />
     </property>
     <property name="Gateway" type="s" access="read">
-      <tp:docstring>The gateway in use.</tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="The gateway in use." />
     </property>
     <property name="Routes" type="aau" access="read">
-      <tp:docstring>
+      <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
@@ -30,41 +30,41 @@
 	metric), (route, prefix, next-hop, metric), ...]
 
 	Deprecated: use RouteData
-      </tp:docstring>
+      " />
     </property>
     <property name="RouteData" type="aa{sv}" access="read">
-      <tp:docstring>
-	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),
+      <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.
-      </tp:docstring>
+      " />
     </property>
     <property name="Nameservers" type="au" access="read">
-      <tp:docstring>The nameservers in use.</tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="The nameservers in use." />
     </property>
     <property name="Domains" type="as" access="read">
-      <tp:docstring>A list of domains this address belongs to.</tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="A list of domains this address belongs to." />
     </property>
     <property name="Searches" type="as" access="read">
-      <tp:docstring>A list of dns searches.</tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="A list of dns searches." />
     </property>
     <property name="DnsOptions" type="as" access="read">
-      <tp:docstring>
+      <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.
-      </tp:docstring>
+      " />
     </property>
     <property name="WinsServers" type="au" access="read">
-      <tp:docstring>The Windows Internet Name Service servers associated with the connection.  Each address is in network byte order.</tp:docstring>
+      <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>
 
     <signal name="PropertiesChanged">
       <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           A dictionary mapping property names to variant boxed values
-        </tp:docstring>
+        " />
       </arg>
     </signal>
   </interface>
diff --git a/introspection/nm-ip6-config.xml b/introspection/nm-ip6-config.xml
index 1a107bf29f..0cca33c4f9 100644
--- a/introspection/nm-ip6-config.xml
+++ b/introspection/nm-ip6-config.xml
@@ -3,63 +3,63 @@
 <node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <interface name="org.freedesktop.NetworkManager.IP6Config">
     <property name="Addresses" type="a(ayuay)" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
 	Array of tuples of IPv6 address/prefix/gateway.
 
 	Deprecated: use AddressData and Gateway.
-      </tp:docstring>
+      " />
     </property>
     <property name="AddressData" type="aa{sv}" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
 	Array of IP address data objects. All addresses will include
-	"address" (an IP address string), and "prefix" (a uint). Some
+	&quot;address&quot; (an IP address string), and &quot;prefix&quot; (a uint). Some
 	addresses may include additional attributes.
-      </tp:docstring>
+      " />
     </property>
     <property name="Gateway" type="s" access="read">
-      <tp:docstring>The gateway in use.</tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="The gateway in use." />
     </property>
     <property name="Routes" type="a(ayuayu)" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
 	Tuples of IPv6 route/prefix/next-hop/metric.
 
 	Deprecated: use RouteData
-      </tp:docstring>
+      " />
     </property>
     <property name="RouteData" type="aa{sv}" access="read">
-      <tp:docstring>
-	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),
+      <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.
-      </tp:docstring>
+      " />
     </property>
     <property name="Nameservers" type="aay" access="read">
       <!-- gdbus-codegen assumes that "aay" means "array of non-UTF-8
-	   string" and so would make this a char **.
+	   string&quot; and so would make this a char **.
       -->
       <annotation name="org.gtk.GDBus.C.ForceGVariant" value="1"/>
-      <tp:docstring>The nameservers in use.</tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="The nameservers in use." />
     </property>
     <property name="Domains" type="as" access="read">
-      <tp:docstring>A list of domains this address belongs to.</tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="A list of domains this address belongs to." />
     </property>
     <property name="Searches" type="as" access="read">
-      <tp:docstring>A list of dns searches.</tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="A list of dns searches." />
     </property>
     <property name="DnsOptions" type="as" access="read">
-      <tp:docstring>
+      <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.
-      </tp:docstring>
+      " />
     </property>
 
     <signal name="PropertiesChanged">
       <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           A dictionary mapping property names to variant boxed values
-        </tp:docstring>
+        " />
       </arg>
     </signal>
   </interface>
diff --git a/introspection/nm-manager.xml b/introspection/nm-manager.xml
index dd6fc4bdd1..8203020b39 100644
--- a/introspection/nm-manager.xml
+++ b/introspection/nm-manager.xml
@@ -5,213 +5,213 @@
     <annotation name="org.gtk.GDBus.C.Name" value="Manager"/>
 
     <method name="GetDevices">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Get the list of realized network devices.
-      </tp:docstring>
+      " />
       <arg name="devices" type="ao" direction="out">
-        <tp:docstring>
+        <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()).
-        </tp:docstring>
+        " />
       </arg>
     </method>
 
     <method name="GetAllDevices">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Get the list of all network devices.
-      </tp:docstring>
+      " />
       <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_get_all_devices"/>
       <arg name="devices" type="ao" direction="out">
-        <tp:docstring>
+        <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).
-        </tp:docstring>
+        " />
       </arg>
     </method>
 
     <method name="GetDeviceByIpIface">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         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.
-      </tp:docstring>
+      " />
       <arg name="iface" type="s" direction="in">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           Interface name of the device to find.
-        </tp:docstring>
+        " />
       </arg>
       <arg name="device" type="o" direction="out">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           Object path of the network device.
-        </tp:docstring>
+        " />
       </arg>
     </method>
 
     <method name="ActivateConnection">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Activate a connection using the supplied device.
-      </tp:docstring>
+      " />
       <arg name="connection" type="o" direction="in">
-        <tp:docstring>
-          The connection to activate.  If "/" is given, a valid device path must
+        <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.
-        </tp:docstring>
+        " />
       </arg>
       <arg name="device" type="o" direction="in">
-        <tp:docstring>
+        <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.
-        </tp:docstring>
+        " />
       </arg>
       <arg name="specific_object" type="o" direction="in">
-        <tp:docstring>
+        <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 "/" should be used (ie, no specific object).  For WiFi
+          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 "/" to pick an AP automatically.  For VPN connections, pass
+          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
-          "base" connection (to which the VPN connections lifetime will be tied),
-          or pass "/" and NM will automatically use the current default device.
-        </tp:docstring>
+          &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">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The path of the active connection object representing this active connection.
-        </tp:docstring>
+        " />
       </arg>
     </method>
 
     <method name="AddAndActivateConnection">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         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.
-      </tp:docstring>
+      " />
       <arg name="connection" type="a{sa{sv}}" direction="in">
-        <tp:docstring>
+        <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.
-        </tp:docstring>
+        " />
       </arg>
       <arg name="device" type="o" direction="in">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The object path of device to be activated using the given connection.
-        </tp:docstring>
+        " />
       </arg>
       <arg name="specific_object" type="o" direction="in">
-        <tp:docstring>
+        <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 "/" should be used (ie, no specific object).  For WiFi
+          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.
-        </tp:docstring>
+        " />
       </arg>
       <arg name="path" type="o" direction="out">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           Object path of the new connection that was just added.
-        </tp:docstring>
+        " />
       </arg>
       <arg name="active_connection" type="o" direction="out">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The path of the active connection object representing this active connection.
-        </tp:docstring>
+        " />
       </arg>
     </method>
 
     <method name="DeactivateConnection">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Deactivate an active connection.
-      </tp:docstring>
+      " />
       <arg name="active_connection" type="o" direction="in">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The currently active connection to deactivate.
-        </tp:docstring>
+        " />
       </arg>
     </method>
 
     <method name="Sleep">
-      <tp:docstring>
+      <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.
-      </tp:docstring>
+      " />
       <arg name="sleep" type="b" direction="in">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           Indicates whether the NetworkManager daemon should sleep or wake.
-        </tp:docstring>
+        " />
       </arg>
     </method>
 
     <method name="Enable">
-      <tp:docstring>
+      <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.
-      </tp:docstring>
+      " />
       <arg name="enable" type="b" direction="in">
-        <tp:docstring>
+        <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.
-        </tp:docstring>
+        " />
       </arg>
     </method>
 
     <method name="GetPermissions">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Returns the permissions a caller has for various authenticated operations
         that NetworkManager provides, like Enable/Disable networking, changing
         WiFi, WWAN, and WiMAX state, etc.
-      </tp:docstring>
+      " />
       <arg name="permissions" type="a{ss}" direction="out">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           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
+          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.
-        </tp:docstring>
+        " />
       </arg>
     </method>
 
     <signal name="CheckPermissions">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Emitted when system authorization details change, indicating that
         clients may wish to recheck permissions with GetPermissions.
-      </tp:docstring>
+      " />
     </signal>
 
     <method name="SetLogging">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Set logging verbosity and which operations are logged.
-      </tp:docstring>
+      " />
       <arg name="level" type="s" direction="in">
-        <tp:docstring>
+        <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 "KEEP", all unmentioned
-          domains are disabled entirely. "KEEP" is special and allows
+          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.
-        </tp:docstring>
+        " />
       </arg>
       <arg name="domains" type="s" direction="in">
-        <tp:docstring>
-          A combination of logging domains separated by commas (','), or "NONE"
+        <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,
@@ -224,308 +224,308 @@
           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.
-        </tp:docstring>
+        " />
       </arg>
     </method>
 
     <method name="GetLogging">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Get current logging verbosity level and operations domains.
-      </tp:docstring>
+      " />
       <arg name="level" type="s" direction="out">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           One of [ERR, WARN, INFO, DEBUG, TRACE].
-        </tp:docstring>
+        " />
       </arg>
       <arg name="domains" type="s" direction="out">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           For available domains see SetLogging() call.
-        </tp:docstring>
+        " />
       </arg>
     </method>
 
     <method name="CheckConnectivity">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
 	Re-check the network connectivity state.
-      </tp:docstring>
+      " />
       <arg name="connectivity" type="u" tp:type="NM_CONNECTIVITY" direction="out">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The current connectivity state.
-        </tp:docstring>
+        " />
       </arg>
     </method>
 
     <method name="state">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         The overall networking state as determined by the NetworkManager daemon,
         based on the state of network devices under it's management.
-      </tp:docstring>
+      " />
       <arg name="state" type="u" direction="out" tp:type="NM_STATE"/>
     </method>
 
     <property name="Devices" type="ao" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         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).
-      </tp:docstring>
+      " />
     </property>
 
     <property name="AllDevices" type="ao" access="read">
-      <tp:docstring>
+      <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.
-      </tp:docstring>
+      " />
     </property>
 
     <property name="NetworkingEnabled" type="b" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Indicates if overall networking is currently enabled or not.  See the
         Enable() method.
-      </tp:docstring>
+      " />
     </property>
 
     <property name="WirelessEnabled" type="b" access="readwrite">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Indicates if wireless is currently enabled or not.
-      </tp:docstring>
+      " />
     </property>
 
     <property name="WirelessHardwareEnabled" type="b" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Indicates if the wireless hardware is currently enabled, i.e. the state of the RF kill switch.
-      </tp:docstring>
+      " />
     </property>
 
     <property name="WwanEnabled" type="b" access="readwrite">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Indicates if mobile broadband devices are currently enabled or not.
-      </tp:docstring>
+      " />
     </property>
 
     <property name="WwanHardwareEnabled" type="b" access="read">
-      <tp:docstring>
+      <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.
-      </tp:docstring>
+      " />
     </property>
 
     <property name="WimaxEnabled" type="b" access="readwrite">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Indicates if WiMAX devices are currently enabled or not.
-      </tp:docstring>
+      " />
     </property>
 
     <property name="WimaxHardwareEnabled" type="b" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Indicates if the WiMAX hardware is currently enabled, i.e. the state of the RF kill switch.
-      </tp:docstring>
+      " />
     </property>
 
     <property name="ActiveConnections" type="ao" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         List of active connection object paths.
-      </tp:docstring>
+      " />
     </property>
 
     <property name="PrimaryConnection" type="o" access="read">
-      <tp:docstring>
-        The object path of the "primary" active connection being used
+      <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.
-      </tp:docstring>
+      " />
     </property>
 
     <property name="PrimaryConnectionType" type="s" access="read">
-      <tp:docstring>
-        The connection type of the "primary" active connection being
+      <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.
-      </tp:docstring>
+      " />
     </property>
 
     <property name="Metered" type="u" access="read" tp:type="NM_METERED">
-      <tp:docstring>
+      <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.
-      </tp:docstring>
+      " />
     </property>
 
     <property name="ActivatingConnection" type="o" access="read">
-      <tp:docstring>
+      <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.
-      </tp:docstring>
+      " />
     </property>
 
     <property name="Startup" type="b" access="read">
-      <tp:docstring>
+      <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.
-      </tp:docstring>
+      " />
     </property>
 
     <property name="Version" type="s" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         NetworkManager version.
-      </tp:docstring>
+      " />
     </property>
 
     <property name="State" type="u" access="read" tp:type="NM_STATE">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         The overall state of the NetworkManager daemon.
-      </tp:docstring>
+      " />
     </property>
 
     <signal name="StateChanged">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         NetworkManager's state changed.
-      </tp:docstring>
+      " />
       <arg name="state" type="u" tp:type="NM_STATE">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The new state of NetworkManager.
-        </tp:docstring>
+        " />
       </arg>
     </signal>
 
     <property name="Connectivity" type="u" access="read" tp:type="NM_CONNECTIVITY">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         The network connectivity state.
-      </tp:docstring>
+      " />
     </property>
 
     <property name="GlobalDnsConfiguration" type="a{sv}" access="readwrite">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         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
+        &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 "domains" key is a second-level dictionary,
+        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 "servers" and
-        "options". "servers" is a string array of DNS servers,
-        "options" is a string array of domain-specific options.
-      </tp:docstring>
+        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>
 
     <signal name="PropertiesChanged">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         NetworkManager's properties changed.
-      </tp:docstring>
+      " />
       <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The changed properties.
-        </tp:docstring>
+        " />
       </arg>
     </signal>
 
     <signal name="DeviceAdded">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         A device was added to the system
-      </tp:docstring>
+      " />
       <arg name="device_path" type="o">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The object path of the newly added device.
-        </tp:docstring>
+        " />
       </arg>
     </signal>
 
     <signal name="DeviceRemoved">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         A device was removed from the system, and is no longer available.
-      </tp:docstring>
+      " />
       <arg name="device_path" type="o">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The object path of the device that was just removed.
-        </tp:docstring>
+        " />
       </arg>
     </signal>
 
     <tp:enum name="NM_STATE" type="u">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Describes the overall state of the daemon.
-      </tp:docstring>
+      " />
       <tp:enumvalue suffix="UNKNOWN" value="0">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           Networking state is unknown.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="ASLEEP" value="10">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           Networking is inactive and all devices are disabled.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="DISCONNECTED" value="20">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           There is no active network connection.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="DISCONNECTING" value="30">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           Network connections are being cleaned up.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="CONNECTING" value="40">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           A network device is connecting to a network and there is no other
           available network connection.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="CONNECTED_LOCAL" value="50">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           A network device is connected, but there is only link-local connectivity.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="CONNECTED_SITE" value="60">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           A network device is connected, but there is only site-local connectivity.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="CONNECTED_GLOBAL" value="70">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           A network device is connected, with global network connectivity.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
     </tp:enum>
 
     <tp:enum name="NM_CONNECTIVITY" type="u">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Describes the network-connectivity state.
-      </tp:docstring>
+      " />
       <tp:enumvalue suffix="UNKNOWN" value="0">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           Network connectivity is unknown.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="NONE" value="1">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The host is not connected to any network.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="PORTAL" value="2">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The host is behind a captive portal and cannot reach the
           full Internet.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="LIMITED" value="3">
-        <tp:docstring>
+        <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:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="FULL" value="4">
-        <tp:docstring>
+        <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:docstring>
+        " />
       </tp:enumvalue>
     </tp:enum>
 
diff --git a/introspection/nm-secret-agent.xml b/introspection/nm-secret-agent.xml
index 337d0a7fa8..ec7ede0912 100644
--- a/introspection/nm-secret-agent.xml
+++ b/introspection/nm-secret-agent.xml
@@ -3,20 +3,20 @@
 <node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
 
     <interface name="org.freedesktop.NetworkManager.SecretAgent">
-        <tp:docstring>
+        <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 "agent owned" the agent should store those secrets
+            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.
-        </tp:docstring>
+        " />
 
         <method name="GetSecrets">
-            <tp:docstring>
+            <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
@@ -25,31 +25,31 @@
                 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).
-            </tp:docstring>
+            " />
             <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">
-                <tp:docstring>
+                <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.
-                </tp:docstring>
+                " />
             </arg>
             <arg name="connection_path" type="o" direction="in">
-                <tp:docstring>
+                <annotation name="org.gtk.GDBus.DocString" value="
                     Object path of the connection for which secrets are being
                     requested.
-                </tp:docstring>
+                " />
             </arg>
             <arg name="setting_name" type="s" direction="in">
-                <tp:docstring>
+                <annotation name="org.gtk.GDBus.DocString" value="
                     Setting name for which secrets are being requested.
-                </tp:docstring>
+                " />
             </arg>
             <arg name="hints" type="as" direction="in">
-                <tp:docstring>
+                <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
@@ -61,180 +61,180 @@
                     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:".
-                </tp:docstring>
+                    &quot;x-vpn-message:&quot;.
+                " />
             </arg>
             <arg name="flags" type="u" direction="in" tp:type="NM_SECRET_AGENT_GET_SECRETS_FLAGS">
-                <tp:docstring>
+                <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.
-                </tp:docstring>
+                " />
             </arg>
 
             <arg name="secrets" type="a{sa{sv}}" direction="out" tp:type="String_String_Variant_Map_Map">
-                <tp:docstring>
+                <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.
-                </tp:docstring>
+                " />
             </arg>
 
             <tp:possible-errors>
               <tp:error name="org.freedesktop.NetworkManager.SecretAgent.NotAuthorized">
-                  <tp:docstring>
+                  <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:docstring>
+                  " />
               </tp:error>
               <tp:error name="org.freedesktop.NetworkManager.SecretAgent.InvalidConnection">
-                  <tp:docstring>
+                  <annotation name="org.gtk.GDBus.DocString" value="
                       Should be returned if the 'connection' argument is invalid.
-                  </tp:docstring>
+                  " />
               </tp:error>
               <tp:error name="org.freedesktop.NetworkManager.SecretAgent.UserCanceled">
-                  <tp:docstring>
+                  <annotation name="org.gtk.GDBus.DocString" value="
                       Should be returned when the user has canceled the request.
-                  </tp:docstring>
+                  " />
               </tp:error>
               <tp:error name="org.freedesktop.NetworkManager.SecretAgent.AgentCanceled">
-                  <tp:docstring>
+                  <annotation name="org.gtk.GDBus.DocString" value="
                       Should be returned when NetworkManager has requested that
                       the agent cancel the request.
-                  </tp:docstring>
+                  " />
               </tp:error>
               <tp:error name="org.freedesktop.NetworkManager.SecretAgent.InternalError">
-                  <tp:docstring>
+                  <annotation name="org.gtk.GDBus.DocString" value="
                       Should be returned if the agent has encountered some internal
                       error processing the request.
-                  </tp:docstring>
+                  " />
               </tp:error>
               <tp:error name="org.freedesktop.NetworkManager.SecretAgent.NoSecrets">
-                  <tp:docstring>
+                  <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:docstring>
+                  " />
               </tp:error>
             </tp:possible-errors>
         </method>
 
         <tp:flags name="NM_SECRET_AGENT_GET_SECRETS_FLAGS" value-prefix="NM_SECRET_AGENT_GET_SECRETS_FLAG" type="u">
-          <tp:docstring>
+          <annotation name="org.gtk.GDBus.DocString" value="
             Flags modifying the behavior of GetSecrets request.
-          </tp:docstring>
+          " />
           <tp:flag suffix="NONE" value="0x0">
-            <tp:docstring>
+            <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:docstring>
+            " />
           </tp:flag>
           <tp:flag suffix="ALLOW_INTERACTION" value="0x1">
-            <tp:docstring>
+            <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:docstring>
+            " />
           </tp:flag>
           <tp:flag suffix="REQUEST_NEW" value="0x2">
-            <tp:docstring>
+            <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:docstring>
+            " />
           </tp:flag>
           <tp:flag suffix="USER_REQUESTED" value="0x4">
-            <tp:docstring>
+            <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:docstring>
+            " />
           </tp:flag>
         </tp:flags>
 
         <method name="CancelGetSecrets">
-            <tp:docstring>
+            <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.
-            </tp:docstring>
+            " />
             <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">
-                <tp:docstring>
+                <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.
-                </tp:docstring>
+                " />
             </arg>
             <arg name="setting_name" type="s" direction="in">
-                <tp:docstring>
+                <annotation name="org.gtk.GDBus.DocString" value="
                     Setting name for which secrets for this connection were
                     originally being requested.
-                </tp:docstring>
+                " />
             </arg>
         </method>
 
         <method name="SaveSecrets">
-            <tp:docstring>
+            <annotation name="org.gtk.GDBus.DocString" value="
                 Save given secrets to backing storage.
-            </tp:docstring>
+            " />
             <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">
-                <tp:docstring>
+                <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.
-                </tp:docstring>
+                " />
             </arg>
             <arg name="connection_path" type="o" direction="in">
-                <tp:docstring>
+                <annotation name="org.gtk.GDBus.DocString" value="
                     Object path of the connection for which the agent should
                     save secrets to backing storage.
-                </tp:docstring>
+                " />
             </arg>
         </method>
 
         <method name="DeleteSecrets">
-            <tp:docstring>
+            <annotation name="org.gtk.GDBus.DocString" value="
                 Delete secrets from backing storage.
-            </tp:docstring>
+            " />
             <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">
-                <tp:docstring>
+                <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.
-                </tp:docstring>
+                " />
             </arg>
             <arg name="connection_path" type="o" direction="in">
-                <tp:docstring>
+                <annotation name="org.gtk.GDBus.DocString" value="
                     Object path of the connection for which the agent should
                     delete secrets from backing storage.
-                </tp:docstring>
+                " />
             </arg>
         </method>
 
         <tp:flags name="NM_SECRET_AGENT_CAPABILITIES" value-prefix="NM_SECRET_AGENT_CAPABILITY" type="u">
             <tp:flag suffix="NONE" value="0x0">
-                <tp:docstring>No special capabilities.</tp:docstring>
+                <annotation name="org.gtk.GDBus.DocString" value="No special capabilities." />
             </tp:flag>
             <tp:flag suffix="VPN_HINTS" value="0x1">
-                <tp:docstring>
+                <annotation name="org.gtk.GDBus.DocString" value="
                     The agent supports passing hints to VPN plugin authentication
                     dialogs.
-                </tp:docstring>
+                " />
             </tp:flag>
         </tp:flags>
 
diff --git a/introspection/nm-settings-connection.xml b/introspection/nm-settings-connection.xml
index 2d919619fd..fc62046c80 100644
--- a/introspection/nm-settings-connection.xml
+++ b/introspection/nm-settings-connection.xml
@@ -3,27 +3,27 @@
 <node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
 
     <interface name="org.freedesktop.NetworkManager.Settings.Connection">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
             Represents a single network connection configuration.
-        </tp:docstring>
+        " />
 
         <method name="Update">
-          <tp:docstring>
+          <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.
-          </tp:docstring>
+          " />
           <arg name="properties" type="a{sa{sv}}" direction="in">
-            <tp:docstring>
+            <annotation name="org.gtk.GDBus.DocString" value="
               New connection settings, properties, and (optionally) secrets.
-            </tp:docstring>
+            " />
           </arg>
         </method>
 
         <method name="UpdateUnsaved">
-          <tp:docstring>
+          <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
@@ -34,102 +34,102 @@
             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).
-          </tp:docstring>
+          " />
           <arg name="properties" type="a{sa{sv}}" direction="in">
-            <tp:docstring>
+            <annotation name="org.gtk.GDBus.DocString" value="
               New connection settings, properties, and (optionally) secrets.
-            </tp:docstring>
+            " />
           </arg>
         </method>
 
         <method name="Delete">
-          <tp:docstring>
+          <annotation name="org.gtk.GDBus.DocString" value="
             Delete the connection.
-          </tp:docstring>
+          " />
         </method>
 
         <method name="GetSettings">
-            <tp:docstring>
+            <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.
-            </tp:docstring>
+            " />
             <arg name="settings" type="a{sa{sv}}" direction="out" tp:type="String_String_Variant_Map_Map">
-                <tp:docstring>
+                <annotation name="org.gtk.GDBus.DocString" value="
                     The nested settings maps describing this object.
-                </tp:docstring>
+                " />
             </arg>
         </method>
 
         <method name="GetSecrets">
-            <tp:docstring>
+            <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.
-            </tp:docstring>
+            " />
             <arg name="setting_name" type="s" direction="in">
-                <tp:docstring>
+                <annotation name="org.gtk.GDBus.DocString" value="
                     Name of the setting to return secrets for.  If empty, all
                     all secrets will be returned.
-                </tp:docstring>
+                " />
             </arg>
 
             <arg name="secrets" type="a{sa{sv}}" direction="out" tp:type="String_String_Variant_Map_Map">
-                <tp:docstring>
+                <annotation name="org.gtk.GDBus.DocString" value="
                     Nested settings maps containing secrets.
-                </tp:docstring>
+                " />
             </arg>
         </method>
 
         <method name="ClearSecrets">
-          <tp:docstring>
+          <annotation name="org.gtk.GDBus.DocString" value="
             Clear the secrets belonging to this network connection profile.
-          </tp:docstring>
+          " />
         </method>
 
         <method name="Save">
-            <tp:docstring>
-                Saves a "dirty" connection (that had previously been
+            <annotation name="org.gtk.GDBus.DocString" value="
+                Saves a &quot;dirty&quot; connection (that had previously been
                 updated with UpdateUnsaved) to persistent storage.
-            </tp:docstring>
+            " />
         </method>
 
         <signal name="Updated">
-            <tp:docstring>
+            <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.
-            </tp:docstring>
+            " />
         </signal>
 
         <signal name="Removed">
-            <tp:docstring>
+            <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.
-            </tp:docstring>
+            " />
         </signal>
 
         <property name="Unsaved" type="b" access="read">
-            <tp:docstring>
+            <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.
-            </tp:docstring>
+            " />
         </property>
 
         <signal name="PropertiesChanged">
             <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
-                <tp:docstring>
+                <annotation name="org.gtk.GDBus.DocString" value="
                     A dictionary mapping property names to variant boxed values.
-                </tp:docstring>
+                " />
             </arg>
         </signal>
 
diff --git a/introspection/nm-settings.xml b/introspection/nm-settings.xml
index b6ab8260ea..6289202511 100644
--- a/introspection/nm-settings.xml
+++ b/introspection/nm-settings.xml
@@ -2,58 +2,58 @@
 
 <node name="/org/freedesktop/NetworkManager/Settings" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <interface name="org.freedesktop.NetworkManager.Settings">
-    <tp:docstring>
+    <annotation name="org.gtk.GDBus.DocString" value="
       The Settings interface allows clients to view and administrate the connections stored and used by NetworkManager.
-    </tp:docstring>
+    " />
 
     <method name="ListConnections">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         List the saved network connections known to NetworkManager.
-      </tp:docstring>
+      " />
       <arg name="connections" type="ao" direction="out">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           List of connections.
-        </tp:docstring>
+        " />
       </arg>
     </method>
 
     <method name="GetConnectionByUuid">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Retrieve the object path of a connection, given that connection's UUID.
-      </tp:docstring>
+      " />
       <arg name="uuid" type="s" direction="in">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The UUID to find the connection object path for.
-        </tp:docstring>
+        " />
       </arg>
       <arg name="connection" type="o" direction="out">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The connection's object path.
-        </tp:docstring>
+        " />
       </arg>
     </method>
 
     <method name="AddConnection">
-      <tp:docstring>
+      <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.
-      </tp:docstring>
+      " />
       <arg name="connection" type="a{sa{sv}}" direction="in">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           Connection settings and properties.
-        </tp:docstring>
+        " />
       </arg>
       <arg name="path" type="o" direction="out">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           Object path of the new connection that was just added.
-        </tp:docstring>
+        " />
       </arg>
     </method>
 
     <method name="AddConnectionUnsaved">
-      <tp:docstring>
+      <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,
@@ -63,105 +63,105 @@
         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).
-      </tp:docstring>
+      " />
       <arg name="connection" type="a{sa{sv}}" direction="in">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           Connection settings and properties.
-        </tp:docstring>
+        " />
       </arg>
       <arg name="path" type="o" direction="out">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           Object path of the new connection that was just added.
-        </tp:docstring>
+        " />
       </arg>
     </method>
 
     <method name="LoadConnections">
-      <tp:docstring>
+      <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 "monitor-connection-files" in NetworkManager.conf
-        is "true", then this will have no real effect, but is
+        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.
-      </tp:docstring>
+      " />
       <arg name="filenames" type="as" direction="in">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           Array of paths to on-disk connection profiles in directories
           monitored by NetworkManager.
-        </tp:docstring>
+        " />
       </arg>
       <arg name="status" type="b" direction="out">
-        <tp:docstring>
+        <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).
-        </tp:docstring>
+        " />
       </arg>
       <arg name="failures" type="as" direction="out">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           Paths of connection files that could not be loaded.
-        </tp:docstring>
+        " />
       </arg>
     </method>
 
     <method name="ReloadConnections">
-      <tp:docstring>
+      <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
-        "monitor-connection-files=false" in NetworkManager.conf.
-      </tp:docstring>
+        &quot;monitor-connection-files=false&quot; in NetworkManager.conf.
+      " />
       <arg name="status" type="b" direction="out">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           Success or failure.
-        </tp:docstring>
+        " />
       </arg>
     </method>
 
     <method name="SaveHostname">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Save the hostname to persistent configuration.
-      </tp:docstring>
+      " />
       <arg name="hostname" type="s" direction="in">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The hostname to save to persistent configuration.  If blank, the persistent hostname is cleared.
-        </tp:docstring>
+        " />
       </arg>
     </method>
 
     <property name="Connections" type="ao" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         List of object paths of available network connection profiles.
-      </tp:docstring>
+      " />
     </property>
 
     <property name="Hostname" type="s" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         The machine hostname stored in persistent configuration.
-      </tp:docstring>
+      " />
     </property>
 
     <property name="CanModify" type="b" access="read">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         If true, adding and modifying connections is supported.
-      </tp:docstring>
+      " />
     </property>
 
     <signal name="PropertiesChanged">
         <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
-            <tp:docstring>
+            <annotation name="org.gtk.GDBus.DocString" value="
                 A dictionary mapping property names to variant boxed values
-            </tp:docstring>
+            " />
         </arg>
     </signal>
 
     <signal name="NewConnection">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Emitted when a new connection has been added after NetworkManager has
         started up and initialized.  This signal is not emitted for connections
         read while starting up, because NetworkManager's D-Bus service is only
@@ -170,26 +170,26 @@
         connection list, call the ListConnections() method once, and then listen
         for individual Settings.NewConnection and Settings.Connection.Deleted
         signals for further updates.
-      </tp:docstring>
+      " />
       <arg name="connection" type="o">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           Object path of the new connection.
-        </tp:docstring>
+        " />
       </arg>
     </signal>
 
     <signal name="ConnectionRemoved">
-      <tp:docstring>
+      <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.
-      </tp:docstring>
+      " />
       <arg name="connection" type="o">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           Object path of the removed connection.
-        </tp:docstring>
+        " />
       </arg>
     </signal>
 
diff --git a/introspection/nm-vpn-connection.xml b/introspection/nm-vpn-connection.xml
index 03bbbe980f..6a4fb37db4 100644
--- a/introspection/nm-vpn-connection.xml
+++ b/introspection/nm-vpn-connection.xml
@@ -4,143 +4,143 @@
   <interface name="org.freedesktop.NetworkManager.VPN.Connection">
     <annotation name="org.gtk.GDBus.C.Name" value="VpnConnection"/>
 
-    <tp:docstring>
+    <annotation name="org.gtk.GDBus.DocString" value="
       Represents an active connection to a Virtual Private Network.
-    </tp:docstring>
+    " />
 
     <signal name="PropertiesChanged">
         <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
-            <tp:docstring>
+            <annotation name="org.gtk.GDBus.DocString" value="
                 A dictionary mapping property names to variant boxed values
-            </tp:docstring>
+            " />
         </arg>
     </signal>
 
     <property name="VpnState" type="u" access="read" tp:type="NM_VPN_CONNECTION_STATE">
-      <tp:docstring>The VPN-specific state of the connection.</tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="The VPN-specific state of the connection." />
     </property>
     <property name="Banner" type="s" access="read">
-      <tp:docstring>The banner string of the VPN connection.</tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="The banner string of the VPN connection." />
     </property>
 
     <signal name="VpnStateChanged">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Emitted when the state of the VPN connection has changed.
-      </tp:docstring>
+      " />
       <arg name="state" type="u" tp:type="NM_VPN_CONNECTION_STATE">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The new state of the VPN connection.
-        </tp:docstring>
+        " />
       </arg>
       <arg name="reason" type="u" tp:type="NM_VPN_CONNECTION_STATE_REASON">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           Reason code describing the change to the new state.
-        </tp:docstring>
+        " />
       </arg>
     </signal>
 
     <tp:enum name="NM_VPN_CONNECTION_STATE" type="u">
       <tp:enumvalue suffix="UNKNOWN" value="0">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The state of the VPN connection is unknown.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="PREPARE" value="1">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The VPN connection is preparing to connect.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="NEED_AUTH" value="2">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The VPN connection needs authorization credentials.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="CONNECT" value="3">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The VPN connection is being established.  FIXME: Should be CONNECTING or CONNECTED.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="IP_CONFIG_GET" value="4">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The VPN connection is getting an IP address.  FIXME: Should be an -ING 
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="ACTIVATED" value="5">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The VPN connection is active.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="FAILED" value="6">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The VPN connection failed.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="DISCONNECTED" value="7">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The VPN connection is disconnected.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
     </tp:enum>
     <tp:enum name="NM_VPN_CONNECTION_STATE_REASON" type="u">
       <tp:enumvalue suffix="UNKNOWN" value="0">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The reason for the VPN connection state change is unknown.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="NONE" value="1">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           No reason was given for the VPN connection state change.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="USER_DISCONNECTED" value="2">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The VPN connection changed state because the user disconnected it.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="DEVICE_DISCONNECTED" value="3">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The VPN connection changed state because the device it was using was disconnected.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="SERVICE_STOPPED" value="4">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The service providing the VPN connection was stopped.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="IP_CONFIG_INVALID" value="5">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The IP config of the VPN connection was invalid.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="CONNECT_TIMEOUT" value="6">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The connection attempt to the VPN service timed out.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="SERVICE_START_TIMEOUT" value="7">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           A timeout occurred while starting the service providing the VPN connection.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="SERVICE_START_FAILED" value="8">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           Starting the service starting the service providing the VPN connection failed.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="NO_SECRETS" value="9">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           Necessary secrets for the VPN connection were not provided.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="LOGIN_FAILED" value="10">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           Authentication to the VPN server failed.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="CONNECTION_REMOVED" value="11">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The connection was deleted from settings.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
     </tp:enum>
   </interface>
diff --git a/introspection/nm-vpn-plugin.xml b/introspection/nm-vpn-plugin.xml
index adb6a08526..ee8c69f8bf 100644
--- a/introspection/nm-vpn-plugin.xml
+++ b/introspection/nm-vpn-plugin.xml
@@ -4,20 +4,20 @@
   <interface name="org.freedesktop.NetworkManager.VPN.Plugin">
     <annotation name="org.gtk.GDBus.C.Name" value="VpnPlugin"/>
 
-    <tp:docstring>
+    <annotation name="org.gtk.GDBus.DocString" value="
       This interface is provided by plugins providing VPN services to the NetworkManager daemon.
-    </tp:docstring>
+    " />
 
     <method name="Connect">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Tells the plugin to connect.  Interactive secrets requests (eg, emitting
         the SecretsRequired signal) are not allowed.
-      </tp:docstring>
+      " />
       <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">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           Describes the connection to be established.
-        </tp:docstring>
+        " />
       </arg>
       <tp:possible-errors>
         <tp:error name="org.freedesktop.NetworkManager.VPN.Error.StartingInProgress"/>
@@ -30,22 +30,22 @@
     </method>
 
     <method name="ConnectInteractive">
-      <tp:docstring>
+      <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).
-      </tp:docstring>
+      " />
       <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">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           Describes the connection to be established.
-        </tp:docstring>
+        " />
       </arg>
       <arg name="details" type="a{sv}" direction="in" tp:type="String_Variant_Map">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           Additional details about the Connect process.
-        </tp:docstring>
+        " />
       </arg>
       <tp:possible-errors>
         <tp:error name="org.freedesktop.NetworkManager.VPN.Error.StartingInProgress"/>
@@ -59,19 +59,19 @@
     </method>
 
     <method name="NeedSecrets">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Asks the plugin whether the provided connection will require secrets to connect successfully.
-      </tp:docstring>
+      " />
       <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">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           Describes the connection that may need secrets.
-        </tp:docstring>
+        " />
       </arg>
       <arg name="setting_name" type="s" direction="out">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The setting name within the provided connection that requires secrets, if any.
-        </tp:docstring>
+        " />
       </arg>
       <tp:possible-errors>
         <tp:error name="org.freedesktop.NetworkManager.VPN.Error.ConnectionInvalid"/>
@@ -79,9 +79,9 @@
     </method>
 
     <method name="Disconnect">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Disconnect the plugin.
-      </tp:docstring>
+      " />
       <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_vpn_plugin_disconnect"/>
       <tp:possible-errors>
         <tp:error name="org.freedesktop.NetworkManager.VPN.Error.StoppingInProgress"/>
@@ -90,105 +90,105 @@
     </method>
 
     <method name="SetConfig">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Set generic connection details on the connection.
-      </tp:docstring>
+      " />
       <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">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           Generic configuration details for the connection.
-        </tp:docstring>
+        " />
       </arg>
     </method>
 
     <method name="SetIp4Config">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Set IPv4 details on the connection.
-      </tp:docstring>
+      " />
       <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">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           Ip4Config details for the connection. You must call
 	  SetConfig() before calling this.
-        </tp:docstring>
+        " />
       </arg>
     </method>
 
     <method name="SetIp6Config">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Set IPv6 details on the connection.
-      </tp:docstring>
+      " />
       <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">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           Ip6Config details for the connection. You must call
 	  SetConfig() before calling this.
-        </tp:docstring>
+        " />
       </arg>
     </method>
 
     <method name="SetFailure">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Indicate a failure to the plugin.
-      </tp:docstring>
+      " />
       <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_vpn_plugin_set_failure"/>
       <arg name="reason" type="s" direction="in">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The reason for the failure.
-        </tp:docstring>
+        " />
       </arg>
     </method>
 
     <property name="State" type="u" access="read" tp:type="NM_VPN_SERVICE_STATE">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         The state of the plugin.
-      </tp:docstring>
+      " />
     </property>
 
     <signal name="StateChanged">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Emitted when the plugin state changes.
-      </tp:docstring>
+      " />
       <arg name="state" type="u" tp:type="NM_VPN_SERVICE_STATE">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The new state of the plugin.
-        </tp:docstring>
+        " />
       </arg>
     </signal>
 
     <signal name="SecretsRequired">
-      <tp:docstring>
+      <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.
-      </tp:docstring>
+      " />
       <arg name="message" type="s" direction="out">
-          <tp:docstring>
+          <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.
-          </tp:docstring>
+          " />
       </arg>
       <arg name="secrets" type="as" direction="out">
-          <tp:docstring>
+          <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.
-          </tp:docstring>
+          " />
       </arg>
     </signal>
 
     <method name="NewSecrets">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Called in response to a SecretsRequired signal to deliver updated secrets
         or other information to the plugin.
-      </tp:docstring>
+      " />
       <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">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           Describes the connection including the new secrets.
-        </tp:docstring>
+        " />
       </arg>
       <tp:possible-errors>
         <tp:error name="org.freedesktop.NetworkManager.VPN.Error.WrongState"/>
@@ -199,113 +199,113 @@
     </method>
 
     <signal name="Config">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         The plugin obtained generic configuration information.
-      </tp:docstring>
+      " />
       <arg name="config" type="a{sv}" tp:type="String_Variant_Map">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The configuration information.
-        </tp:docstring>
+        " />
       </arg>
     </signal>
 
     <signal name="Ip4Config">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         The plugin obtained an IPv4 configuration.
-      </tp:docstring>
+      " />
       <arg name="ip4config" type="a{sv}" tp:type="String_Variant_Map">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The IPv4 configuration.
-        </tp:docstring>
+        " />
       </arg>
     </signal>
 
     <signal name="Ip6Config">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         The plugin obtained an IPv6 configuration.
-      </tp:docstring>
+      " />
       <arg name="ip6config" type="a{sv}" tp:type="String_Variant_Map">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The IPv6 configuration.
-        </tp:docstring>
+        " />
       </arg>
     </signal>
 
     <signal name="LoginBanner">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Emitted when the plugin receives a login banner from the VPN service.
-      </tp:docstring>
+      " />
       <arg name="banner" type="s">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The login banner string.
-        </tp:docstring>
+        " />
       </arg>
     </signal>
 
     <signal name="Failure">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Emitted when a failure in the VPN plugin occurs.
-      </tp:docstring>
+      " />
       <arg name="reason" type="u" tp:type="NM_VPN_PLUGIN_FAILURE">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           Reason code for the failure.
-        </tp:docstring>
+        " />
       </arg>
     </signal>
 
     <tp:enum name="NM_VPN_SERVICE_STATE" type="u">
       <tp:enumvalue suffix="UNKNOWN" value="0">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The state of the VPN plugin is unknown.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="INIT" value="1">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The VPN plugin is initialized.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="SHUTDOWN" value="2">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           (Not used.)
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="STARTING" value="3">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The plugin is attempting to connect to a VPN server.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="STARTED" value="4">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The plugin has connected to a VPN server.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="STOPPING" value="5">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The plugin is disconnecting from the VPN server.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="STOPPED" value="6">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The plugin has disconnected from the VPN server.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
     </tp:enum>
 
     <tp:enum name="NM_VPN_PLUGIN_FAILURE" type="u">
       <tp:enumvalue suffix="LOGIN_FAILED" value="0">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           Login failed.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="CONNECT_FAILED" value="1">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           Connect failed.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
       <tp:enumvalue suffix="BAD_IP_CONFIG" value="2">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           Invalid IP configuration returned from the VPN plugin.
-        </tp:docstring>
+        " />
       </tp:enumvalue>
     </tp:enum>
 
diff --git a/introspection/nm-wimax-nsp.xml b/introspection/nm-wimax-nsp.xml
index 55ac4abcf2..6174ad6738 100644
--- a/introspection/nm-wimax-nsp.xml
+++ b/introspection/nm-wimax-nsp.xml
@@ -4,38 +4,38 @@
   <interface name="org.freedesktop.NetworkManager.WiMax.Nsp">
 
     <property name="Name" type="s" access="read">
-      <tp:docstring>The name of the NSP.</tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="The name of the NSP." />
     </property>
     <property name="SignalQuality" type="u" access="read">
-      <tp:docstring>The current signal quality of the NSP, in percent.</tp:docstring>
+      <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">
-      <tp:docstring>The network type of the NSP.</tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="The network type of the NSP." />
     </property>
 
     <signal name="PropertiesChanged">
         <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
-            <tp:docstring>
+            <annotation name="org.gtk.GDBus.DocString" value="
                 A dictionary mapping property names to variant boxed values.
-            </tp:docstring>
+            " />
         </arg>
     </signal>
 
     <tp:flags name="NM_WIMAX_NSP_NETWORK_TYPE" value-prefix="NM_WIMAX_NSP_NETWORK_TYPE" type="u">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         Network type of the NSP.
-      </tp:docstring>
+      " />
       <tp:flag suffix="UNKNOWN" value="0x0">
-        <tp:docstring>Unknown network.</tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="Unknown network." />
       </tp:flag>
       <tp:flag suffix="HOME" value="0x1">
-        <tp:docstring>Home network.</tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="Home network." />
       </tp:flag>
       <tp:flag suffix="PARTNER" value="0x2">
-        <tp:docstring>Partner network.</tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="Partner network." />
       </tp:flag>
       <tp:flag suffix="ROAMING_PARTNER" value="0x3">
-        <tp:docstring>Roaming partner network.</tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="Roaming partner network." />
       </tp:flag>
 
     </tp:flags>
diff --git a/introspection/vpn-errors.xml b/introspection/vpn-errors.xml
index 7b92d07366..c1e02aacb2 100644
--- a/introspection/vpn-errors.xml
+++ b/introspection/vpn-errors.xml
@@ -2,59 +2,59 @@
 <tp:errors xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0"
     namespace="org.freedesktop.NetworkManager.VPN.Error">
   <tp:error name="General">
-    <tp:docstring>General failure without further details.</tp:docstring>
+    <annotation name="org.gtk.GDBus.DocString" value="General failure without further details." />
   </tp:error>
   <tp:error name="StartingInProgress">
-    <tp:docstring>
+    <annotation name="org.gtk.GDBus.DocString" value="
       The plugin is already starting, and another connect request was received.
-    </tp:docstring>
+    " />
   </tp:error>
   <tp:error name="AlreadyStarted">
-    <tp:docstring>
+    <annotation name="org.gtk.GDBus.DocString" value="
       The plugin is already connected, and another connect request was received.
-    </tp:docstring>
+    " />
   </tp:error>
   <tp:error name="StoppingInProgress">
-    <tp:docstring>
+    <annotation name="org.gtk.GDBus.DocString" value="
       The plugin is already stopping, and another stop request was received.
-    </tp:docstring>
+    " />
   </tp:error>
   <tp:error name="AlreadyStopped">
-    <tp:docstring>
+    <annotation name="org.gtk.GDBus.DocString" value="
       The plugin is already stopped, and another disconnect request was received.
-    </tp:docstring>
+    " />
   </tp:error>
   <tp:error name="WrongState">
-    <tp:docstring>
+    <annotation name="org.gtk.GDBus.DocString" value="
       The request could not be processed because the VPN plugin is in the wrong
       state for this type of request.
-    </tp:docstring>
+    " />
   </tp:error>
   <tp:error name="BadArguments">
-    <tp:docstring>
+    <annotation name="org.gtk.GDBus.DocString" value="
       The request could not be processed because it contained malformed
       arguments, or arguments of unexpected type. It usually means that one of
       the VPN setting data items or secrets was not of the expected type (i.e.
       int, string, bool, etc).
-    </tp:docstring>
+    " />
   </tp:error>
   <tp:error name="LaunchFailed">
-    <tp:docstring>
+    <annotation name="org.gtk.GDBus.DocString" value="
       A binary providing the service failed to launch.
-    </tp:docstring>
+    " />
   </tp:error>
   <tp:error name="ConnectionInvalid">
-    <tp:docstring>
+    <annotation name="org.gtk.GDBus.DocString" value="
       The request could not be processed because the connection was invalid. It
       usually means that the connection's VPN setting was missing some required
       data item or secret.
-    </tp:docstring>
+    " />
   </tp:error>
   <tp:error name="InteractiveNotSupported">
-    <tp:docstring>
+    <annotation name="org.gtk.GDBus.DocString" value="
       The request could not be processed because the plugin does not support
       interactive operations, such as ConnectInteractive() or NewSecrets().
-    </tp:docstring>
+    " />
   </tp:error>
 </tp:errors>
 
diff --git a/src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.xml b/src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.xml
index 1f308dd48a..c2a6cb34ea 100644
--- a/src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.xml
+++ b/src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.xml
@@ -2,28 +2,28 @@
 
 <node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
     <interface name="com.redhat.ifcfgrh1">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
           Utility methods for handling NM integration with standard Red Hat ifcfg files.
-      </tp:docstring>
+      " />
 
       <method name="GetIfcfgDetails">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           Given an ifcfg file, return various internal information about it.
-        </tp:docstring>
+        " />
         <arg name="ifcfg" type="s" direction="in">
-          <tp:docstring>
+          <annotation name="org.gtk.GDBus.DocString" value="
             The full path to an ifcfg file.
-          </tp:docstring>
+          " />
         </arg>
         <arg name="uuid" type="s" direction="out">
-          <tp:docstring>
+          <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.
-          </tp:docstring>
+          " />
         </arg>
         <arg name="path" type="o" direction="out">
-          <tp:docstring>
+          <annotation name="org.gtk.GDBus.DocString" value="
             The object path of the NM connected backed by this ifcfg file.
-          </tp:docstring>
+          " />
         </arg>
       </method>
     </interface>