dbus: remove the telepathy annotations

We now generate documentation with gdbus-codegen and these are now
useless.

12 files changed, 0 insertions, 295 deletions

diff --git a/.gitignore b/.gitignore
index 78a9130a24..6ca88f8067 100644
--- a/.gitignore
+++ b/.gitignore
@@ -138,7 +138,6 @@ test-*.trs
 
 /shared/nm-version-macros.h
 
-/introspection/all.xml
 /introspection/nmdbus-*.c
 /introspection/nmdbus-*.h
 /introspection/nmdbus-*.xml
diff --git a/configure.ac b/configure.ac
index 35193c5e32..6446f3f079 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1075,7 +1075,6 @@ clients/cli/Makefile
 clients/tui/Makefile
 clients/tui/newt/Makefile
 introspection/Makefile
-introspection/all.xml
 man/Makefile
 man/common.ent
 po/Makefile.in
diff --git a/docs/api/Makefile.am b/docs/api/Makefile.am
index 957977239d..aeba9d29b0 100644
--- a/docs/api/Makefile.am
+++ b/docs/api/Makefile.am
@@ -3,13 +3,6 @@ AUTOMAKE_OPTIONS = 1.7
 XSLTPROC = xsltproc --xinclude --nonet
 XMLS = $(wildcard $(top_srcdir)/introspection/nm-*.xml)
 
-OTHER_FILES= \
-	$(top_builddir)/introspection/all.xml \
-	$(top_srcdir)/introspection/generic-types.xml \
-	$(top_srcdir)/introspection/errors.xml \
-	$(top_srcdir)/introspection/vpn-errors.xml \
-	$(top_srcdir)/introspection/generic-types.xml
-
 GENERATED_FILES =
 
 if SETTING_DOCS_AVAILABLE
diff --git a/introspection/Makefile.am b/introspection/Makefile.am
index 4d2e129834..3a627930b9 100644
--- a/introspection/Makefile.am
+++ b/introspection/Makefile.am
@@ -136,10 +136,6 @@ BUILT_SOURCES = $(nodist_libnmdbus_la_SOURCES) $(DBUS_INTERFACE_DOCS)
 CLEANFILES = $(BUILT_SOURCES)
 
 EXTRA_DIST = \
-	all.xml.in \
-	generic-types.xml \
-	errors.xml \
-	vpn-errors.xml \
 	nm-access-point.xml \
 	nm-active-connection.xml \
 	nm-agent-manager.xml \
