From 50a58f0fabd8a34c1b6108a107e08abe3c1ccd24 Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@debian.org>
Date: Tue, 14 Jul 2015 19:38:58 +0200
Subject: Imported Upstream version 1.0.4

---
 docs/libnm-util/tmpl/NetworkManager.sgml           | 539 ------------
 docs/libnm-util/tmpl/NetworkManagerVPN.sgml        | 484 -----------
 docs/libnm-util/tmpl/libnm-util-unused.sgml        |   0
 docs/libnm-util/tmpl/nm-connection.sgml            | 663 ---------------
 docs/libnm-util/tmpl/nm-setting-8021x.sgml         | 943 ---------------------
 docs/libnm-util/tmpl/nm-setting-adsl.sgml          | 212 -----
 docs/libnm-util/tmpl/nm-setting-bluetooth.sgml     | 112 ---
 docs/libnm-util/tmpl/nm-setting-bond.sgml          | 276 ------
 docs/libnm-util/tmpl/nm-setting-bridge-port.sgml   | 113 ---
 docs/libnm-util/tmpl/nm-setting-bridge.sgml        | 193 -----
 docs/libnm-util/tmpl/nm-setting-cdma.sgml          | 130 ---
 docs/libnm-util/tmpl/nm-setting-connection.sgml    | 451 ----------
 docs/libnm-util/tmpl/nm-setting-dcb.sgml           | 395 ---------
 docs/libnm-util/tmpl/nm-setting-generic.sgml       |  65 --
 docs/libnm-util/tmpl/nm-setting-gsm.sgml           | 283 -------
 docs/libnm-util/tmpl/nm-setting-infiniband.sgml    | 145 ----
 docs/libnm-util/tmpl/nm-setting-ip4-config.sgml    | 711 ----------------
 docs/libnm-util/tmpl/nm-setting-ip6-config.sgml    | 712 ----------------
 docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml     | 113 ---
 docs/libnm-util/tmpl/nm-setting-ppp.sgml           | 354 --------
 docs/libnm-util/tmpl/nm-setting-pppoe.sgml         | 130 ---
 docs/libnm-util/tmpl/nm-setting-serial.sgml        | 146 ----
 docs/libnm-util/tmpl/nm-setting-team-port.sgml     |  81 --
 docs/libnm-util/tmpl/nm-setting-team.sgml          |  97 ---
 docs/libnm-util/tmpl/nm-setting-vlan.sgml          | 249 ------
 docs/libnm-util/tmpl/nm-setting-vpn.sgml           | 235 -----
 docs/libnm-util/tmpl/nm-setting-wimax.sgml         |  97 ---
 docs/libnm-util/tmpl/nm-setting-wired.sgml         | 349 --------
 .../tmpl/nm-setting-wireless-security.sgml         | 476 -----------
 docs/libnm-util/tmpl/nm-setting-wireless.sgml      | 402 ---------
 docs/libnm-util/tmpl/nm-setting.sgml               | 327 -------
 docs/libnm-util/tmpl/nm-utils-enum-types.sgml      |  24 -
 docs/libnm-util/tmpl/nm-utils.sgml                 | 562 ------------
 33 files changed, 10069 deletions(-)
 delete mode 100644 docs/libnm-util/tmpl/NetworkManager.sgml
 delete mode 100644 docs/libnm-util/tmpl/NetworkManagerVPN.sgml
 delete mode 100644 docs/libnm-util/tmpl/libnm-util-unused.sgml
 delete mode 100644 docs/libnm-util/tmpl/nm-connection.sgml
 delete mode 100644 docs/libnm-util/tmpl/nm-setting-8021x.sgml
 delete mode 100644 docs/libnm-util/tmpl/nm-setting-adsl.sgml
 delete mode 100644 docs/libnm-util/tmpl/nm-setting-bluetooth.sgml
 delete mode 100644 docs/libnm-util/tmpl/nm-setting-bond.sgml
 delete mode 100644 docs/libnm-util/tmpl/nm-setting-bridge-port.sgml
 delete mode 100644 docs/libnm-util/tmpl/nm-setting-bridge.sgml
 delete mode 100644 docs/libnm-util/tmpl/nm-setting-cdma.sgml
 delete mode 100644 docs/libnm-util/tmpl/nm-setting-connection.sgml
 delete mode 100644 docs/libnm-util/tmpl/nm-setting-dcb.sgml
 delete mode 100644 docs/libnm-util/tmpl/nm-setting-generic.sgml
 delete mode 100644 docs/libnm-util/tmpl/nm-setting-gsm.sgml
 delete mode 100644 docs/libnm-util/tmpl/nm-setting-infiniband.sgml
 delete mode 100644 docs/libnm-util/tmpl/nm-setting-ip4-config.sgml
 delete mode 100644 docs/libnm-util/tmpl/nm-setting-ip6-config.sgml
 delete mode 100644 docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml
 delete mode 100644 docs/libnm-util/tmpl/nm-setting-ppp.sgml
 delete mode 100644 docs/libnm-util/tmpl/nm-setting-pppoe.sgml
 delete mode 100644 docs/libnm-util/tmpl/nm-setting-serial.sgml
 delete mode 100644 docs/libnm-util/tmpl/nm-setting-team-port.sgml
 delete mode 100644 docs/libnm-util/tmpl/nm-setting-team.sgml
 delete mode 100644 docs/libnm-util/tmpl/nm-setting-vlan.sgml
 delete mode 100644 docs/libnm-util/tmpl/nm-setting-vpn.sgml
 delete mode 100644 docs/libnm-util/tmpl/nm-setting-wimax.sgml
 delete mode 100644 docs/libnm-util/tmpl/nm-setting-wired.sgml
 delete mode 100644 docs/libnm-util/tmpl/nm-setting-wireless-security.sgml
 delete mode 100644 docs/libnm-util/tmpl/nm-setting-wireless.sgml
 delete mode 100644 docs/libnm-util/tmpl/nm-setting.sgml
 delete mode 100644 docs/libnm-util/tmpl/nm-utils-enum-types.sgml
 delete mode 100644 docs/libnm-util/tmpl/nm-utils.sgml

(limited to 'docs/libnm-util/tmpl')