diff --git a/introspection/all.xml.in b/introspection/all.xml.in
deleted file mode 100644
index 273c0fda4d..0000000000
--- a/introspection/all.xml.in
+++ /dev/null
@@ -1,74 +0,0 @@
-<tp:spec
-  xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0"
-  xmlns:xi="http://www.w3.org/2001/XInclude">
-
-<tp:title>NetworkManager D-Bus Interface Specification</tp:title>
-<tp:version>@VERSION@</tp:version>
-
-
-<tp:copyright>Copyright (C) 2008 - 2016 Red Hat, Inc.</tp:copyright>
-<tp:copyright>Copyright (C) 2008 - 2009 Novell, Inc.</tp:copyright>
-
-<tp:license xmlns="http://www.w3.org/1999/xhtml">
-<p>This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.</p>
-
-<p>This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.</p>
-
-<p>You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</p>
-</tp:license>
-
-<xi:include href="nm-manager.xml"/>
-<xi:include href="nm-access-point.xml"/>
-<xi:include href="nm-device.xml"/>
-<xi:include href="nm-device-adsl.xml"/>
-<xi:include href="nm-device-bond.xml"/>
-<xi:include href="nm-device-bridge.xml"/>
-<xi:include href="nm-device-bt.xml"/>
-<xi:include href="nm-device-ethernet.xml"/>
-<xi:include href="nm-device-generic.xml"/>
-<xi:include href="nm-device-infiniband.xml"/>
-<xi:include href="nm-device-ip-tunnel.xml"/>
-<xi:include href="nm-device-macvlan.xml"/>
-<xi:include href="nm-device-modem.xml"/>
-<xi:include href="nm-device-olpc-mesh.xml"/>
-<xi:include href="nm-device-team.xml"/>
-<xi:include href="nm-device-tun.xml"/>
-<xi:include href="nm-device-veth.xml"/>
-<xi:include href="nm-device-vlan.xml"/>
-<xi:include href="nm-device-vxlan.xml"/>
-<xi:include href="nm-device-wifi.xml"/>
-<xi:include href="nm-device-wimax.xml"/>
-<xi:include href="nm-wimax-nsp.xml"/>
-<xi:include href="nm-ip4-config.xml"/>
-<xi:include href="nm-ip6-config.xml"/>
-<xi:include href="nm-dhcp4-config.xml"/>
-<xi:include href="nm-dhcp6-config.xml"/>
-<xi:include href="nm-settings.xml"/>
-<xi:include href="nm-settings-connection.xml"/>
-<xi:include href="nm-active-connection.xml"/>
-<xi:include href="nm-agent-manager.xml"/>
-<xi:include href="nm-secret-agent.xml"/>
-<xi:include href="nm-vpn-connection.xml"/>
-<xi:include href="nm-vpn-plugin.xml"/>
-
-<xi:include href="errors.xml"/>
-<xi:include href="vpn-errors.xml"/>
-<xi:include href="generic-types.xml"/>
-
-<!--
-<xi:include href="extensions.xml">
-	<xi:fallback>
-		<!- - absence of non-spec extensions is OK - ->
-	</xi:fallback>
-</xi:include>
--->
-
-</tp:spec>
diff --git a/introspection/errors.xml b/introspection/errors.xml
deleted file mode 100644
index 34a0a7b96f..0000000000
--- a/introspection/errors.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" ?>
-<tp:errors xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0"
-    namespace="org.freedesktop.NetworkManager.Error">
-  <tp:copyright>Copyright (C) 2008 Novell, Inc.</tp:copyright>
-
-  <tp:error name="Unknown Connection">
-    <annotation name="org.gtk.GDBus.DocString" value="
-        Connection was not provided by the settings service.
-    " />
-  </tp:error>
-
-  <tp:error name="Unknown Device">
-    <annotation name="org.gtk.GDBus.DocString" value="
-        Unknown device.
-    " />
-  </tp:error>
-
-  <tp:error name="Permission Denied">
-    <annotation name="org.gtk.GDBus.DocString" value="
-    User does not have the permission to activate this connection.
-    " />
-  </tp:error>
-
-</tp:errors>
diff --git a/introspection/generic-types.xml b/introspection/generic-types.xml
deleted file mode 100644
index 2fb680af92..0000000000
--- a/introspection/generic-types.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<tp:generic-types
-  xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
-  <tp:mapping name="String_Variant_Map">
-    <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">
-    <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">
-      <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">
-    <annotation name="org.gtk.GDBus.DocString" value="" />
-    <tp:enumvalue suffix="UNKNOWN" value="0">
-      <annotation name="org.gtk.GDBus.DocString" value="Mode is unknown." />
-    </tp:enumvalue>
-    <tp:enumvalue suffix="ADHOC" value="1">
-      <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:enumvalue>
-    <tp:enumvalue suffix="INFRA" value="2">
-      <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:enumvalue>
-    <tp:enumvalue suffix="AP" value="3">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        The device is an access point/hotspot.  Not valid for access point
-        objects themselves.
-      " />
-    </tp:enumvalue>
-  </tp:enum>
-</tp:generic-types>
diff --git a/introspection/vpn-errors.xml b/introspection/vpn-errors.xml
deleted file mode 100644
index c1e02aacb2..0000000000
--- a/introspection/vpn-errors.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" ?>
-<tp:errors xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0"
-    namespace="org.freedesktop.NetworkManager.VPN.Error">
-  <tp:error name="General">
-    <annotation name="org.gtk.GDBus.DocString" value="General failure without further details." />
-  </tp:error>
-  <tp:error name="StartingInProgress">
-    <annotation name="org.gtk.GDBus.DocString" value="
-      The plugin is already starting, and another connect request was received.
-    " />
-  </tp:error>
-  <tp:error name="AlreadyStarted">
-    <annotation name="org.gtk.GDBus.DocString" value="
-      The plugin is already connected, and another connect request was received.
-    " />
-  </tp:error>
-  <tp:error name="StoppingInProgress">
-    <annotation name="org.gtk.GDBus.DocString" value="
-      The plugin is already stopping, and another stop request was received.
-    " />
-  </tp:error>
-  <tp:error name="AlreadyStopped">
-    <annotation name="org.gtk.GDBus.DocString" value="
-      The plugin is already stopped, and another disconnect request was received.
-    " />
-  </tp:error>
-  <tp:error name="WrongState">
-    <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:error>
-  <tp:error name="BadArguments">
-    <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:error>
-  <tp:error name="LaunchFailed">
-    <annotation name="org.gtk.GDBus.DocString" value="
-      A binary providing the service failed to launch.
-    " />
-  </tp:error>
-  <tp:error name="ConnectionInvalid">
-    <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:error>
-  <tp:error name="InteractiveNotSupported">
-    <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:error>
-</tp:errors>
-
diff --git a/libnm-core/nm-dbus-interface.h b/libnm-core/nm-dbus-interface.h
index d76c564061..d576c703ab 100644
--- a/libnm-core/nm-dbus-interface.h
+++ b/libnm-core/nm-dbus-interface.h
@@ -94,8 +94,6 @@
  * @NM_STATE_CONNECTED_GLOBAL: there is global IPv4 and/or IPv6 Internet connectivity
  *
  * #NMState values indicate the current overall networking state.