diff --git a/docs/libnm-util/tmpl/NetworkManager.sgml b/docs/libnm-util/tmpl/NetworkManager.sgml
deleted file mode 100644
index 008d08b8..00000000
--- a/docs/libnm-util/tmpl/NetworkManager.sgml
+++ /dev/null
@@ -1,539 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NetworkManager
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_DBUS_SERVICE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_PATH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_DEVICE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_DEVICE_WIRED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_DEVICE_ADSL ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_DEVICE_WIRELESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_DEVICE_BLUETOOTH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_DEVICE_OLPC_MESH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_PATH_ACCESS_POINT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_ACCESS_POINT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_DEVICE_MODEM ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_DEVICE_WIMAX ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_WIMAX_NSP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_PATH_WIMAX_NSP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_ACTIVE_CONNECTION ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_IP4_CONFIG ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_DHCP4_CONFIG ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_IP6_CONFIG ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_DHCP6_CONFIG ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_DEVICE_INFINIBAND ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_DEVICE_BOND ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_DEVICE_TEAM ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_DEVICE_VLAN ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_DEVICE_BRIDGE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_DEVICE_GENERIC ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_DEVICE_VETH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_DEVICE_TUN ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_DEVICE_MACVLAN ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_DEVICE_VXLAN ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_DEVICE_GRE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_IFACE_SETTINGS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_PATH_SETTINGS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_IFACE_SETTINGS_CONNECTION ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_PATH_SETTINGS_CONNECTION ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_IFACE_SETTINGS_CONNECTION_SECRETS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_AGENT_MANAGER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_PATH_AGENT_MANAGER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_SECRET_AGENT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_PATH_SECRET_AGENT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMState ##### -->
-<para>
-
-</para>
-
-@NM_STATE_UNKNOWN: 
-@NM_STATE_ASLEEP: 
-@NM_STATE_DISCONNECTED: 
-@NM_STATE_DISCONNECTING: 
-@NM_STATE_CONNECTING: 
-@NM_STATE_CONNECTED_LOCAL: 
-@NM_STATE_CONNECTED_SITE: 
-@NM_STATE_CONNECTED_GLOBAL: 
-
-<!-- ##### MACRO NM_STATE_CONNECTED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMConnectivityState ##### -->
-<para>
-
-</para>
-
-@NM_CONNECTIVITY_UNKNOWN: 
-@NM_CONNECTIVITY_NONE: 
-@NM_CONNECTIVITY_PORTAL: 
-@NM_CONNECTIVITY_LIMITED: 
-@NM_CONNECTIVITY_FULL: 
-
-<!-- ##### ENUM NMDeviceType ##### -->
-<para>
-
-</para>
-
-@NM_DEVICE_TYPE_UNKNOWN: 
-@NM_DEVICE_TYPE_ETHERNET: 
-@NM_DEVICE_TYPE_WIFI: 
-@NM_DEVICE_TYPE_UNUSED1: 
-@NM_DEVICE_TYPE_UNUSED2: 
-@NM_DEVICE_TYPE_BT: 
-@NM_DEVICE_TYPE_OLPC_MESH: 
-@NM_DEVICE_TYPE_WIMAX: 
-@NM_DEVICE_TYPE_MODEM: 
-@NM_DEVICE_TYPE_INFINIBAND: 
-@NM_DEVICE_TYPE_BOND: 
-@NM_DEVICE_TYPE_VLAN: 
-@NM_DEVICE_TYPE_ADSL: 
-@NM_DEVICE_TYPE_BRIDGE: 
-@NM_DEVICE_TYPE_GENERIC: 
-@NM_DEVICE_TYPE_TEAM: 
-
-<!-- ##### ENUM NMDeviceCapabilities ##### -->
-<para>
-
-</para>
-
-@NM_DEVICE_CAP_NONE: 
-@NM_DEVICE_CAP_NM_SUPPORTED: 
-@NM_DEVICE_CAP_CARRIER_DETECT: 
-@NM_DEVICE_CAP_IS_SOFTWARE: 
-
-<!-- ##### ENUM NMDeviceWifiCapabilities ##### -->
-<para>
-
-</para>
-
-@NM_WIFI_DEVICE_CAP_NONE: 
-@NM_WIFI_DEVICE_CAP_CIPHER_WEP40: 
-@NM_WIFI_DEVICE_CAP_CIPHER_WEP104: 
-@NM_WIFI_DEVICE_CAP_CIPHER_TKIP: 
-@NM_WIFI_DEVICE_CAP_CIPHER_CCMP: 
-@NM_WIFI_DEVICE_CAP_WPA: 
-@NM_WIFI_DEVICE_CAP_RSN: 
-@NM_WIFI_DEVICE_CAP_AP: 
-@NM_WIFI_DEVICE_CAP_ADHOC: 
-@NM_WIFI_DEVICE_CAP_FREQ_VALID: 
-@NM_WIFI_DEVICE_CAP_FREQ_2GHZ: 
-@NM_WIFI_DEVICE_CAP_FREQ_5GHZ: 
-
-<!-- ##### ENUM NM80211ApFlags ##### -->
-<para>
-
-</para>
-
-@NM_802_11_AP_FLAGS_NONE: 
-@NM_802_11_AP_FLAGS_PRIVACY: 
-
-<!-- ##### ENUM NM80211ApSecurityFlags ##### -->
-<para>
-
-</para>
-
-@NM_802_11_AP_SEC_NONE: 
-@NM_802_11_AP_SEC_PAIR_WEP40: 
-@NM_802_11_AP_SEC_PAIR_WEP104: 
-@NM_802_11_AP_SEC_PAIR_TKIP: 
-@NM_802_11_AP_SEC_PAIR_CCMP: 
-@NM_802_11_AP_SEC_GROUP_WEP40: 
-@NM_802_11_AP_SEC_GROUP_WEP104: 
-@NM_802_11_AP_SEC_GROUP_TKIP: 
-@NM_802_11_AP_SEC_GROUP_CCMP: 
-@NM_802_11_AP_SEC_KEY_MGMT_PSK: 
-@NM_802_11_AP_SEC_KEY_MGMT_802_1X: 
-
-<!-- ##### ENUM NM80211Mode ##### -->
-<para>
-
-</para>
-
-@NM_802_11_MODE_UNKNOWN: 
-@NM_802_11_MODE_ADHOC: 
-@NM_802_11_MODE_INFRA: 
-@NM_802_11_MODE_AP: 
-
-<!-- ##### ENUM NMBluetoothCapabilities ##### -->
-<para>
-
-</para>
-
-@NM_BT_CAPABILITY_NONE: 
-@NM_BT_CAPABILITY_DUN: 
-@NM_BT_CAPABILITY_NAP: 
-
-<!-- ##### ENUM NMDeviceModemCapabilities ##### -->
-<para>
-
-</para>
-
-@NM_DEVICE_MODEM_CAPABILITY_NONE: 
-@NM_DEVICE_MODEM_CAPABILITY_POTS: 
-@NM_DEVICE_MODEM_CAPABILITY_CDMA_EVDO: 
-@NM_DEVICE_MODEM_CAPABILITY_GSM_UMTS: 
-@NM_DEVICE_MODEM_CAPABILITY_LTE: 
-
-<!-- ##### ENUM NMDeviceState ##### -->
-<para>
-
-</para>
-
-@NM_DEVICE_STATE_UNKNOWN: 
-@NM_DEVICE_STATE_UNMANAGED: 
-@NM_DEVICE_STATE_UNAVAILABLE: 
-@NM_DEVICE_STATE_DISCONNECTED: 
-@NM_DEVICE_STATE_PREPARE: 
-@NM_DEVICE_STATE_CONFIG: 
-@NM_DEVICE_STATE_NEED_AUTH: 
-@NM_DEVICE_STATE_IP_CONFIG: 
-@NM_DEVICE_STATE_IP_CHECK: 
-@NM_DEVICE_STATE_SECONDARIES: 
-@NM_DEVICE_STATE_ACTIVATED: 
-@NM_DEVICE_STATE_DEACTIVATING: 
-@NM_DEVICE_STATE_FAILED: 
-
-<!-- ##### ENUM NMDeviceStateReason ##### -->
-<para>
-
-</para>
-
-@NM_DEVICE_STATE_REASON_NONE: 
-@NM_DEVICE_STATE_REASON_UNKNOWN: 
-@NM_DEVICE_STATE_REASON_NOW_MANAGED: 
-@NM_DEVICE_STATE_REASON_NOW_UNMANAGED: 
-@NM_DEVICE_STATE_REASON_CONFIG_FAILED: 
-@NM_DEVICE_STATE_REASON_IP_CONFIG_UNAVAILABLE: 
-@NM_DEVICE_STATE_REASON_IP_CONFIG_EXPIRED: 
-@NM_DEVICE_STATE_REASON_NO_SECRETS: 
-@NM_DEVICE_STATE_REASON_SUPPLICANT_DISCONNECT: 
-@NM_DEVICE_STATE_REASON_SUPPLICANT_CONFIG_FAILED: 
-@NM_DEVICE_STATE_REASON_SUPPLICANT_FAILED: 
-@NM_DEVICE_STATE_REASON_SUPPLICANT_TIMEOUT: 
-@NM_DEVICE_STATE_REASON_PPP_START_FAILED: 
-@NM_DEVICE_STATE_REASON_PPP_DISCONNECT: 
-@NM_DEVICE_STATE_REASON_PPP_FAILED: 
-@NM_DEVICE_STATE_REASON_DHCP_START_FAILED: 
-@NM_DEVICE_STATE_REASON_DHCP_ERROR: 
-@NM_DEVICE_STATE_REASON_DHCP_FAILED: 
-@NM_DEVICE_STATE_REASON_SHARED_START_FAILED: 
-@NM_DEVICE_STATE_REASON_SHARED_FAILED: 
-@NM_DEVICE_STATE_REASON_AUTOIP_START_FAILED: 
-@NM_DEVICE_STATE_REASON_AUTOIP_ERROR: 
-@NM_DEVICE_STATE_REASON_AUTOIP_FAILED: 
-@NM_DEVICE_STATE_REASON_MODEM_BUSY: 
-@NM_DEVICE_STATE_REASON_MODEM_NO_DIAL_TONE: 
-@NM_DEVICE_STATE_REASON_MODEM_NO_CARRIER: 
-@NM_DEVICE_STATE_REASON_MODEM_DIAL_TIMEOUT: 
-@NM_DEVICE_STATE_REASON_MODEM_DIAL_FAILED: 
-@NM_DEVICE_STATE_REASON_MODEM_INIT_FAILED: 
-@NM_DEVICE_STATE_REASON_GSM_APN_FAILED: 
-@NM_DEVICE_STATE_REASON_GSM_REGISTRATION_NOT_SEARCHING: 
-@NM_DEVICE_STATE_REASON_GSM_REGISTRATION_DENIED: 
-@NM_DEVICE_STATE_REASON_GSM_REGISTRATION_TIMEOUT: 
-@NM_DEVICE_STATE_REASON_GSM_REGISTRATION_FAILED: 
-@NM_DEVICE_STATE_REASON_GSM_PIN_CHECK_FAILED: 
-@NM_DEVICE_STATE_REASON_FIRMWARE_MISSING: 
-@NM_DEVICE_STATE_REASON_REMOVED: 
-@NM_DEVICE_STATE_REASON_SLEEPING: 
-@NM_DEVICE_STATE_REASON_CONNECTION_REMOVED: 
-@NM_DEVICE_STATE_REASON_USER_REQUESTED: 
-@NM_DEVICE_STATE_REASON_CARRIER: 
-@NM_DEVICE_STATE_REASON_CONNECTION_ASSUMED: 
-@NM_DEVICE_STATE_REASON_SUPPLICANT_AVAILABLE: 
-@NM_DEVICE_STATE_REASON_MODEM_NOT_FOUND: 
-@NM_DEVICE_STATE_REASON_BT_FAILED: 
-@NM_DEVICE_STATE_REASON_GSM_SIM_NOT_INSERTED: 
-@NM_DEVICE_STATE_REASON_GSM_SIM_PIN_REQUIRED: 
-@NM_DEVICE_STATE_REASON_GSM_SIM_PUK_REQUIRED: 
-@NM_DEVICE_STATE_REASON_GSM_SIM_WRONG: 
-@NM_DEVICE_STATE_REASON_INFINIBAND_MODE: 
-@NM_DEVICE_STATE_REASON_DEPENDENCY_FAILED: 
-@NM_DEVICE_STATE_REASON_BR2684_FAILED: 
-@NM_DEVICE_STATE_REASON_MODEM_MANAGER_UNAVAILABLE: 
-@NM_DEVICE_STATE_REASON_SSID_NOT_FOUND: 
-@NM_DEVICE_STATE_REASON_SECONDARY_CONNECTION_FAILED: 
-@NM_DEVICE_STATE_REASON_DCB_FCOE_FAILED: 
-@NM_DEVICE_STATE_REASON_TEAMD_CONTROL_FAILED: 
-@NM_DEVICE_STATE_REASON_MODEM_FAILED: 
-@NM_DEVICE_STATE_REASON_MODEM_AVAILABLE: 
-@NM_DEVICE_STATE_REASON_SIM_PIN_INCORRECT: 
-@NM_DEVICE_STATE_REASON_NEW_ACTIVATION: 
-@NM_DEVICE_STATE_REASON_LAST: 
-
-<!-- ##### ENUM NMActiveConnectionState ##### -->
-<para>
-
-</para>
-
-@NM_ACTIVE_CONNECTION_STATE_UNKNOWN: 
-@NM_ACTIVE_CONNECTION_STATE_ACTIVATING: 
-@NM_ACTIVE_CONNECTION_STATE_ACTIVATED: 
-@NM_ACTIVE_CONNECTION_STATE_DEACTIVATING: 
-@NM_ACTIVE_CONNECTION_STATE_DEACTIVATED: 
-
diff --git a/docs/libnm-util/tmpl/NetworkManagerVPN.sgml b/docs/libnm-util/tmpl/NetworkManagerVPN.sgml
deleted file mode 100644
index 03b7f316..00000000
--- a/docs/libnm-util/tmpl/NetworkManagerVPN.sgml
+++ /dev/null
@@ -1,484 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NetworkManagerVPN
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_DBUS_PATH_VPN ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_VPN ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_PATH_VPN_CONNECTION ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_VPN_CONNECTION ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_DBUS_PLUGIN_PATH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_DBUS_PLUGIN_INTERFACE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_NO_ACTIVE_VPN_CONNECTION ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_NO_VPN_CONNECTIONS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INVALID_VPN_CONNECTION ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_VPN_ERROR_PREFIX ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_VPN_STARTING_IN_PROGRESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_VPN_ALREADY_STARTED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_VPN_STOPPING_IN_PROGRESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_VPN_ALREADY_STOPPED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_VPN_WRONG_STATE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_VPN_BAD_ARGUMENTS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_VPN_INTERACTIVE_NOT_SUPPORTED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_VPN_SIGNAL_LOGIN_BANNER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_VPN_SIGNAL_LOGIN_FAILED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_VPN_SIGNAL_LAUNCH_FAILED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_VPN_SIGNAL_CONNECT_FAILED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_VPN_SIGNAL_VPN_CONFIG_BAD ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_VPN_SIGNAL_IP_CONFIG_BAD ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_VPN_SIGNAL_STATE_CHANGE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_VPN_SIGNAL_IP4_CONFIG ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMVPNServiceState ##### -->
-<para>
-
-</para>
-
-@NM_VPN_SERVICE_STATE_UNKNOWN: 
-@NM_VPN_SERVICE_STATE_INIT: 
-@NM_VPN_SERVICE_STATE_SHUTDOWN: 
-@NM_VPN_SERVICE_STATE_STARTING: 
-@NM_VPN_SERVICE_STATE_STARTED: 
-@NM_VPN_SERVICE_STATE_STOPPING: 
-@NM_VPN_SERVICE_STATE_STOPPED: 
-
-<!-- ##### ENUM NMVPNConnectionState ##### -->
-<para>
-
-</para>
-
-@NM_VPN_CONNECTION_STATE_UNKNOWN: 
-@NM_VPN_CONNECTION_STATE_PREPARE: 
-@NM_VPN_CONNECTION_STATE_NEED_AUTH: 
-@NM_VPN_CONNECTION_STATE_CONNECT: 
-@NM_VPN_CONNECTION_STATE_IP_CONFIG_GET: 
-@NM_VPN_CONNECTION_STATE_ACTIVATED: 
-@NM_VPN_CONNECTION_STATE_FAILED: 
-@NM_VPN_CONNECTION_STATE_DISCONNECTED: 
-
-<!-- ##### ENUM NMVPNConnectionStateReason ##### -->
-<para>
-
-</para>
-
-@NM_VPN_CONNECTION_STATE_REASON_UNKNOWN: 
-@NM_VPN_CONNECTION_STATE_REASON_NONE: 
-@NM_VPN_CONNECTION_STATE_REASON_USER_DISCONNECTED: 
-@NM_VPN_CONNECTION_STATE_REASON_DEVICE_DISCONNECTED: 
-@NM_VPN_CONNECTION_STATE_REASON_SERVICE_STOPPED: 
-@NM_VPN_CONNECTION_STATE_REASON_IP_CONFIG_INVALID: 
-@NM_VPN_CONNECTION_STATE_REASON_CONNECT_TIMEOUT: 
-@NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_TIMEOUT: 
-@NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_FAILED: 
-@NM_VPN_CONNECTION_STATE_REASON_NO_SECRETS: 
-@NM_VPN_CONNECTION_STATE_REASON_LOGIN_FAILED: 
-@NM_VPN_CONNECTION_STATE_REASON_CONNECTION_REMOVED: 
-
-<!-- ##### ENUM NMVPNPluginFailure ##### -->
-<para>
-
-</para>
-
-@NM_VPN_PLUGIN_FAILURE_LOGIN_FAILED: 
-@NM_VPN_PLUGIN_FAILURE_CONNECT_FAILED: 
-@NM_VPN_PLUGIN_FAILURE_BAD_IP_CONFIG: 
-
-<!-- ##### MACRO NM_VPN_PLUGIN_CONFIG_TUNDEV ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_CONFIG_BANNER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_CONFIG_EXT_GATEWAY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_CONFIG_MTU ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_CONFIG_HAS_IP4 ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_CONFIG_HAS_IP6 ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_CAN_PERSIST ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP4_CONFIG_INT_GATEWAY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP4_CONFIG_ADDRESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP4_CONFIG_PTP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP4_CONFIG_PREFIX ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP4_CONFIG_DNS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP4_CONFIG_NBNS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP4_CONFIG_MSS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP4_CONFIG_DOMAIN ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP4_CONFIG_DOMAINS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP4_CONFIG_ROUTES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP4_CONFIG_NEVER_DEFAULT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP4_CONFIG_GATEWAY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP4_CONFIG_BANNER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP4_CONFIG_EXT_GATEWAY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP4_CONFIG_MTU ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP4_CONFIG_TUNDEV ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP6_CONFIG_INT_GATEWAY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP6_CONFIG_ADDRESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP6_CONFIG_PTP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP6_CONFIG_PREFIX ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP6_CONFIG_DNS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP6_CONFIG_MSS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP6_CONFIG_DOMAIN ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP6_CONFIG_DOMAINS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP6_CONFIG_ROUTES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP6_CONFIG_NEVER_DEFAULT ##### -->
-<para>
-
-</para>
-
-
-
diff --git a/docs/libnm-util/tmpl/libnm-util-unused.sgml b/docs/libnm-util/tmpl/libnm-util-unused.sgml
deleted file mode 100644
index e69de29b..00000000
diff --git a/docs/libnm-util/tmpl/nm-connection.sgml b/docs/libnm-util/tmpl/nm-connection.sgml
deleted file mode 100644
index 27d34bb6..00000000
--- a/docs/libnm-util/tmpl/nm-connection.sgml
+++ /dev/null
@@ -1,663 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMConnection
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_CONNECTION_SECRETS_UPDATED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_CONNECTION_SECRETS_CLEARED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_CONNECTION_CHANGED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_CONNECTION_PATH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMConnectionError ##### -->
-<para>
-
-</para>
-
-@NM_CONNECTION_ERROR_UNKNOWN: 
-@NM_CONNECTION_ERROR_CONNECTION_SETTING_NOT_FOUND: 
-@NM_CONNECTION_ERROR_CONNECTION_TYPE_INVALID: 
-@NM_CONNECTION_ERROR_SETTING_NOT_FOUND: 
-@NM_CONNECTION_ERROR_INVALID_SETTING: 
-
-<!-- ##### MACRO NM_CONNECTION_NORMALIZE_PARAM_IP6_CONFIG_METHOD ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_CONNECTION_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_connection_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### STRUCT NMConnection ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SIGNAL NMConnection::changed ##### -->
-<para>
-
-</para>
-
-@nmconnection: the object which received the signal.
-
-<!-- ##### SIGNAL NMConnection::secrets-cleared ##### -->
-<para>
-
-</para>
-
-@nmconnection: the object which received the signal.
-
-<!-- ##### SIGNAL NMConnection::secrets-updated ##### -->
-<para>
-
-</para>
-
-@nmconnection: the object which received the signal.
-@arg1: 
-
-<!-- ##### ARG NMConnection:path ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION nm_connection_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_new_from_hash ##### -->
-<para>
-
-</para>
-
-@hash: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_duplicate ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_create_setting ##### -->
-<para>
-
-</para>
-
-@name: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_add_setting ##### -->
-<para>
-
-</para>
-
-@connection: 
-@setting: 
-
-
-<!-- ##### FUNCTION nm_connection_remove_setting ##### -->
-<para>
-
-</para>
-
-@connection: 
-@setting_type: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting ##### -->
-<para>
-
-</para>
-
-@connection: 
-@setting_type: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_by_name ##### -->
-<para>
-
-</para>
-
-@connection: 
-@name: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_replace_settings ##### -->
-<para>
-
-</para>
-
-@connection: 
-@new_settings: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_replace_settings_from_connection ##### -->
-<para>
-
-</para>
-
-@connection: 
-@new_connection: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_compare ##### -->
-<para>
-
-</para>
-
-@a: 
-@b: 
-@flags: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_diff ##### -->
-<para>
-
-</para>
-
-@a: 
-@b: 
-@flags: 
-@out_settings: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_verify ##### -->
-<para>
-
-</para>
-
-@connection: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_normalize ##### -->
-<para>
-
-</para>
-
-@connection: 
-@parameters: 
-@modified: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_need_secrets ##### -->
-<para>
-
-</para>
-
-@connection: 
-@hints: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_clear_secrets ##### -->
-<para>
-
-</para>
-
-@connection: 
-
-
-<!-- ##### FUNCTION nm_connection_clear_secrets_with_flags ##### -->
-<para>
-
-</para>
-
-@connection: 
-@func: 
-@user_data: 
-
-
-<!-- ##### FUNCTION nm_connection_update_secrets ##### -->
-<para>
-
-</para>
-
-@connection: 
-@setting_name: 
-@secrets: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_set_path ##### -->
-<para>
-
-</para>
-
-@connection: 
-@path: 
-
-
-<!-- ##### FUNCTION nm_connection_get_path ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_virtual_iface_name ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_interface_name ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_is_type ##### -->
-<para>
-
-</para>
-
-@connection: 
-@type: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_for_each_setting_value ##### -->
-<para>
-
-</para>
-
-@connection: 
-@func: 
-@user_data: 
-
-
-<!-- ##### FUNCTION nm_connection_to_hash ##### -->
-<para>
-
-</para>
-
-@connection: 
-@flags: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_dump ##### -->
-<para>
-
-</para>
-
-@connection: 
-
-
-<!-- ##### FUNCTION nm_connection_lookup_setting_type ##### -->
-<para>
-
-</para>
-
-@name: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_lookup_setting_type_by_quark ##### -->
-<para>
-
-</para>
-
-@error_quark: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_uuid ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_id ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_connection_type ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_virtual_device_description ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_802_1x ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_bluetooth ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_bond ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_team ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_team_port ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_bridge ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_bridge_port ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_cdma ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_connection ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_dcb ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_generic ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_gsm ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_infiniband ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_ip4_config ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_ip6_config ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_olpc_mesh ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_ppp ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_pppoe ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_serial ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_vpn ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_wimax ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_adsl ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_wired ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_wireless ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_wireless_security ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_vlan ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-8021x.sgml b/docs/libnm-util/tmpl/nm-setting-8021x.sgml
deleted file mode 100644
index a5b6f315..00000000
--- a/docs/libnm-util/tmpl/nm-setting-8021x.sgml
+++ /dev/null
@@ -1,943 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSetting8021x
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### ENUM NMSetting8021xCKFormat ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_802_1X_CK_FORMAT_UNKNOWN: 
-@NM_SETTING_802_1X_CK_FORMAT_X509: 
-@NM_SETTING_802_1X_CK_FORMAT_RAW_KEY: 
-@NM_SETTING_802_1X_CK_FORMAT_PKCS12: 
-
-<!-- ##### ENUM NMSetting8021xCKScheme ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_802_1X_CK_SCHEME_UNKNOWN: 
-@NM_SETTING_802_1X_CK_SCHEME_BLOB: 
-@NM_SETTING_802_1X_CK_SCHEME_PATH: 
-
-<!-- ##### MACRO NM_SETTING_802_1X_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSetting8021xError ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_802_1X_ERROR_UNKNOWN: 
-@NM_SETTING_802_1X_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_802_1X_ERROR_MISSING_PROPERTY: 
-
-<!-- ##### MACRO NM_SETTING_802_1X_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_EAP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_IDENTITY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_ANONYMOUS_IDENTITY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PAC_FILE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_CA_CERT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_CA_PATH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_SUBJECT_MATCH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_ALTSUBJECT_MATCHES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_CLIENT_CERT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PHASE1_PEAPVER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PHASE1_PEAPLABEL ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PHASE2_AUTH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PHASE2_AUTHEAP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PHASE2_CA_CERT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PHASE2_CA_PATH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PHASE2_SUBJECT_MATCH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PHASE2_CLIENT_CERT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PASSWORD ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PASSWORD_FLAGS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PASSWORD_RAW ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PASSWORD_RAW_FLAGS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PRIVATE_KEY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PHASE2_PRIVATE_KEY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PIN ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PIN_FLAGS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_SYSTEM_CA_CERTS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_num_eap_methods ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_eap_method ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_add_eap_method ##### -->
-<para>
-
-</para>
-
-@setting: 
-@eap: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_remove_eap_method ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_remove_eap_method_by_value ##### -->
-<para>
-
-</para>
-
-@setting: 
-@eap: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_clear_eap_methods ##### -->
-<para>
-
-</para>
-
-@setting: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_identity ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_anonymous_identity ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_pac_file ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_system_ca_certs ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_ca_path ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase2_ca_path ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_ca_cert_scheme ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_ca_cert_blob ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_ca_cert_path ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_set_ca_cert ##### -->
-<para>
-
-</para>
-
-@setting: 
-@cert_path: 
-@scheme: 
-@out_format: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_subject_match ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_num_altsubject_matches ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_altsubject_match ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_add_altsubject_match ##### -->
-<para>
-
-</para>
-
-@setting: 
-@altsubject_match: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_remove_altsubject_match ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_remove_altsubject_match_by_value ##### -->
-<para>
-
-</para>
-
-@setting: 
-@altsubject_match: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_clear_altsubject_matches ##### -->
-<para>
-
-</para>
-
-@setting: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_client_cert_scheme ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_client_cert_blob ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_client_cert_path ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_set_client_cert ##### -->
-<para>
-
-</para>
-
-@setting: 
-@cert_path: 
-@scheme: 
-@out_format: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase1_peapver ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase1_peaplabel ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase1_fast_provisioning ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase2_auth ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase2_autheap ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase2_ca_cert_scheme ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase2_ca_cert_blob ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase2_ca_cert_path ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_set_phase2_ca_cert ##### -->
-<para>
-
-</para>
-
-@setting: 
-@cert_path: 
-@scheme: 
-@out_format: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase2_subject_match ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_num_phase2_altsubject_matches ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase2_altsubject_match ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_add_phase2_altsubject_match ##### -->
-<para>
-
-</para>
-
-@setting: 
-@phase2_altsubject_match: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_remove_phase2_altsubject_match ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_remove_phase2_altsubject_match_by_value ##### -->
-<para>
-
-</para>
-
-@setting: 
-@phase2_altsubject_match: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_clear_phase2_altsubject_matches ##### -->
-<para>
-
-</para>
-
-@setting: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase2_client_cert_scheme ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase2_client_cert_blob ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase2_client_cert_path ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_set_phase2_client_cert ##### -->
-<para>
-
-</para>
-
-@setting: 
-@cert_path: 
-@scheme: 
-@out_format: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_password ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_password_flags ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_password_raw ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_password_raw_flags ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_pin ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_pin_flags ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_private_key_scheme ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_private_key_blob ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_private_key_path ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_set_private_key ##### -->
-<para>
-
-</para>
-
-@setting: 
-@key_path: 
-@password: 
-@scheme: 
-@out_format: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_private_key_password ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_private_key_password_flags ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_private_key_format ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase2_private_key_scheme ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase2_private_key_blob ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase2_private_key_path ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_set_phase2_private_key ##### -->
-<para>
-
-</para>
-
-@setting: 
-@key_path: 
-@password: 
-@scheme: 
-@out_format: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase2_private_key_password ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase2_private_key_password_flags ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase2_private_key_format ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-adsl.sgml b/docs/libnm-util/tmpl/nm-setting-adsl.sgml
deleted file mode 100644
index aa9a1661..00000000
--- a/docs/libnm-util/tmpl/nm-setting-adsl.sgml
+++ /dev/null
@@ -1,212 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingAdsl
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_ADSL_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingAdslError ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_ADSL_ERROR_UNKNOWN: 
-@NM_SETTING_ADSL_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_ADSL_ERROR_MISSING_PROPERTY: 
-
-<!-- ##### MACRO NM_SETTING_ADSL_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_adsl_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_SETTING_ADSL_USERNAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_ADSL_PASSWORD ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_ADSL_PASSWORD_FLAGS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_ADSL_PROTOCOL ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_ADSL_ENCAPSULATION ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_ADSL_VPI ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_ADSL_VCI ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_ADSL_PROTOCOL_PPPOA ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_ADSL_PROTOCOL_PPPOE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_ADSL_PROTOCOL_IPOATM ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_ADSL_ENCAPSULATION_VCMUX ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_ADSL_ENCAPSULATION_LLC ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_adsl_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_adsl_get_username ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_adsl_get_password ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_adsl_get_protocol ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_adsl_get_encapsulation ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_adsl_get_vpi ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_adsl_get_vci ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_adsl_get_password_flags ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-bluetooth.sgml b/docs/libnm-util/tmpl/nm-setting-bluetooth.sgml
deleted file mode 100644
index 058e98fc..00000000
--- a/docs/libnm-util/tmpl/nm-setting-bluetooth.sgml
+++ /dev/null
@@ -1,112 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingBluetooth
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_BLUETOOTH_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingBluetoothError ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_BLUETOOTH_ERROR_UNKNOWN: 
-@NM_SETTING_BLUETOOTH_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_BLUETOOTH_ERROR_MISSING_PROPERTY: 
-@NM_SETTING_BLUETOOTH_ERROR_TYPE_SETTING_NOT_FOUND: 
-
-<!-- ##### MACRO NM_SETTING_BLUETOOTH_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_bluetooth_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_SETTING_BLUETOOTH_BDADDR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BLUETOOTH_TYPE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BLUETOOTH_TYPE_DUN ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BLUETOOTH_TYPE_PANU ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_bluetooth_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_bluetooth_get_bdaddr ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_bluetooth_get_connection_type ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-bond.sgml b/docs/libnm-util/tmpl/nm-setting-bond.sgml
deleted file mode 100644
index 2131ced0..00000000
--- a/docs/libnm-util/tmpl/nm-setting-bond.sgml
+++ /dev/null
@@ -1,276 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingBond
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_BOND_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingBondError ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_BOND_ERROR_UNKNOWN: 
-@NM_SETTING_BOND_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_BOND_ERROR_MISSING_PROPERTY: 
-@NM_SETTING_BOND_ERROR_INVALID_OPTION: 
-@NM_SETTING_BOND_ERROR_MISSING_OPTION: 
-
-<!-- ##### MACRO NM_SETTING_BOND_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_bond_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_SETTING_BOND_INTERFACE_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BOND_OPTIONS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BOND_OPTION_MODE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BOND_OPTION_MIIMON ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BOND_OPTION_DOWNDELAY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BOND_OPTION_UPDELAY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BOND_OPTION_ARP_INTERVAL ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BOND_OPTION_ARP_IP_TARGET ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BOND_OPTION_ARP_VALIDATE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BOND_OPTION_PRIMARY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BOND_OPTION_PRIMARY_RESELECT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BOND_OPTION_FAIL_OVER_MAC ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BOND_OPTION_USE_CARRIER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BOND_OPTION_AD_SELECT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BOND_OPTION_XMIT_HASH_POLICY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BOND_OPTION_RESEND_IGMP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BOND_OPTION_LACP_RATE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_bond_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_bond_get_interface_name ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_bond_get_num_options ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_bond_get_option ##### -->
-<para>
-
-</para>
-
-@setting: 
-@idx: 
-@out_name: 
-@out_value: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_bond_get_option_by_name ##### -->
-<para>
-
-</para>
-
-@setting: 
-@name: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_bond_add_option ##### -->
-<para>
-
-</para>
-
-@setting: 
-@name: 
-@value: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_bond_remove_option ##### -->
-<para>
-
-</para>
-
-@setting: 
-@name: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_bond_validate_option ##### -->
-<para>
-
-</para>
-
-@name: 
-@value: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_bond_get_valid_options ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_bond_get_option_default ##### -->
-<para>
-
-</para>
-
-@setting: 
-@name: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-bridge-port.sgml b/docs/libnm-util/tmpl/nm-setting-bridge-port.sgml
deleted file mode 100644
index ebbed6db..00000000
--- a/docs/libnm-util/tmpl/nm-setting-bridge-port.sgml
+++ /dev/null
@@ -1,113 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingBridgePort
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_BRIDGE_PORT_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingBridgePortError ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_BRIDGE_PORT_ERROR_UNKNOWN: 
-@NM_SETTING_BRIDGE_PORT_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_BRIDGE_PORT_ERROR_MISSING_PROPERTY: 
-
-<!-- ##### MACRO NM_SETTING_BRIDGE_PORT_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_bridge_port_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_SETTING_BRIDGE_PORT_PRIORITY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BRIDGE_PORT_PATH_COST ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_bridge_port_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_bridge_port_get_priority ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_bridge_port_get_path_cost ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_bridge_port_get_hairpin_mode ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-bridge.sgml b/docs/libnm-util/tmpl/nm-setting-bridge.sgml
deleted file mode 100644
index 1b14c3d8..00000000
--- a/docs/libnm-util/tmpl/nm-setting-bridge.sgml
+++ /dev/null
@@ -1,193 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingBridge
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_BRIDGE_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingBridgeError ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_BRIDGE_ERROR_UNKNOWN: 
-@NM_SETTING_BRIDGE_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_BRIDGE_ERROR_MISSING_PROPERTY: 
-
-<!-- ##### MACRO NM_SETTING_BRIDGE_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_bridge_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_SETTING_BRIDGE_INTERFACE_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BRIDGE_MAC_ADDRESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BRIDGE_STP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BRIDGE_PRIORITY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BRIDGE_FORWARD_DELAY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BRIDGE_HELLO_TIME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BRIDGE_MAX_AGE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BRIDGE_AGEING_TIME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_bridge_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_bridge_get_interface_name ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_bridge_get_mac_address ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_bridge_get_stp ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_bridge_get_priority ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_bridge_get_forward_delay ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_bridge_get_hello_time ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_bridge_get_max_age ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_bridge_get_ageing_time ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-cdma.sgml b/docs/libnm-util/tmpl/nm-setting-cdma.sgml
deleted file mode 100644
index fdcad0de..00000000
--- a/docs/libnm-util/tmpl/nm-setting-cdma.sgml
+++ /dev/null
@@ -1,130 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingCdma
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_CDMA_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingCdmaError ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_CDMA_ERROR_UNKNOWN: 
-@NM_SETTING_CDMA_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_CDMA_ERROR_MISSING_PROPERTY: 
-@NM_SETTING_CDMA_ERROR_MISSING_SERIAL_SETTING: 
-
-<!-- ##### MACRO NM_SETTING_CDMA_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_cdma_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_SETTING_CDMA_NUMBER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_CDMA_USERNAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_CDMA_PASSWORD ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_CDMA_PASSWORD_FLAGS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_cdma_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_cdma_get_number ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_cdma_get_username ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_cdma_get_password ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_cdma_get_password_flags ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-connection.sgml b/docs/libnm-util/tmpl/nm-setting-connection.sgml
deleted file mode 100644
index 732527f6..00000000
--- a/docs/libnm-util/tmpl/nm-setting-connection.sgml
+++ /dev/null
@@ -1,451 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingConnection
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_CONNECTION_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingConnectionError ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_CONNECTION_ERROR_UNKNOWN: 
-@NM_SETTING_CONNECTION_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_CONNECTION_ERROR_MISSING_PROPERTY: 
-@NM_SETTING_CONNECTION_ERROR_TYPE_SETTING_NOT_FOUND: 
-@NM_SETTING_CONNECTION_ERROR_IP_CONFIG_NOT_ALLOWED: 
-
-<!-- ##### MACRO NM_SETTING_CONNECTION_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_connection_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_SETTING_CONNECTION_ID ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_CONNECTION_UUID ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_CONNECTION_INTERFACE_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_CONNECTION_TYPE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_CONNECTION_AUTOCONNECT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_CONNECTION_TIMESTAMP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_CONNECTION_READ_ONLY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_CONNECTION_PERMISSIONS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_CONNECTION_ZONE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_CONNECTION_MASTER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_CONNECTION_SLAVE_TYPE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_CONNECTION_SECONDARIES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_CONNECTION_GATEWAY_PING_TIMEOUT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### STRUCT NMSettingConnection ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG NMSettingConnection:autoconnect ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingConnection:gateway-ping-timeout ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingConnection:id ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingConnection:interface-name ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingConnection:master ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingConnection:permissions ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingConnection:read-only ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingConnection:secondaries ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingConnection:slave-type ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingConnection:timestamp ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingConnection:type ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingConnection:uuid ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingConnection:zone ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION nm_setting_connection_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_get_id ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_get_uuid ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_get_interface_name ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_get_connection_type ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_get_autoconnect ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_get_timestamp ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_get_read_only ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_get_num_permissions ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_get_permission ##### -->
-<para>
-
-</para>
-
-@setting: 
-@idx: 
-@out_ptype: 
-@out_pitem: 
-@out_detail: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_get_zone ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_permissions_user_allowed ##### -->
-<para>
-
-</para>
-
-@setting: 
-@uname: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_add_permission ##### -->
-<para>
-
-</para>
-
-@setting: 
-@ptype: 
-@pitem: 
-@detail: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_remove_permission ##### -->
-<para>
-
-</para>
-
-@setting: 
-@idx: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_remove_permission_by_value ##### -->
-<para>
-
-</para>
-
-@setting: 
-@ptype: 
-@pitem: 
-@detail: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_get_master ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_is_slave_type ##### -->
-<para>
-
-</para>
-
-@setting: 
-@type: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_get_slave_type ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_get_num_secondaries ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_get_secondary ##### -->
-<para>
-
-</para>
-
-@setting: 
-@idx: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_add_secondary ##### -->
-<para>
-
-</para>
-
-@setting: 
-@sec_uuid: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_remove_secondary ##### -->
-<para>
-
-</para>
-
-@setting: 
-@idx: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_remove_secondary_by_value ##### -->
-<para>
-
-</para>
-
-@setting: 
-@sec_uuid: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_get_gateway_ping_timeout ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-dcb.sgml b/docs/libnm-util/tmpl/nm-setting-dcb.sgml
deleted file mode 100644
index f7b8abb1..00000000
--- a/docs/libnm-util/tmpl/nm-setting-dcb.sgml
+++ /dev/null
@@ -1,395 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingDcb
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_DCB_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingDcbError ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_DCB_ERROR_UNKNOWN: 
-@NM_SETTING_DCB_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_DCB_ERROR_MISSING_PROPERTY: 
-
-<!-- ##### MACRO NM_SETTING_DCB_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_dcb_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### ENUM NMSettingDcbFlags ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_DCB_FLAG_NONE: 
-@NM_SETTING_DCB_FLAG_ENABLE: 
-@NM_SETTING_DCB_FLAG_ADVERTISE: 
-@NM_SETTING_DCB_FLAG_WILLING: 
-
-<!-- ##### MACRO NM_SETTING_DCB_FCOE_MODE_FABRIC ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_DCB_FCOE_MODE_VN2VN ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_DCB_APP_FCOE_FLAGS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_DCB_APP_FCOE_PRIORITY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_DCB_APP_FCOE_MODE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_DCB_APP_ISCSI_FLAGS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_DCB_APP_ISCSI_PRIORITY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_DCB_APP_FIP_FLAGS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_DCB_APP_FIP_PRIORITY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_DCB_PRIORITY_FLOW_CONTROL_FLAGS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_DCB_PRIORITY_FLOW_CONTROL ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_DCB_PRIORITY_GROUP_FLAGS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_DCB_PRIORITY_GROUP_ID ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_DCB_PRIORITY_GROUP_BANDWIDTH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_DCB_PRIORITY_BANDWIDTH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_DCB_PRIORITY_STRICT_BANDWIDTH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_DCB_PRIORITY_TRAFFIC_CLASS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_dcb_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_dcb_get_app_fcoe_flags ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_dcb_get_app_fcoe_priority ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_dcb_get_app_fcoe_mode ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_dcb_get_app_iscsi_flags ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_dcb_get_app_iscsi_priority ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_dcb_get_app_fip_flags ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_dcb_get_app_fip_priority ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_dcb_get_priority_flow_control_flags ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_dcb_get_priority_flow_control ##### -->
-<para>
-
-</para>
-
-@setting: 
-@user_priority: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_dcb_set_priority_flow_control ##### -->
-<para>
-
-</para>
-
-@setting: 
-@user_priority: 
-@enabled: 
-
-
-<!-- ##### FUNCTION nm_setting_dcb_get_priority_group_flags ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_dcb_get_priority_group_id ##### -->
-<para>
-
-</para>
-
-@setting: 
-@user_priority: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_dcb_set_priority_group_id ##### -->
-<para>
-
-</para>
-
-@setting: 
-@user_priority: 
-@group_id: 
-
-
-<!-- ##### FUNCTION nm_setting_dcb_get_priority_group_bandwidth ##### -->
-<para>
-
-</para>
-
-@setting: 
-@group_id: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_dcb_set_priority_group_bandwidth ##### -->
-<para>
-
-</para>
-
-@setting: 
-@group_id: 
-@bandwidth_percent: 
-
-
-<!-- ##### FUNCTION nm_setting_dcb_get_priority_bandwidth ##### -->
-<para>
-
-</para>
-
-@setting: 
-@user_priority: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_dcb_set_priority_bandwidth ##### -->
-<para>
-
-</para>
-
-@setting: 
-@user_priority: 
-@bandwidth_percent: 
-
-
-<!-- ##### FUNCTION nm_setting_dcb_get_priority_strict_bandwidth ##### -->
-<para>
-
-</para>
-
-@setting: 
-@user_priority: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_dcb_set_priority_strict_bandwidth ##### -->
-<para>
-
-</para>
-
-@setting: 
-@user_priority: 
-@strict: 
-
-
-<!-- ##### FUNCTION nm_setting_dcb_get_priority_traffic_class ##### -->
-<para>
-
-</para>
-
-@setting: 
-@user_priority: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_dcb_set_priority_traffic_class ##### -->
-<para>
-
-</para>
-
-@setting: 
-@user_priority: 
-@traffic_class: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-generic.sgml b/docs/libnm-util/tmpl/nm-setting-generic.sgml
deleted file mode 100644
index 2c88c208..00000000
--- a/docs/libnm-util/tmpl/nm-setting-generic.sgml
+++ /dev/null
@@ -1,65 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingGeneric
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_GENERIC_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingGenericError ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_GENERIC_ERROR_UNKNOWN: 
-@NM_SETTING_GENERIC_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_GENERIC_ERROR_MISSING_PROPERTY: 
-
-<!-- ##### MACRO NM_SETTING_GENERIC_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_generic_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_generic_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-gsm.sgml b/docs/libnm-util/tmpl/nm-setting-gsm.sgml
deleted file mode 100644
index 6dc2d3bf..00000000
--- a/docs/libnm-util/tmpl/nm-setting-gsm.sgml
+++ /dev/null
@@ -1,283 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingGsm
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_GSM_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingGsmError ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_GSM_ERROR_UNKNOWN: 
-@NM_SETTING_GSM_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_GSM_ERROR_MISSING_PROPERTY: 
-@NM_SETTING_GSM_ERROR_MISSING_SERIAL_SETTING: 
-
-<!-- ##### MACRO NM_SETTING_GSM_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_gsm_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_SETTING_GSM_NUMBER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_GSM_USERNAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_GSM_PASSWORD ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_GSM_PASSWORD_FLAGS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_GSM_APN ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_GSM_NETWORK_ID ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_GSM_PIN ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_GSM_PIN_FLAGS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_GSM_HOME_ONLY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_GSM_ALLOWED_BANDS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_GSM_NETWORK_TYPE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingGsmNetworkType ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_GSM_NETWORK_TYPE_ANY: 
-@NM_SETTING_GSM_NETWORK_TYPE_UMTS_HSPA: 
-@NM_SETTING_GSM_NETWORK_TYPE_GPRS_EDGE: 
-@NM_SETTING_GSM_NETWORK_TYPE_PREFER_UMTS_HSPA: 
-@NM_SETTING_GSM_NETWORK_TYPE_PREFER_GPRS_EDGE: 
-@NM_SETTING_GSM_NETWORK_TYPE_PREFER_4G: 
-@NM_SETTING_GSM_NETWORK_TYPE_4G: 
-
-<!-- ##### ENUM NMSettingGsmNetworkBand ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_GSM_BAND_UNKNOWN: 
-@NM_SETTING_GSM_BAND_ANY: 
-@NM_SETTING_GSM_BAND_EGSM: 
-@NM_SETTING_GSM_BAND_DCS: 
-@NM_SETTING_GSM_BAND_PCS: 
-@NM_SETTING_GSM_BAND_G850: 
-@NM_SETTING_GSM_BAND_U2100: 
-@NM_SETTING_GSM_BAND_U1800: 
-@NM_SETTING_GSM_BAND_U17IV: 
-@NM_SETTING_GSM_BAND_U800: 
-@NM_SETTING_GSM_BAND_U850: 
-@NM_SETTING_GSM_BAND_U900: 
-@NM_SETTING_GSM_BAND_U17IX: 
-@NM_SETTING_GSM_BAND_U1900: 
-@NM_SETTING_GSM_BAND_U2600: 
-
-<!-- ##### MACRO NM_SETTING_GSM_BANDS_MAX ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_gsm_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_gsm_get_number ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_gsm_get_username ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_gsm_get_password ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_gsm_get_apn ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_gsm_get_network_id ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_gsm_get_pin ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_gsm_get_home_only ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_gsm_get_pin_flags ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_gsm_get_password_flags ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_gsm_get_network_type ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_gsm_get_allowed_bands ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-infiniband.sgml b/docs/libnm-util/tmpl/nm-setting-infiniband.sgml
deleted file mode 100644
index 7a695cdd..00000000
--- a/docs/libnm-util/tmpl/nm-setting-infiniband.sgml
+++ /dev/null
@@ -1,145 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingInfiniband
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_INFINIBAND_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingInfinibandError ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_INFINIBAND_ERROR_UNKNOWN: 
-@NM_SETTING_INFINIBAND_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_INFINIBAND_ERROR_MISSING_PROPERTY: 
-
-<!-- ##### MACRO NM_SETTING_INFINIBAND_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_infiniband_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_SETTING_INFINIBAND_MAC_ADDRESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_INFINIBAND_MTU ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_INFINIBAND_TRANSPORT_MODE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_INFINIBAND_P_KEY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_INFINIBAND_PARENT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_infiniband_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_infiniband_get_mac_address ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_infiniband_get_mtu ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_infiniband_get_transport_mode ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_infiniband_get_p_key ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_infiniband_get_parent ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-ip4-config.sgml b/docs/libnm-util/tmpl/nm-setting-ip4-config.sgml
deleted file mode 100644
index e035c493..00000000
--- a/docs/libnm-util/tmpl/nm-setting-ip4-config.sgml
+++ /dev/null
@@ -1,711 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingIP4Config
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_IP4_CONFIG_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingIP4ConfigError ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_IP4_CONFIG_ERROR_UNKNOWN: 
-@NM_SETTING_IP4_CONFIG_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_IP4_CONFIG_ERROR_MISSING_PROPERTY: 
-@NM_SETTING_IP4_CONFIG_ERROR_NOT_ALLOWED_FOR_METHOD: 
-
-<!-- ##### MACRO NM_SETTING_IP4_CONFIG_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_SETTING_IP4_CONFIG_METHOD ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP4_CONFIG_DNS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP4_CONFIG_DNS_SEARCH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP4_CONFIG_ADDRESSES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP4_CONFIG_ROUTES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP4_CONFIG_ROUTE_METRIC ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP4_CONFIG_NEVER_DEFAULT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP4_CONFIG_MAY_FAIL ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP4_CONFIG_METHOD_AUTO ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP4_CONFIG_METHOD_MANUAL ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP4_CONFIG_METHOD_SHARED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP4_CONFIG_METHOD_DISABLED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_ip4_address_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip4_address_dup ##### -->
-<para>
-
-</para>
-
-@source: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip4_address_ref ##### -->
-<para>
-
-</para>
-
-@address: 
-
-
-<!-- ##### FUNCTION nm_ip4_address_unref ##### -->
-<para>
-
-</para>
-
-@address: 
-
-
-<!-- ##### FUNCTION nm_ip4_address_compare ##### -->
-<para>
-
-</para>
-
-@address: 
-@other: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip4_address_get_address ##### -->
-<para>
-
-</para>
-
-@address: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip4_address_set_address ##### -->
-<para>
-
-</para>
-
-@address: 
-@addr: 
-
-
-<!-- ##### FUNCTION nm_ip4_address_get_prefix ##### -->
-<para>
-
-</para>
-
-@address: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip4_address_set_prefix ##### -->
-<para>
-
-</para>
-
-@address: 
-@prefix: 
-
-
-<!-- ##### FUNCTION nm_ip4_address_get_gateway ##### -->
-<para>
-
-</para>
-
-@address: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip4_address_set_gateway ##### -->
-<para>
-
-</para>
-
-@address: 
-@gateway: 
-
-
-<!-- ##### FUNCTION nm_ip4_route_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip4_route_dup ##### -->
-<para>
-
-</para>
-
-@source: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip4_route_ref ##### -->
-<para>
-
-</para>
-
-@route: 
-
-
-<!-- ##### FUNCTION nm_ip4_route_unref ##### -->
-<para>
-
-</para>
-
-@route: 
-
-
-<!-- ##### FUNCTION nm_ip4_route_compare ##### -->
-<para>
-
-</para>
-
-@route: 
-@other: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip4_route_get_dest ##### -->
-<para>
-
-</para>
-
-@route: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip4_route_set_dest ##### -->
-<para>
-
-</para>
-
-@route: 
-@dest: 
-
-
-<!-- ##### FUNCTION nm_ip4_route_get_prefix ##### -->
-<para>
-
-</para>
-
-@route: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip4_route_set_prefix ##### -->
-<para>
-
-</para>
-
-@route: 
-@prefix: 
-
-
-<!-- ##### FUNCTION nm_ip4_route_get_next_hop ##### -->
-<para>
-
-</para>
-
-@route: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip4_route_set_next_hop ##### -->
-<para>
-
-</para>
-
-@route: 
-@next_hop: 
-
-
-<!-- ##### FUNCTION nm_ip4_route_get_metric ##### -->
-<para>
-
-</para>
-
-@route: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip4_route_set_metric ##### -->
-<para>
-
-</para>
-
-@route: 
-@metric: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_get_method ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_get_num_dns ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_get_dns ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_add_dns ##### -->
-<para>
-
-</para>
-
-@setting: 
-@dns: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_remove_dns ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_remove_dns_by_value ##### -->
-<para>
-
-</para>
-
-@setting: 
-@dns: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_clear_dns ##### -->
-<para>
-
-</para>
-
-@setting: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_get_num_dns_searches ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_get_dns_search ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_add_dns_search ##### -->
-<para>
-
-</para>
-
-@setting: 
-@dns_search: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_remove_dns_search ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_remove_dns_search_by_value ##### -->
-<para>
-
-</para>
-
-@setting: 
-@dns_search: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_clear_dns_searches ##### -->
-<para>
-
-</para>
-
-@setting: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_get_num_addresses ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_get_address ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_add_address ##### -->
-<para>
-
-</para>
-
-@setting: 
-@address: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_remove_address ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_remove_address_by_value ##### -->
-<para>
-
-</para>
-
-@setting: 
-@address: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_clear_addresses ##### -->
-<para>
-
-</para>
-
-@setting: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_get_num_routes ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_get_route ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_add_route ##### -->
-<para>
-
-</para>
-
-@setting: 
-@route: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_remove_route ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_remove_route_by_value ##### -->
-<para>
-
-</para>
-
-@setting: 
-@route: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_clear_routes ##### -->
-<para>
-
-</para>
-
-@setting: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_get_route_metric ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_get_ignore_auto_routes ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_get_ignore_auto_dns ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_get_dhcp_client_id ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_get_dhcp_send_hostname ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_get_dhcp_hostname ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_get_never_default ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_get_may_fail ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-ip6-config.sgml b/docs/libnm-util/tmpl/nm-setting-ip6-config.sgml
deleted file mode 100644
index 1f089c63..00000000
--- a/docs/libnm-util/tmpl/nm-setting-ip6-config.sgml
+++ /dev/null
@@ -1,712 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingIP6Config
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_IP6_CONFIG_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingIP6ConfigError ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_IP6_CONFIG_ERROR_UNKNOWN: 
-@NM_SETTING_IP6_CONFIG_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_IP6_CONFIG_ERROR_MISSING_PROPERTY: 
-@NM_SETTING_IP6_CONFIG_ERROR_NOT_ALLOWED_FOR_METHOD: 
-
-<!-- ##### MACRO NM_SETTING_IP6_CONFIG_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_SETTING_IP6_CONFIG_METHOD ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP6_CONFIG_DNS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP6_CONFIG_DNS_SEARCH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP6_CONFIG_ADDRESSES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP6_CONFIG_ROUTES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP6_CONFIG_ROUTE_METRIC ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP6_CONFIG_NEVER_DEFAULT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP6_CONFIG_MAY_FAIL ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP6_CONFIG_IP6_PRIVACY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP6_CONFIG_METHOD_IGNORE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP6_CONFIG_METHOD_AUTO ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP6_CONFIG_METHOD_DHCP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP6_CONFIG_METHOD_MANUAL ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP6_CONFIG_METHOD_SHARED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingIP6ConfigPrivacy ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_IP6_CONFIG_PRIVACY_UNKNOWN: 
-@NM_SETTING_IP6_CONFIG_PRIVACY_DISABLED: 
-@NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_PUBLIC_ADDR: 
-@NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_TEMP_ADDR: 
-
-<!-- ##### FUNCTION nm_ip6_address_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip6_address_dup ##### -->
-<para>
-
-</para>
-
-@source: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip6_address_ref ##### -->
-<para>
-
-</para>
-
-@address: 
-
-
-<!-- ##### FUNCTION nm_ip6_address_unref ##### -->
-<para>
-
-</para>
-
-@address: 
-
-
-<!-- ##### FUNCTION nm_ip6_address_compare ##### -->
-<para>
-
-</para>
-
-@address: 
-@other: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip6_address_get_address ##### -->
-<para>
-
-</para>
-
-@address: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip6_address_set_address ##### -->
-<para>
-
-</para>
-
-@address: 
-@addr: 
-
-
-<!-- ##### FUNCTION nm_ip6_address_get_prefix ##### -->
-<para>
-
-</para>
-
-@address: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip6_address_set_prefix ##### -->
-<para>
-
-</para>
-
-@address: 
-@prefix: 
-
-
-<!-- ##### FUNCTION nm_ip6_address_get_gateway ##### -->
-<para>
-
-</para>
-
-@address: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip6_address_set_gateway ##### -->
-<para>
-
-</para>
-
-@address: 
-@gateway: 
-
-
-<!-- ##### FUNCTION nm_ip6_route_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip6_route_dup ##### -->
-<para>
-
-</para>
-
-@source: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip6_route_ref ##### -->
-<para>
-
-</para>
-
-@route: 
-
-
-<!-- ##### FUNCTION nm_ip6_route_unref ##### -->
-<para>
-
-</para>
-
-@route: 
-
-
-<!-- ##### FUNCTION nm_ip6_route_compare ##### -->
-<para>
-
-</para>
-
-@route: 
-@other: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip6_route_get_dest ##### -->
-<para>
-
-</para>
-
-@route: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip6_route_set_dest ##### -->
-<para>
-
-</para>
-
-@route: 
-@dest: 
-
-
-<!-- ##### FUNCTION nm_ip6_route_get_prefix ##### -->
-<para>
-
-</para>
-
-@route: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip6_route_set_prefix ##### -->
-<para>
-
-</para>
-
-@route: 
-@prefix: 
-
-
-<!-- ##### FUNCTION nm_ip6_route_get_next_hop ##### -->
-<para>
-
-</para>
-
-@route: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip6_route_set_next_hop ##### -->
-<para>
-
-</para>
-
-@route: 
-@next_hop: 
-
-
-<!-- ##### FUNCTION nm_ip6_route_get_metric ##### -->
-<para>
-
-</para>
-
-@route: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip6_route_set_metric ##### -->
-<para>
-
-</para>
-
-@route: 
-@metric: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_get_method ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_get_num_dns ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_get_dns ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_add_dns ##### -->
-<para>
-
-</para>
-
-@setting: 
-@dns: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_remove_dns ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_remove_dns_by_value ##### -->
-<para>
-
-</para>
-
-@setting: 
-@dns: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_clear_dns ##### -->
-<para>
-
-</para>
-
-@setting: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_get_num_dns_searches ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_get_dns_search ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_add_dns_search ##### -->
-<para>
-
-</para>
-
-@setting: 
-@dns_search: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_remove_dns_search ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_remove_dns_search_by_value ##### -->
-<para>
-
-</para>
-
-@setting: 
-@dns_search: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_clear_dns_searches ##### -->
-<para>
-
-</para>
-
-@setting: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_get_num_addresses ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_get_address ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_add_address ##### -->
-<para>
-
-</para>
-
-@setting: 
-@address: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_remove_address ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_remove_address_by_value ##### -->
-<para>
-
-</para>
-
-@setting: 
-@address: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_clear_addresses ##### -->
-<para>
-
-</para>
-
-@setting: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_get_num_routes ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_get_route ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_add_route ##### -->
-<para>
-
-</para>
-
-@setting: 
-@route: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_remove_route ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_remove_route_by_value ##### -->
-<para>
-
-</para>
-
-@setting: 
-@route: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_clear_routes ##### -->
-<para>
-
-</para>
-
-@setting: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_get_ignore_auto_routes ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_get_route_metric ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_get_ignore_auto_dns ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_get_dhcp_hostname ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_get_never_default ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_get_may_fail ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_get_ip6_privacy ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml b/docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml
deleted file mode 100644
index c3971303..00000000
--- a/docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml
+++ /dev/null
@@ -1,113 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingOlpcMesh
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_OLPC_MESH_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingOlpcMeshError ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_OLPC_MESH_ERROR_UNKNOWN: 
-@NM_SETTING_OLPC_MESH_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_OLPC_MESH_ERROR_MISSING_PROPERTY: 
-
-<!-- ##### MACRO NM_SETTING_OLPC_MESH_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_olpc_mesh_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_SETTING_OLPC_MESH_SSID ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_OLPC_MESH_CHANNEL ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_olpc_mesh_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_olpc_mesh_get_ssid ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_olpc_mesh_get_channel ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_olpc_mesh_get_dhcp_anycast_address ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-ppp.sgml b/docs/libnm-util/tmpl/nm-setting-ppp.sgml
deleted file mode 100644
index ccf4f0d9..00000000
--- a/docs/libnm-util/tmpl/nm-setting-ppp.sgml
+++ /dev/null
@@ -1,354 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingPPP
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_PPP_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingPPPError ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_PPP_ERROR_UNKNOWN: 
-@NM_SETTING_PPP_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_PPP_ERROR_MISSING_PROPERTY: 
-@NM_SETTING_PPP_ERROR_REQUIRE_MPPE_NOT_ALLOWED: 
-
-<!-- ##### MACRO NM_SETTING_PPP_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_ppp_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_SETTING_PPP_NOAUTH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPP_REFUSE_EAP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPP_REFUSE_PAP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPP_REFUSE_CHAP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPP_REFUSE_MSCHAP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPP_REFUSE_MSCHAPV2 ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPP_NOBSDCOMP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPP_NODEFLATE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPP_NO_VJ_COMP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPP_REQUIRE_MPPE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPP_REQUIRE_MPPE_128 ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPP_MPPE_STATEFUL ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPP_CRTSCTS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPP_BAUD ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPP_MRU ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPP_MTU ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPP_LCP_ECHO_FAILURE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPP_LCP_ECHO_INTERVAL ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_ppp_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ppp_get_noauth ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ppp_get_refuse_eap ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ppp_get_refuse_pap ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ppp_get_refuse_chap ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ppp_get_refuse_mschap ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ppp_get_refuse_mschapv2 ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ppp_get_nobsdcomp ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ppp_get_nodeflate ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ppp_get_no_vj_comp ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ppp_get_require_mppe ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ppp_get_require_mppe_128 ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ppp_get_mppe_stateful ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ppp_get_crtscts ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ppp_get_baud ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ppp_get_mru ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ppp_get_mtu ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ppp_get_lcp_echo_failure ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ppp_get_lcp_echo_interval ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-pppoe.sgml b/docs/libnm-util/tmpl/nm-setting-pppoe.sgml
deleted file mode 100644
index f34ba1d2..00000000
--- a/docs/libnm-util/tmpl/nm-setting-pppoe.sgml
+++ /dev/null
@@ -1,130 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingPPPOE
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_PPPOE_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingPPPOEError ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_PPPOE_ERROR_UNKNOWN: 
-@NM_SETTING_PPPOE_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_PPPOE_ERROR_MISSING_PROPERTY: 
-@NM_SETTING_PPPOE_ERROR_MISSING_PPP_SETTING: 
-
-<!-- ##### MACRO NM_SETTING_PPPOE_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_pppoe_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_SETTING_PPPOE_SERVICE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPPOE_USERNAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPPOE_PASSWORD ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPPOE_PASSWORD_FLAGS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_pppoe_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_pppoe_get_service ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_pppoe_get_username ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_pppoe_get_password ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_pppoe_get_password_flags ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-serial.sgml b/docs/libnm-util/tmpl/nm-setting-serial.sgml
deleted file mode 100644
index fcd7e170..00000000
--- a/docs/libnm-util/tmpl/nm-setting-serial.sgml
+++ /dev/null
@@ -1,146 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingSerial
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_SERIAL_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingSerialError ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_SERIAL_ERROR_UNKNOWN: 
-@NM_SETTING_SERIAL_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_SERIAL_ERROR_MISSING_PROPERTY: 
-@NM_SETTING_SERIAL_ERROR_MISSING_PPP_SETTING: 
-
-<!-- ##### MACRO NM_SETTING_SERIAL_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_serial_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_SETTING_SERIAL_BAUD ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_SERIAL_BITS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_SERIAL_PARITY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_SERIAL_STOPBITS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_SERIAL_SEND_DELAY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_serial_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_serial_get_baud ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_serial_get_bits ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_serial_get_parity ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_serial_get_stopbits ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_serial_get_send_delay ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-team-port.sgml b/docs/libnm-util/tmpl/nm-setting-team-port.sgml
deleted file mode 100644
index 37ed15ee..00000000
--- a/docs/libnm-util/tmpl/nm-setting-team-port.sgml
+++ /dev/null
@@ -1,81 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingTeamPort
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_TEAM_PORT_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingTeamPortError ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_TEAM_PORT_ERROR_UNKNOWN: 
-@NM_SETTING_TEAM_PORT_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_TEAM_PORT_ERROR_MISSING_PROPERTY: 
-
-<!-- ##### MACRO NM_SETTING_TEAM_PORT_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_team_port_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_SETTING_TEAM_PORT_CONFIG ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_team_port_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_team_port_get_config ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-team.sgml b/docs/libnm-util/tmpl/nm-setting-team.sgml
deleted file mode 100644
index 161fc193..00000000
--- a/docs/libnm-util/tmpl/nm-setting-team.sgml
+++ /dev/null
@@ -1,97 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingTeam
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_TEAM_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingTeamError ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_TEAM_ERROR_UNKNOWN: 
-@NM_SETTING_TEAM_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_TEAM_ERROR_MISSING_PROPERTY: 
-
-<!-- ##### MACRO NM_SETTING_TEAM_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_team_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_SETTING_TEAM_INTERFACE_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_TEAM_CONFIG ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_team_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_team_get_interface_name ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_team_get_config ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-vlan.sgml b/docs/libnm-util/tmpl/nm-setting-vlan.sgml
deleted file mode 100644
index 79053ea5..00000000
--- a/docs/libnm-util/tmpl/nm-setting-vlan.sgml
+++ /dev/null
@@ -1,249 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingVlan
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_VLAN_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingVlanError ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_VLAN_ERROR_UNKNOWN: 
-@NM_SETTING_VLAN_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_VLAN_ERROR_MISSING_PROPERTY: 
-@NM_SETTING_VLAN_ERROR_INVALID_PARENT: 
-
-<!-- ##### MACRO NM_SETTING_VLAN_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_vlan_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_SETTING_VLAN_INTERFACE_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_VLAN_PARENT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_VLAN_ID ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_VLAN_FLAGS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_VLAN_INGRESS_PRIORITY_MAP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_VLAN_EGRESS_PRIORITY_MAP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMVlanPriorityMap ##### -->
-<para>
-
-</para>
-
-@NM_VLAN_INGRESS_MAP: 
-@NM_VLAN_EGRESS_MAP: 
-
-<!-- ##### ENUM NMVlanFlags ##### -->
-<para>
-
-</para>
-
-@NM_VLAN_FLAG_REORDER_HEADERS: 
-@NM_VLAN_FLAG_GVRP: 
-@NM_VLAN_FLAG_LOOSE_BINDING: 
-
-<!-- ##### FUNCTION nm_setting_vlan_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_vlan_get_interface_name ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_vlan_get_parent ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_vlan_get_id ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_vlan_get_flags ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_vlan_get_num_priorities ##### -->
-<para>
-
-</para>
-
-@setting: 
-@map: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_vlan_get_priority ##### -->
-<para>
-
-</para>
-
-@setting: 
-@map: 
-@idx: 
-@out_from: 
-@out_to: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_vlan_add_priority ##### -->
-<para>
-
-</para>
-
-@setting: 
-@map: 
-@from: 
-@to: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_vlan_remove_priority ##### -->
-<para>
-
-</para>
-
-@setting: 
-@map: 
-@idx: 
-
-
-<!-- ##### FUNCTION nm_setting_vlan_remove_priority_by_value ##### -->
-<para>
-
-</para>
-
-@setting: 
-@map: 
-@from: 
-@to: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_vlan_remove_priority_str_by_value ##### -->
-<para>
-
-</para>
-
-@setting: 
-@map: 
-@str: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_vlan_clear_priorities ##### -->
-<para>
-
-</para>
-
-@setting: 
-@map: 
-
-
-<!-- ##### FUNCTION nm_setting_vlan_add_priority_str ##### -->
-<para>
-
-</para>
-
-@setting: 
-@map: 
-@str: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-vpn.sgml b/docs/libnm-util/tmpl/nm-setting-vpn.sgml
deleted file mode 100644
index 3d2b9a3a..00000000
--- a/docs/libnm-util/tmpl/nm-setting-vpn.sgml
+++ /dev/null
@@ -1,235 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingVPN
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_VPN_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingVpnError ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_VPN_ERROR_UNKNOWN: 
-@NM_SETTING_VPN_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_VPN_ERROR_MISSING_PROPERTY: 
-
-<!-- ##### MACRO NM_SETTING_VPN_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_vpn_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_SETTING_VPN_SERVICE_TYPE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_VPN_USER_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_VPN_PERSISTENT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_VPN_DATA ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_VPN_SECRETS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### USER_FUNCTION NMVPNIterFunc ##### -->
-<para>
-
-</para>
-
-@key: 
-@value: 
-@user_data: 
-
-
-<!-- ##### FUNCTION nm_setting_vpn_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_vpn_get_service_type ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_vpn_get_user_name ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_vpn_get_persistent ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_vpn_get_num_data_items ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_vpn_add_data_item ##### -->
-<para>
-
-</para>
-
-@setting: 
-@key: 
-@item: 
-
-
-<!-- ##### FUNCTION nm_setting_vpn_get_data_item ##### -->
-<para>
-
-</para>
-
-@setting: 
-@key: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_vpn_remove_data_item ##### -->
-<para>
-
-</para>
-
-@setting: 
-@key: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_vpn_foreach_data_item ##### -->
-<para>
-
-</para>
-
-@setting: 
-@func: 
-@user_data: 
-
-
-<!-- ##### FUNCTION nm_setting_vpn_get_num_secrets ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_vpn_add_secret ##### -->
-<para>
-
-</para>
-
-@setting: 
-@key: 
-@secret: 
-
-
-<!-- ##### FUNCTION nm_setting_vpn_get_secret ##### -->
-<para>
-
-</para>
-
-@setting: 
-@key: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_vpn_remove_secret ##### -->
-<para>
-
-</para>
-
-@setting: 
-@key: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_vpn_foreach_secret ##### -->
-<para>
-
-</para>
-
-@setting: 
-@func: 
-@user_data: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-wimax.sgml b/docs/libnm-util/tmpl/nm-setting-wimax.sgml
deleted file mode 100644
index ebfbd61a..00000000
--- a/docs/libnm-util/tmpl/nm-setting-wimax.sgml
+++ /dev/null
@@ -1,97 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingWimax
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_WIMAX_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingWimaxError ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_WIMAX_ERROR_UNKNOWN: 
-@NM_SETTING_WIMAX_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_WIMAX_ERROR_MISSING_PROPERTY: 
-
-<!-- ##### MACRO NM_SETTING_WIMAX_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_wimax_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_SETTING_WIMAX_NETWORK_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIMAX_MAC_ADDRESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_wimax_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wimax_get_network_name ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wimax_get_mac_address ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-wired.sgml b/docs/libnm-util/tmpl/nm-setting-wired.sgml
deleted file mode 100644
index fe4f2d32..00000000
--- a/docs/libnm-util/tmpl/nm-setting-wired.sgml
+++ /dev/null
@@ -1,349 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingWired
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_WIRED_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingWiredError ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_WIRED_ERROR_UNKNOWN: 
-@NM_SETTING_WIRED_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_WIRED_ERROR_MISSING_PROPERTY: 
-
-<!-- ##### MACRO NM_SETTING_WIRED_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_wired_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_SETTING_WIRED_PORT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRED_SPEED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRED_DUPLEX ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRED_AUTO_NEGOTIATE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRED_MAC_ADDRESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRED_CLONED_MAC_ADDRESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRED_MTU ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRED_S390_SUBCHANNELS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRED_S390_NETTYPE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRED_S390_OPTIONS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_wired_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_get_port ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_get_speed ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_get_duplex ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_get_auto_negotiate ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_get_mac_address ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_get_cloned_mac_address ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_get_mac_address_blacklist ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_get_num_mac_blacklist_items ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_get_mac_blacklist_item ##### -->
-<para>
-
-</para>
-
-@setting: 
-@idx: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_add_mac_blacklist_item ##### -->
-<para>
-
-</para>
-
-@setting: 
-@mac: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_remove_mac_blacklist_item ##### -->
-<para>
-
-</para>
-
-@setting: 
-@idx: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_remove_mac_blacklist_item_by_value ##### -->
-<para>
-
-</para>
-
-@setting: 
-@mac: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_clear_mac_blacklist_items ##### -->
-<para>
-
-</para>
-
-@setting: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_get_mtu ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_get_s390_subchannels ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_get_s390_nettype ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_get_num_s390_options ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_get_s390_option ##### -->
-<para>
-
-</para>
-
-@setting: 
-@idx: 
-@out_key: 
-@out_value: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_get_s390_option_by_key ##### -->
-<para>
-
-</para>
-
-@setting: 
-@key: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_add_s390_option ##### -->
-<para>
-
-</para>
-
-@setting: 
-@key: 
-@value: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_remove_s390_option ##### -->
-<para>
-
-</para>
-
-@setting: 
-@key: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_get_valid_s390_options ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-wireless-security.sgml b/docs/libnm-util/tmpl/nm-setting-wireless-security.sgml
deleted file mode 100644
index dea50cd7..00000000
--- a/docs/libnm-util/tmpl/nm-setting-wireless-security.sgml
+++ /dev/null
@@ -1,476 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingWirelessSecurity
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingWirelessSecurityError ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_WIRELESS_SECURITY_ERROR_UNKNOWN: 
-@NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_WIRELESS_SECURITY_ERROR_MISSING_PROPERTY: 
-@NM_SETTING_WIRELESS_SECURITY_ERROR_MISSING_802_1X_SETTING: 
-@NM_SETTING_WIRELESS_SECURITY_ERROR_LEAP_REQUIRES_802_1X: 
-@NM_SETTING_WIRELESS_SECURITY_ERROR_LEAP_REQUIRES_USERNAME: 
-@NM_SETTING_WIRELESS_SECURITY_ERROR_SHARED_KEY_REQUIRES_WEP: 
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### ENUM NMWepKeyType ##### -->
-<para>
-
-</para>
-
-@NM_WEP_KEY_TYPE_UNKNOWN: 
-@NM_WEP_KEY_TYPE_KEY: 
-@NM_WEP_KEY_TYPE_PASSPHRASE: 
-@NM_WEP_KEY_TYPE_LAST: 
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_KEY_MGMT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_AUTH_ALG ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_PROTO ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_PAIRWISE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_GROUP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_WEP_KEY0 ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_WEP_KEY1 ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_WEP_KEY2 ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_WEP_KEY3 ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_PSK ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_get_key_mgmt ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_get_num_protos ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_get_proto ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_add_proto ##### -->
-<para>
-
-</para>
-
-@setting: 
-@proto: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_remove_proto ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_remove_proto_by_value ##### -->
-<para>
-
-</para>
-
-@setting: 
-@proto: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_clear_protos ##### -->
-<para>
-
-</para>
-
-@setting: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_get_num_pairwise ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_get_pairwise ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_add_pairwise ##### -->
-<para>
-
-</para>
-
-@setting: 
-@pairwise: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_remove_pairwise ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_remove_pairwise_by_value ##### -->
-<para>
-
-</para>
-
-@setting: 
-@pairwise: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_clear_pairwise ##### -->
-<para>
-
-</para>
-
-@setting: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_get_num_groups ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_get_group ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_add_group ##### -->
-<para>
-
-</para>
-
-@setting: 
-@group: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_remove_group ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_remove_group_by_value ##### -->
-<para>
-
-</para>
-
-@setting: 
-@group: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_clear_groups ##### -->
-<para>
-
-</para>
-
-@setting: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_get_psk ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_get_psk_flags ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_get_leap_username ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_get_leap_password ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_get_leap_password_flags ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_get_wep_key ##### -->
-<para>
-
-</para>
-
-@setting: 
-@idx: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_set_wep_key ##### -->
-<para>
-
-</para>
-
-@setting: 
-@idx: 
-@key: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_get_wep_tx_keyidx ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_get_auth_alg ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_get_wep_key_flags ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_get_wep_key_type ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-wireless.sgml b/docs/libnm-util/tmpl/nm-setting-wireless.sgml
deleted file mode 100644
index 08c526b1..00000000
--- a/docs/libnm-util/tmpl/nm-setting-wireless.sgml
+++ /dev/null
@@ -1,402 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingWireless
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingWirelessError ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_WIRELESS_ERROR_UNKNOWN: 
-@NM_SETTING_WIRELESS_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_WIRELESS_ERROR_MISSING_PROPERTY: 
-@NM_SETTING_WIRELESS_ERROR_MISSING_SECURITY_SETTING: 
-@NM_SETTING_WIRELESS_ERROR_CHANNEL_REQUIRES_BAND: 
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_wireless_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SSID ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_MODE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_BAND ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_CHANNEL ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_BSSID ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_RATE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_TX_POWER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_MAC_ADDRESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_MTU ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SEEN_BSSIDS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_HIDDEN ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SEC ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_MODE_ADHOC ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_MODE_AP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_MODE_INFRA ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_wireless_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_get_ssid ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_get_mode ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_get_band ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_get_channel ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_get_bssid ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_get_rate ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_get_tx_power ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_get_mac_address ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_get_cloned_mac_address ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_get_mac_address_blacklist ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_get_num_mac_blacklist_items ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_get_mac_blacklist_item ##### -->
-<para>
-
-</para>
-
-@setting: 
-@idx: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_add_mac_blacklist_item ##### -->
-<para>
-
-</para>
-
-@setting: 
-@mac: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_remove_mac_blacklist_item ##### -->
-<para>
-
-</para>
-
-@setting: 
-@idx: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_remove_mac_blacklist_item_by_value ##### -->
-<para>
-
-</para>
-
-@setting: 
-@mac: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_clear_mac_blacklist_items ##### -->
-<para>
-
-</para>
-
-@setting: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_get_mtu ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_get_hidden ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_add_seen_bssid ##### -->
-<para>
-
-</para>
-
-@setting: 
-@bssid: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_get_num_seen_bssids ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_get_seen_bssid ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_ap_security_compatible ##### -->
-<para>
-
-</para>
-
-@s_wireless: 
-@s_wireless_sec: 
-@ap_flags: 
-@ap_wpa: 
-@ap_rsn: 
-@ap_mode: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_get_security ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting.sgml b/docs/libnm-util/tmpl/nm-setting.sgml
deleted file mode 100644
index 61a3bdc2..00000000
--- a/docs/libnm-util/tmpl/nm-setting.sgml
+++ /dev/null
@@ -1,327 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSetting
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### ENUM NMSettingError ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_ERROR_UNKNOWN: 
-@NM_SETTING_ERROR_PROPERTY_NOT_FOUND: 
-@NM_SETTING_ERROR_PROPERTY_NOT_SECRET: 
-@NM_SETTING_ERROR_PROPERTY_TYPE_MISMATCH: 
-
-<!-- ##### MACRO NM_SETTING_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_SETTING_PARAM_SERIALIZE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PARAM_REQUIRED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PARAM_SECRET ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PARAM_FUZZY_IGNORE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingSecretFlags ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_SECRET_FLAG_NONE: 
-@NM_SETTING_SECRET_FLAG_AGENT_OWNED: 
-@NM_SETTING_SECRET_FLAG_NOT_SAVED: 
-@NM_SETTING_SECRET_FLAG_NOT_REQUIRED: 
-
-<!-- ##### ENUM NMSettingCompareFlags ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_COMPARE_FLAG_EXACT: 
-@NM_SETTING_COMPARE_FLAG_FUZZY: 
-@NM_SETTING_COMPARE_FLAG_IGNORE_ID: 
-@NM_SETTING_COMPARE_FLAG_IGNORE_SECRETS: 
-@NM_SETTING_COMPARE_FLAG_IGNORE_AGENT_OWNED_SECRETS: 
-@NM_SETTING_COMPARE_FLAG_IGNORE_NOT_SAVED_SECRETS: 
-@NM_SETTING_COMPARE_FLAG_DIFF_RESULT_WITH_DEFAULT: 
-@NM_SETTING_COMPARE_FLAG_DIFF_RESULT_NO_DEFAULT: 
-
-<!-- ##### STRUCT NMSetting ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG NMSetting:name ##### -->
-<para>
-
-</para>
-
-<!-- ##### USER_FUNCTION NMSettingClearSecretsWithFlagsFn ##### -->
-<para>
-
-</para>
-
-@setting: 
-@secret: 
-@flags: 
-@user_data: 
-@Returns: 
-
-
-<!-- ##### USER_FUNCTION NMSettingValueIterFn ##### -->
-<para>
-
-</para>
-
-@setting: 
-@key: 
-@value: 
-@flags: 
-@user_data: 
-
-
-<!-- ##### ENUM NMSettingHashFlags ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_HASH_FLAG_ALL: 
-@NM_SETTING_HASH_FLAG_NO_SECRETS: 
-@NM_SETTING_HASH_FLAG_ONLY_SECRETS: 
-
-<!-- ##### FUNCTION nm_setting_to_hash ##### -->
-<para>
-
-</para>
-
-@setting: 
-@flags: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_new_from_hash ##### -->
-<para>
-
-</para>
-
-@setting_type: 
-@hash: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_duplicate ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_get_name ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_verify ##### -->
-<para>
-
-</para>
-
-@setting: 
-@all_settings: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_compare ##### -->
-<para>
-
-</para>
-
-@a: 
-@b: 
-@flags: 
-@Returns: 
-
-
-<!-- ##### ENUM NMSettingDiffResult ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_DIFF_RESULT_UNKNOWN: 
-@NM_SETTING_DIFF_RESULT_IN_A: 
-@NM_SETTING_DIFF_RESULT_IN_B: 
-@NM_SETTING_DIFF_RESULT_IN_A_DEFAULT: 
-@NM_SETTING_DIFF_RESULT_IN_B_DEFAULT: 
-
-<!-- ##### FUNCTION nm_setting_diff ##### -->
-<para>
-
-</para>
-
-@a: 
-@b: 
-@flags: 
-@invert_results: 
-@results: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_enumerate_values ##### -->
-<para>
-
-</para>
-
-@setting: 
-@func: 
-@user_data: 
-
-
-<!-- ##### FUNCTION nm_setting_to_string ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_clear_secrets ##### -->
-<para>
-
-</para>
-
-@setting: 
-
-
-<!-- ##### FUNCTION nm_setting_clear_secrets_with_flags ##### -->
-<para>
-
-</para>
-
-@setting: 
-@func: 
-@user_data: 
-
-
-<!-- ##### FUNCTION nm_setting_need_secrets ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_update_secrets ##### -->
-<para>
-
-</para>
-
-@setting: 
-@secrets: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_get_secret_flags ##### -->
-<para>
-
-</para>
-
-@setting: 
-@secret_name: 
-@out_flags: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_set_secret_flags ##### -->
-<para>
-
-</para>
-
-@setting: 
-@secret_name: 
-@flags: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_get_virtual_iface_name ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-utils-enum-types.sgml b/docs/libnm-util/tmpl/nm-utils-enum-types.sgml
deleted file mode 100644
index 82025822..00000000
--- a/docs/libnm-util/tmpl/nm-utils-enum-types.sgml
+++ /dev/null
@@ -1,24 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-nm-utils-enum-types
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
diff --git a/docs/libnm-util/tmpl/nm-utils.sgml b/docs/libnm-util/tmpl/nm-utils.sgml
deleted file mode 100644
index 2bb22046..00000000
--- a/docs/libnm-util/tmpl/nm-utils.sgml
+++ /dev/null
@@ -1,562 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-nm-utils
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### FUNCTION nm_utils_init ##### -->
-<para>
-
-</para>
-
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_deinit ##### -->
-<para>
-
-</para>
-
-@void: 
-
-
-<!-- ##### FUNCTION nm_utils_is_empty_ssid ##### -->
-<para>
-
-</para>
-
-@ssid: 
-@len: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_escape_ssid ##### -->
-<para>
-
-</para>
-
-@ssid: 
-@len: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_same_ssid ##### -->
-<para>
-
-</para>
-
-@ssid1: 
-@ssid2: 
-@ignore_trailing_null: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_ssid_to_utf8 ##### -->
-<para>
-
-</para>
-
-@ssid: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_gvalue_hash_dup ##### -->
-<para>
-
-</para>
-
-@hash: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_slist_free ##### -->
-<para>
-
-</para>
-
-@list: 
-@elem_destroy_fn: 
-
-
-<!-- ##### ENUM NMUtilsSecurityType ##### -->
-<para>
-
-</para>
-
-@NMU_SEC_INVALID: 
-@NMU_SEC_NONE: 
-@NMU_SEC_STATIC_WEP: 
-@NMU_SEC_LEAP: 
-@NMU_SEC_DYNAMIC_WEP: 
-@NMU_SEC_WPA_PSK: 
-@NMU_SEC_WPA_ENTERPRISE: 
-@NMU_SEC_WPA2_PSK: 
-@NMU_SEC_WPA2_ENTERPRISE: 
-
-<!-- ##### FUNCTION nm_utils_security_valid ##### -->
-<para>
-
-</para>
-
-@type: 
-@wifi_caps: 
-@have_ap: 
-@adhoc: 
-@ap_flags: 
-@ap_wpa: 
-@ap_rsn: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_ap_mode_security_valid ##### -->
-<para>
-
-</para>
-
-@type: 
-@wifi_caps: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_wep_key_valid ##### -->
-<para>
-
-</para>
-
-@key: 
-@wep_type: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_wpa_psk_valid ##### -->
-<para>
-
-</para>
-
-@psk: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_ip4_addresses_from_gvalue ##### -->
-<para>
-
-</para>
-
-@value: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_ip4_addresses_to_gvalue ##### -->
-<para>
-
-</para>
-
-@list: 
-@value: 
-
-
-<!-- ##### FUNCTION nm_utils_ip4_routes_from_gvalue ##### -->
-<para>
-
-</para>
-
-@value: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_ip4_routes_to_gvalue ##### -->
-<para>
-
-</para>
-
-@list: 
-@value: 
-
-
-<!-- ##### FUNCTION nm_utils_ip4_netmask_to_prefix ##### -->
-<para>
-
-</para>
-
-@netmask: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_ip4_prefix_to_netmask ##### -->
-<para>
-
-</para>
-
-@prefix: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_ip4_get_default_prefix ##### -->
-<para>
-
-</para>
-
-@ip: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_ip6_addresses_from_gvalue ##### -->
-<para>
-
-</para>
-
-@value: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_ip6_addresses_to_gvalue ##### -->
-<para>
-
-</para>
-
-@list: 
-@value: 
-
-
-<!-- ##### FUNCTION nm_utils_ip6_routes_from_gvalue ##### -->
-<para>
-
-</para>
-
-@value: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_ip6_routes_to_gvalue ##### -->
-<para>
-
-</para>
-
-@list: 
-@value: 
-
-
-<!-- ##### FUNCTION nm_utils_ip6_dns_from_gvalue ##### -->
-<para>
-
-</para>
-
-@value: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_ip6_dns_to_gvalue ##### -->
-<para>
-
-</para>
-
-@list: 
-@value: 
-
-
-<!-- ##### FUNCTION nm_utils_uuid_generate ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_uuid_generate_from_string ##### -->
-<para>
-
-</para>
-
-@s: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_rsa_key_encrypt ##### -->
-<para>
-
-</para>
-
-@data: 
-@in_password: 
-@out_password: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_rsa_key_encrypt_aes ##### -->
-<para>
-
-</para>
-
-@data: 
-@in_password: 
-@out_password: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_file_is_pkcs12 ##### -->
-<para>
-
-</para>
-
-@filename: 
-@Returns: 
-
-
-<!-- ##### USER_FUNCTION NMUtilsFileSearchInPathsPredicate ##### -->
-<para>
-
-</para>
-
-@filename: 
-@user_data: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_file_search_in_paths ##### -->
-<para>
-
-</para>
-
-@progname: 
-@try_first: 
-@paths: 
-@file_test_flags: 
-@predicate: 
-@user_data: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_wifi_freq_to_channel ##### -->
-<para>
-
-</para>
-
-@freq: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_wifi_channel_to_freq ##### -->
-<para>
-
-</para>
-
-@channel: 
-@band: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_wifi_find_next_channel ##### -->
-<para>
-
-</para>
-
-@channel: 
-@direction: 
-@band: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_wifi_is_channel_valid ##### -->
-<para>
-
-</para>
-
-@channel: 
-@band: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_UTILS_HWADDR_LEN_MAX ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_utils_hwaddr_len ##### -->
-<para>
-
-</para>
-
-@type: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_hwaddr_type ##### -->
-<para>
-
-</para>
-
-@len: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_hwaddr_ntoa ##### -->
-<para>
-
-</para>
-
-@addr: 
-@type: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_hwaddr_atoba ##### -->
-<para>
-
-</para>
-
-@asc: 
-@type: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_hwaddr_aton ##### -->
-<para>
-
-</para>
-
-@asc: 
-@type: 
-@buffer: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_hwaddr_ntoa_len ##### -->
-<para>
-
-</para>
-
-@addr: 
-@length: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_hwaddr_aton_len ##### -->
-<para>
-
-</para>
-
-@asc: 
-@buffer: 
-@length: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_hwaddr_valid ##### -->
-<para>
-
-</para>
-
-@asc: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_bin2hexstr ##### -->
-<para>
-
-</para>
-
-@bytes: 
-@len: 
-@final_len: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_hex2byte ##### -->
-<para>
-
-</para>
-
-@hex: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_hexstr2bin ##### -->
-<para>
-
-</para>
-
-@hex: 
-@len: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_iface_valid_name ##### -->
-<para>
-
-</para>
-
-@name: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_is_uuid ##### -->
-<para>
-
-</para>
-
-@str: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_UTILS_INET_ADDRSTRLEN ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_utils_inet4_ntop ##### -->
-<para>
-
-</para>
-
-@inaddr: 
-@dst: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_inet6_ntop ##### -->
-<para>
-
-</para>
-
-@in6addr: 
-@dst: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_check_virtual_device_compatibility ##### -->
-<para>
-
-</para>
-
-@virtual_type: 
-@other_type: 
-@Returns: 
-
-
-- 
cgit 1.3.0-6-gf8a5