- *
- * (Corresponds to the NM_STATE type in nm-manager.xml.)
  **/
 typedef enum {
 	NM_STATE_UNKNOWN          = 0,
@@ -118,8 +116,6 @@ typedef enum {
  *   does not appear to be able to reach the full Internet.
  * @NM_CONNECTIVITY_FULL: The host is connected to a network, and
  *   appears to be able to reach the full Internet.
- *
- * (Corresponds to the NM_CONNECTIVITY type in nm-manager.xml.)
  */
 typedef enum {
 	NM_CONNECTIVITY_UNKNOWN,
@@ -156,8 +152,6 @@ typedef enum {
  *
  * #NMDeviceType values indicate the type of hardware represented by
  * an #NMDevice.
- *
- * (Corresponds to the NM_DEVICE_TYPE type in nm-device.xml.)
  **/
 typedef enum {
 	NM_DEVICE_TYPE_UNKNOWN    = 0,
@@ -191,8 +185,6 @@ typedef enum {
  * @NM_DEVICE_CAP_IS_SOFTWARE: this device is a software device
  *
  * General device capability flags.
- *
- * (Corresponds to the NM_DEVICE_CAP type in nm-device-wifi.xml.)
  **/
 typedef enum { /*< flags >*/
 	NM_DEVICE_CAP_NONE           = 0x00000000,
@@ -218,8 +210,6 @@ typedef enum { /*< flags >*/
  * @NM_WIFI_DEVICE_CAP_FREQ_5GHZ: device supports 5GHz frequencies
  *
  * 802.11 specific device encryption and authentication capabilities.
- *
- * (Corresponds to the NM_802_11_DEVICE_CAP type in nm-device-wifi.xml.)
  **/
 typedef enum { /*< flags >*/
 	NM_WIFI_DEVICE_CAP_NONE          = 0x00000000,
@@ -244,8 +234,6 @@ typedef enum { /*< flags >*/
  * encryption (usually means WEP)
  *
  * 802.11 access point flags.
- *
- * (Corresponds to the NM_802_11_AP_FLAGS type in nm-access-point.xml.)
  **/
 typedef enum { /*< underscore_name=nm_802_11_ap_flags, flags >*/
 	NM_802_11_AP_FLAGS_NONE    = 0x00000000,
@@ -276,8 +264,6 @@ typedef enum { /*< underscore_name=nm_802_11_ap_flags, flags >*/
  * 802.11 access point security and authentication flags.  These flags describe
  * the current security requirements of an access point as determined from the
  * access point's beacon.
- *
- * (Corresponds to the NM_802_11_AP_SEC type in nm-access-point.xml.)
  **/
 typedef enum { /*< underscore_name=nm_802_11_ap_security_flags, flags >*/
 	NM_802_11_AP_SEC_NONE            = 0x00000000,
@@ -307,8 +293,6 @@ typedef enum { /*< underscore_name=nm_802_11_ap_security_flags, flags >*/
  *   access point objects; used only for hotspot mode on the local machine.
  *
  * Indicates the 802.11 mode an access point or device is currently in.
- *
- * (Corresponds to the NM_802_11_MODE type in generic-types.xml.)
  **/
 typedef enum { /*< underscore_name=nm_802_11_mode >*/
 	NM_802_11_MODE_UNKNOWN = 0,
@@ -325,8 +309,6 @@ typedef enum { /*< underscore_name=nm_802_11_mode >*/
  *
  * #NMBluetoothCapabilities values indicate the usable capabilities of a
  * Bluetooth device.
- *
- * (Corresponds to the NM_BT_CAPABILITY type in nm-device-bt.xml.)
  **/
 typedef enum { /*< flags >*/
 	NM_BT_CAPABILITY_NONE = 0x00000000,
@@ -349,8 +331,6 @@ typedef enum { /*< flags >*/
  * technology families a modem device supports.  For more information on the
  * specific access technologies the device supports use the ModemManager D-Bus
  * API.
- *
- * (Corresponds to the NM_DEVICE_MODEM_CAPABILITY type in nm-device-modem.xml.)
  **/
 typedef enum { /*< flags >*/
 	NM_DEVICE_MODEM_CAPABILITY_NONE      = 0x00000000,
@@ -398,8 +378,6 @@ typedef enum { /*< flags >*/
  *   that connection.  The network connection may still be valid.
  * @NM_DEVICE_STATE_FAILED: the device failed to connect to the requested
  *   network and is cleaning up the connection request
- *
- * (Corresponds to the NM_DEVICE_STATE type in nm-device.xml.)
  **/
 typedef enum {
 	NM_DEVICE_STATE_UNKNOWN      = 0,
@@ -484,8 +462,6 @@ typedef enum {
  * @NM_DEVICE_STATE_REASON_PARENT_MANAGED_CHANGED: the device parent's management changed
  *
  * Device state change reason codes
- *
- * (Corresponds to the NM_DEVICE_STATE_REASON type in nm-device.xml.)
  */
 typedef enum {
 	NM_DEVICE_STATE_REASON_NONE = 0,
@@ -561,8 +537,6 @@ typedef enum {
  * @NM_METERED_GUESS_YES:   Metered, the value was guessed
  * @NM_METERED_GUESS_NO:    Not metered, the value was guessed
  *
- * (Corresponds to the NM_METERED type in nm-device.xml.)
- *
  * Since: 1.2
  **/
 NM_AVAILABLE_IN_1_2
@@ -587,8 +561,6 @@ typedef enum {
  * #NMActiveConnectionState values indicate the state of a connection to a
  * specific network while it is starting, connected, or disconnecting from that
  * network.
- *
- * (Corresponds to the NM_ACTIVE_CONNECTION_STATE type in nm-active-connection.xml.)
  **/
 typedef enum {
 	NM_ACTIVE_CONNECTION_STATE_UNKNOWN = 0,
@@ -620,8 +592,6 @@ typedef enum {
  *   the D-Bus API.
  *
  * #NMSecretAgentGetSecretsFlags values modify the behavior of a GetSecrets request.
- *
- * (Corresponds to the NM_SECRET_AGENT_GET_SECRETS_FLAGS type in nm-secret-agent.xml.)
  */
 typedef enum { /*< flags >*/
 	NM_SECRET_AGENT_GET_SECRETS_FLAG_NONE = 0x0,
@@ -642,8 +612,6 @@ typedef enum { /*< flags >*/
  * @NM_SECRET_AGENT_CAPABILITY_LAST: bounds checking value; should not be used.
  *
  * #NMSecretAgentCapabilities indicate various capabilities of the agent.
- *
- * (Corresponds to the NM_SECRET_AGENT_CAPABILITIES type in nm-secret-agent.xml.)
  */
 typedef enum /*< flags >*/ {
 	NM_SECRET_AGENT_CAPABILITY_NONE = 0x0,
diff --git a/libnm-core/nm-vpn-dbus-interface.h b/libnm-core/nm-vpn-dbus-interface.h
index c4099be2ad..9226458d30 100644
--- a/libnm-core/nm-vpn-dbus-interface.h
+++ b/libnm-core/nm-vpn-dbus-interface.h
@@ -78,8 +78,6 @@
  * @NM_VPN_SERVICE_STATE_STOPPED: The plugin has disconnected from the VPN server.
  *
  * VPN daemon states
- *
- * (Corresponds to the NM_VPN_SERVICE_STATE type in nm-vpn-connection.xml.)
  */
 typedef enum {
 	NM_VPN_SERVICE_STATE_UNKNOWN = 0,
@@ -108,8 +106,6 @@ typedef enum {
  * @NM_VPN_CONNECTION_STATE_DISCONNECTED: The VPN connection is disconnected.
  *
  * VPN connection states
- *
- * (Corresponds to the NM_VPN_CONNECTION_STATE type in nm-vpn-connection.xml.)
  */
 typedef enum {
 	NM_VPN_CONNECTION_STATE_UNKNOWN = 0,
@@ -150,8 +146,6 @@ typedef enum {
  *   deleted from settings.
  *
  * VPN connection state reasons
- *
- * (Corresponds to the NM_VPN_CONNECTION_STATE_REASON type in nm-vpn-connection.xml.)
  */
 typedef enum {
 	NM_VPN_CONNECTION_STATE_REASON_UNKNOWN = 0,
@@ -176,8 +170,6 @@ typedef enum {
  *   the VPN plugin.
  *
  * VPN plugin failure reasons
- *
- * (Corresponds to the NM_VPN_PLUGIN_FAILURE type in nm-vpn-plugin.xml.)
  */
 typedef enum {
 	NM_VPN_PLUGIN_FAILURE_LOGIN_FAILED,
diff --git a/libnm-util/NetworkManager.h b/libnm-util/NetworkManager.h
index c4105fd4c0..9053fad27b 100644
--- a/libnm-util/NetworkManager.h
+++ b/libnm-util/NetworkManager.h
@@ -92,8 +92,6 @@
  * @NM_STATE_CONNECTED_GLOBAL: there is global IPv4 and/or IPv6 Internet connectivity
  *
  * #NMState values indicate the current overall networking state.
- *
- * (Corresponds to the NM_STATE type in nm-manager.xml.)
  **/
 typedef enum {
 	NM_STATE_UNKNOWN          = 0,
@@ -120,8 +118,6 @@ typedef enum {
  * @NM_CONNECTIVITY_FULL: The host is connected to a network, and
  *   appears to be able to reach the full Internet.
  *
- * (Corresponds to the NM_CONNECTIVITY type in nm-manager.xml.)
- *
  * Since: 0.9.8.6
  */
 typedef enum {
@@ -159,8 +155,6 @@ typedef enum {
  *
  * #NMDeviceType values indicate the type of hardware represented by
  * an #NMDevice.
- *
- * (Corresponds to the NM_DEVICE_TYPE type in nm-device.xml.)
  **/
 typedef enum {
 	NM_DEVICE_TYPE_UNKNOWN    = 0,
@@ -194,8 +188,6 @@ typedef enum {
  * @NM_DEVICE_CAP_IS_SOFTWARE: this device is a software device
  *
  * General device capability flags.
- *
- * (Corresponds to the NM_DEVICE_CAP type in nm-device-wifi.xml.)
  **/
 typedef enum { /*< flags >*/
 	NM_DEVICE_CAP_NONE           = 0x00000000,
@@ -221,8 +213,6 @@ typedef enum { /*< flags >*/
  * @NM_WIFI_DEVICE_CAP_FREQ_5GHZ: device supports 5GHz frequencies
  *
  * 802.11 specific device encryption and authentication capabilities.
- *
- * (Corresponds to the NM_802_11_DEVICE_CAP type in nm-device-wifi.xml.)
  **/
 typedef enum { /*< flags >*/
 	NM_WIFI_DEVICE_CAP_NONE          = 0x00000000,
@@ -247,8 +237,6 @@ typedef enum { /*< flags >*/
  * encryption (usually means WEP)
  *
  * 802.11 access point flags.
- *
- * (Corresponds to the NM_802_11_AP_FLAGS type in nm-access-point.xml.)
  **/
 typedef enum { /*< underscore_name=nm_802_11_ap_flags, flags >*/
 	NM_802_11_AP_FLAGS_NONE    = 0x00000000,
@@ -279,8 +267,6 @@ typedef enum { /*< underscore_name=nm_802_11_ap_flags, flags >*/
  * 802.11 access point security and authentication flags.  These flags describe
  * the current security requirements of an access point as determined from the
  * access point's beacon.
- *
- * (Corresponds to the NM_802_11_AP_SEC type in nm-access-point.xml.)
  **/
 typedef enum { /*< underscore_name=nm_802_11_ap_security_flags, flags >*/
 	NM_802_11_AP_SEC_NONE            = 0x00000000,
@@ -310,8 +296,6 @@ typedef enum { /*< underscore_name=nm_802_11_ap_security_flags, flags >*/
  *   access point objects; used only for hotspot mode on the local machine.
  *
  * Indicates the 802.11 mode an access point or device is currently in.
- *
- * (Corresponds to the NM_802_11_MODE type in generic-types.xml.)
  **/
 typedef enum { /*< underscore_name=nm_802_11_mode >*/
 	NM_802_11_MODE_UNKNOWN = 0,
@@ -328,8 +312,6 @@ typedef enum { /*< underscore_name=nm_802_11_mode >*/
  *
  * #NMBluetoothCapabilities values indicate the usable capabilities of a
  * Bluetooth device.
- *
- * (Corresponds to the NM_BT_CAPABILITY type in nm-device-bt.xml.)
  **/
 typedef enum { /*< flags >*/
 	NM_BT_CAPABILITY_NONE = 0x00000000,
@@ -352,8 +334,6 @@ typedef enum { /*< flags >*/
  * technology families a modem device supports.  For more information on the
  * specific access technologies the device supports use the ModemManager D-Bus
  * API.
- *
- * (Corresponds to the NM_DEVICE_MODEM_CAPABILITY type in nm-device-modem.xml.)
  **/
 typedef enum { /*< flags >*/
 	NM_DEVICE_MODEM_CAPABILITY_NONE      = 0x00000000,
@@ -401,8 +381,6 @@ typedef enum { /*< flags >*/
  *   that connection.  The network connection may still be valid.
  * @NM_DEVICE_STATE_FAILED: the device failed to connect to the requested
  *   network and is cleaning up the connection request
- *
- * (Corresponds to the NM_DEVICE_STATE type in nm-device.xml.)
  **/
 typedef enum {
 	NM_DEVICE_STATE_UNKNOWN      = 0,
@@ -488,8 +466,6 @@ typedef enum {
  * @NM_DEVICE_STATE_REASON_PARENT_MANAGED_CHANGED: the device parent's management changed
  *
  * Device state change reason codes
- *
- * (Corresponds to the NM_DEVICE_STATE_REASON type in nm-device.xml.)
  */
 typedef enum {
 	NM_DEVICE_STATE_REASON_NONE = 0,
@@ -573,8 +549,6 @@ typedef enum {
  * #NMActiveConnectionState values indicate the state of a connection to a
  * specific network while it is starting, connected, or disconnecting from that
  * network.
- *
- * (Corresponds to the NM_ACTIVE_CONNECTION_STATE type in nm-active-connection.xml.)
  **/
 typedef enum {
 	NM_ACTIVE_CONNECTION_STATE_UNKNOWN = 0,
diff --git a/libnm-util/NetworkManagerVPN.h b/libnm-util/NetworkManagerVPN.h
index 882d39739c..756619864f 100644
--- a/libnm-util/NetworkManagerVPN.h
+++ b/libnm-util/NetworkManagerVPN.h
@@ -78,8 +78,6 @@
  * @NM_VPN_SERVICE_STATE_STOPPED: The plugin has disconnected from the VPN server.
  *
  * VPN daemon states
- *
- * (Corresponds to the NM_VPN_SERVICE_STATE type in nm-vpn-connection.xml.)
  */
 typedef enum NMVPNServiceState {
 	NM_VPN_SERVICE_STATE_UNKNOWN = 0,
@@ -108,8 +106,6 @@ typedef enum NMVPNServiceState {
  * @NM_VPN_CONNECTION_STATE_DISCONNECTED: The VPN connection is disconnected.
  *
  * VPN connection states
- *
- * (Corresponds to the NM_VPN_CONNECTION_STATE type in nm-vpn-connection.xml.)
  */
 typedef enum NMVPNConnectionState {
 	NM_VPN_CONNECTION_STATE_UNKNOWN = 0,
@@ -150,8 +146,6 @@ typedef enum NMVPNConnectionState {
  *   deleted from settings.
  *
  * VPN connection state reasons
- *
- * (Corresponds to the NM_VPN_CONNECTION_STATE_REASON type in nm-vpn-connection.xml.)
  */
 typedef enum NMVPNConnectionStateReason {
 	NM_VPN_CONNECTION_STATE_REASON_UNKNOWN = 0,
@@ -176,8 +170,6 @@ typedef enum NMVPNConnectionStateReason {
  *   the VPN plugin.
  *
  * VPN plugin failure reasons
- *
- * (Corresponds to the NM_VPN_PLUGIN_FAILURE type in nm-vpn-plugin.xml.)
  */
 typedef enum {
 	NM_VPN_PLUGIN_FAILURE_LOGIN_FAILED,