summary refs log tree commit diff
path: root/docs/libnm-util/tmpl
diff options
context:
space:
mode:
Diffstat (limited to 'docs/libnm-util/tmpl')
-rw-r--r--docs/libnm-util/tmpl/libnm-util-unused.sgml564
-rw-r--r--docs/libnm-util/tmpl/nm-connection.sgml16
-rw-r--r--docs/libnm-util/tmpl/nm-setting-8021x.sgml2
-rw-r--r--docs/libnm-util/tmpl/nm-setting-bluetooth.sgml2
-rw-r--r--docs/libnm-util/tmpl/nm-setting-bridge.sgml160
-rw-r--r--docs/libnm-util/tmpl/nm-setting-cdma.sgml2
-rw-r--r--docs/libnm-util/tmpl/nm-setting-connection.sgml2
-rw-r--r--docs/libnm-util/tmpl/nm-setting-gsm.sgml2
-rw-r--r--docs/libnm-util/tmpl/nm-setting-ip4-config.sgml2
-rw-r--r--docs/libnm-util/tmpl/nm-setting-ip6-config.sgml2
-rw-r--r--docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml2
-rw-r--r--docs/libnm-util/tmpl/nm-setting-ppp.sgml2
-rw-r--r--docs/libnm-util/tmpl/nm-setting-pppoe.sgml2
-rw-r--r--docs/libnm-util/tmpl/nm-setting-serial.sgml2
-rw-r--r--docs/libnm-util/tmpl/nm-setting-vpn.sgml2
-rw-r--r--docs/libnm-util/tmpl/nm-setting-wimax.sgml136
-rw-r--r--docs/libnm-util/tmpl/nm-setting-wired.sgml2
-rw-r--r--docs/libnm-util/tmpl/nm-setting-wireless-security.sgml2
-rw-r--r--docs/libnm-util/tmpl/nm-setting-wireless.sgml2
-rw-r--r--docs/libnm-util/tmpl/nm-setting.sgml24
-rw-r--r--docs/libnm-util/tmpl/nm-utils.sgml2
21 files changed, 71 insertions, 861 deletions
diff --git a/docs/libnm-util/tmpl/libnm-util-unused.sgml b/docs/libnm-util/tmpl/libnm-util-unused.sgml
index 14ec2d31..e69de29b 100644
--- a/docs/libnm-util/tmpl/libnm-util-unused.sgml
+++ b/docs/libnm-util/tmpl/libnm-util-unused.sgml
@@ -1,564 +0,0 @@
-<!-- ##### SECTION ./tmpl/nm-setting-bridge.sgml:Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION ./tmpl/nm-setting-bridge.sgml:See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION ./tmpl/nm-setting-bridge.sgml:Short_Description ##### -->
-
-
-
-<!-- ##### SECTION ./tmpl/nm-setting-bridge.sgml:Stability_Level ##### -->
-
-
-
-<!-- ##### SECTION ./tmpl/nm-setting-bridge.sgml:Title ##### -->
-NMSettingBridge
-
-
-<!-- ##### SECTION ./tmpl/nm-setting-wimax.sgml:Image ##### -->
-
-
-
-<!-- ##### SECTION ./tmpl/nm-setting-wimax.sgml:Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION ./tmpl/nm-setting-wimax.sgml:See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION ./tmpl/nm-setting-wimax.sgml:Short_Description ##### -->
-
-
-
-<!-- ##### SECTION ./tmpl/nm-setting-wimax.sgml:Stability_Level ##### -->
-
-
-
-<!-- ##### SECTION ./tmpl/nm-setting-wimax.sgml:Title ##### -->
-NMSettingWimax
-
-
-<!-- ##### ARG NMSetting8021x:ca-cert-path ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG NMSetting8021x:client-cert-path ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG NMSetting8021x:phase2-ca-cert-path ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG NMSetting8021x:phase2-client-cert-path ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG NMSetting8021x:phase2-private-key-path ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG NMSetting8021x:private-key-path ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### STRUCT NMSettingBridge ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG NMSettingBridge:ifname ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG NMSettingBridge:members ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ENUM NMSettingBridgeError ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_BRIDGE_ERROR_UNKNOWN: 
-@NM_SETTING_BRIDGE_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_BRIDGE_ERROR_MISSING_PROPERTY: 
-
-<!-- ##### ARG NMSettingConnection:permissions ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ENUM NMSettingGsmNetworkMode ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_GSM_NETWORK_ANY: 
-@NM_SETTING_GSM_NETWORK_UMTS_HSPA: 
-@NM_SETTING_GSM_NETWORK_GPRS_EDGE: 
-@NM_SETTING_GSM_NETWORK_PREFER_UMTS_HSPA: 
-@NM_SETTING_GSM_NETWORK_PREFER_GPRS_EDGE: 
-
-<!-- ##### STRUCT NMSettingWimax ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG NMSettingWimax:mac-address ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG NMSettingWimax:network-name ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### STRUCT NMSettingWimaxClass ##### -->
-<para>
-
-</para>
-
-@parent: 
-
-<!-- ##### ENUM NMSettingWimaxError ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_WIMAX_ERROR_UNKNOWN: 
-@NM_SETTING_WIMAX_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_WIMAX_ERROR_MISSING_PROPERTY: 
-
-<!-- ##### ARG NMSettingWired:s390-port-name ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG NMSettingWired:s390-port-number ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG NMSettingWired:s390-qeth-layer ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG NMSettingWired:zvm-subchannels ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO NM_SETTINGS_CONNECTION_PERMISSION_PREFIX_GROUP ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO NM_SETTINGS_CONNECTION_PERMISSION_PREFIX_USER ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_CA_CERT_PATH ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_CLIENT_CERT_PATH ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PHASE2_CA_CERT_PATH ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PHASE2_CLIENT_CERT_PATH ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PATH ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PRIVATE_KEY_PATH ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO NM_SETTING_BRIDGE_ERROR ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO NM_SETTING_BRIDGE_IFNAME ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO NM_SETTING_BRIDGE_MEMBERS ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO NM_SETTING_BRIDGE_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO NM_SETTING_CONNECTION_PERMISSIONS ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO NM_SETTING_WIMAX_ERROR ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO NM_SETTING_WIMAX_MAC_ADDRESS ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO NM_SETTING_WIMAX_NETWORK_NAME ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO NM_SETTING_WIMAX_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO NM_SETTING_WIRED_S390_PORT_NAME ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO NM_SETTING_WIRED_S390_PORT_NUMBER ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO NM_SETTING_WIRED_S390_QETH_LAYER ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO NM_SETTING_WIRED_ZVM_SUBCHANNELS ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO NM_TYPE_SETTING_BRIDGE_ERROR ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO NM_TYPE_SETTING_WIMAX_ERROR ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_set_ca_cert_path ##### -->
-<para>
-
-</para>
-
-@setting: 
-@path_to_cert: 
-@out_ck_type: 
-@error: 
-@Returns: 
-
-<!-- ##### FUNCTION nm_setting_802_1x_set_client_cert_path ##### -->
-<para>
-
-</para>
-
-@setting: 
-@path_to_cert: 
-@out_ck_type: 
-@error: 
-@Returns: 
-
-<!-- ##### FUNCTION nm_setting_802_1x_set_phase2_ca_cert_path ##### -->
-<para>
-
-</para>
-
-@setting: 
-@path_to_cert: 
-@out_ck_type: 
-@error: 
-@Returns: 
-
-<!-- ##### FUNCTION nm_setting_802_1x_set_phase2_client_cert_path ##### -->
-<para>
-
-</para>
-
-@setting: 
-@path_to_cert: 
-@out_ck_type: 
-@error: 
-@Returns: 
-
-<!-- ##### FUNCTION nm_setting_802_1x_set_phase2_private_key_path ##### -->
-<para>
-
-</para>
-
-@setting: 
-@path_to_file: 
-@password: 
-@out_ck_type: 
-@error: 
-@Returns: 
-
-<!-- ##### FUNCTION nm_setting_802_1x_set_private_key_path ##### -->
-<para>
-
-</para>
-
-@setting: 
-@path_to_file: 
-@password: 
-@out_ck_type: 
-@error: 
-@Returns: 
-
-<!-- ##### FUNCTION nm_setting_bridge_add_member ##### -->
-<para>
-
-</para>
-
-@setting: 
-@uuid: 
-@Returns: 
-
-<!-- ##### FUNCTION nm_setting_bridge_clear_members ##### -->
-<para>
-
-</para>
-
-@setting: 
-
-<!-- ##### FUNCTION nm_setting_bridge_error_quark ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-<!-- ##### FUNCTION nm_setting_bridge_get_ifname ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-<!-- ##### FUNCTION nm_setting_bridge_get_member ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-@Returns: 
-
-<!-- ##### FUNCTION nm_setting_bridge_get_num_members ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-<!-- ##### FUNCTION nm_setting_bridge_get_type ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-<!-- ##### FUNCTION nm_setting_bridge_new ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-<!-- ##### FUNCTION nm_setting_bridge_remove_member ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-
-<!-- ##### FUNCTION nm_setting_connection_get_num_permissions ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-<!-- ##### FUNCTION nm_setting_connection_get_permission ##### -->
-<para>
-
-</para>
-
-@setting: 
-@index: 
-@Returns: 
-
-<!-- ##### FUNCTION nm_setting_connection_get_permission_entry ##### -->
-<para>
-
-</para>
-
-@setting: 
-@index: 
-@Returns: 
-
-<!-- ##### FUNCTION nm_setting_wimax_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-<!-- ##### FUNCTION nm_setting_wimax_get_mac_address ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-<!-- ##### FUNCTION nm_setting_wimax_get_network_name ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-<!-- ##### FUNCTION nm_setting_wimax_get_type ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-<!-- ##### FUNCTION nm_setting_wimax_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-<!-- ##### FUNCTION nm_setting_wired_get_s390_port_name ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-<!-- ##### FUNCTION nm_setting_wired_get_s390_port_number ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-<!-- ##### FUNCTION nm_setting_wired_get_s390_qeth_layer ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-<!-- ##### FUNCTION nm_setting_wired_get_zvm_subchannels ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
diff --git a/docs/libnm-util/tmpl/nm-connection.sgml b/docs/libnm-util/tmpl/nm-connection.sgml
index 649e62c7..f9d52c98 100644
--- a/docs/libnm-util/tmpl/nm-connection.sgml
+++ b/docs/libnm-util/tmpl/nm-connection.sgml
@@ -9,11 +9,13 @@ NMConnection
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
@@ -203,6 +205,18 @@ NMConnection
 @Returns: 
 
 
+<!-- ##### FUNCTION nm_connection_diff ##### -->
+<para>
+
+</para>
+
+@a: 
+@b: 
+@flags: 
+@out_settings: 
+@Returns: 
+
+
 <!-- ##### FUNCTION nm_connection_verify ##### -->
 <para>
 
@@ -238,7 +252,7 @@ NMConnection
 
 @connection: 
 @setting_name: 
-@secrets: 
+@setting_secrets: 
 @error: 
 @Returns: 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-8021x.sgml b/docs/libnm-util/tmpl/nm-setting-8021x.sgml
index d759e94f..c6742d9b 100644
--- a/docs/libnm-util/tmpl/nm-setting-8021x.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-8021x.sgml
@@ -9,11 +9,13 @@ NMSetting8021x
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-bluetooth.sgml b/docs/libnm-util/tmpl/nm-setting-bluetooth.sgml
index 255435e8..e698b78c 100644
--- a/docs/libnm-util/tmpl/nm-setting-bluetooth.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-bluetooth.sgml
@@ -9,11 +9,13 @@ NMSettingBluetooth
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
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 15d757c3..00000000
--- a/docs/libnm-util/tmpl/nm-setting-bridge.sgml
+++ /dev/null
@@ -1,160 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingBridge
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### 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_TYPE_SETTING_BRIDGE_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BRIDGE_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_bridge_error_quark ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-
-<!-- ##### MACRO NM_SETTING_BRIDGE_IFNAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BRIDGE_MEMBERS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### STRUCT NMSettingBridge ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG NMSettingBridge:ifname ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingBridge:members ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION nm_setting_bridge_get_type ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_bridge_new ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_bridge_get_ifname ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_bridge_get_num_members ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_bridge_get_member ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_bridge_add_member ##### -->
-<para>
-
-</para>
-
-@setting: 
-@uuid: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_bridge_remove_member ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-
-
-<!-- ##### FUNCTION nm_setting_bridge_clear_members ##### -->
-<para>
-
-</para>
-
-@setting: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-cdma.sgml b/docs/libnm-util/tmpl/nm-setting-cdma.sgml
index 21fa4c35..7cd8fbc7 100644
--- a/docs/libnm-util/tmpl/nm-setting-cdma.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-cdma.sgml
@@ -9,11 +9,13 @@ NMSettingCdma
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-connection.sgml b/docs/libnm-util/tmpl/nm-setting-connection.sgml
index 58473e01..ad17800f 100644
--- a/docs/libnm-util/tmpl/nm-setting-connection.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-connection.sgml
@@ -9,11 +9,13 @@ NMSettingConnection
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-gsm.sgml b/docs/libnm-util/tmpl/nm-setting-gsm.sgml
index fe91c082..fd7dc209 100644
--- a/docs/libnm-util/tmpl/nm-setting-gsm.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-gsm.sgml
@@ -9,11 +9,13 @@ NMSettingGsm
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-ip4-config.sgml b/docs/libnm-util/tmpl/nm-setting-ip4-config.sgml
index b374a2b1..41fc9aab 100644
--- a/docs/libnm-util/tmpl/nm-setting-ip4-config.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-ip4-config.sgml
@@ -9,11 +9,13 @@ NMSettingIP4Config
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-ip6-config.sgml b/docs/libnm-util/tmpl/nm-setting-ip6-config.sgml
index cb06ed92..456b5f29 100644
--- a/docs/libnm-util/tmpl/nm-setting-ip6-config.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-ip6-config.sgml
@@ -9,11 +9,13 @@ NMSettingIP6Config
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml b/docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml
index d9194bd1..7c44977c 100644
--- a/docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml
@@ -9,11 +9,13 @@ NMSettingOlpcMesh
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-ppp.sgml b/docs/libnm-util/tmpl/nm-setting-ppp.sgml
index 9c48f890..bc80c47b 100644
--- a/docs/libnm-util/tmpl/nm-setting-ppp.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-ppp.sgml
@@ -9,11 +9,13 @@ NMSettingPPP
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-pppoe.sgml b/docs/libnm-util/tmpl/nm-setting-pppoe.sgml
index 5bd2666c..7bd9fd38 100644
--- a/docs/libnm-util/tmpl/nm-setting-pppoe.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-pppoe.sgml
@@ -9,11 +9,13 @@ NMSettingPPPOE
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-serial.sgml b/docs/libnm-util/tmpl/nm-setting-serial.sgml
index c5aeb6fc..20e68412 100644
--- a/docs/libnm-util/tmpl/nm-setting-serial.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-serial.sgml
@@ -9,11 +9,13 @@ NMSettingSerial
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-vpn.sgml b/docs/libnm-util/tmpl/nm-setting-vpn.sgml
index f30f01f9..ad33652a 100644
--- a/docs/libnm-util/tmpl/nm-setting-vpn.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-vpn.sgml
@@ -9,11 +9,13 @@ NMSettingVPN
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
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 07d54af4..00000000
--- a/docs/libnm-util/tmpl/nm-setting-wimax.sgml
+++ /dev/null
@@ -1,136 +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_TYPE_SETTING_WIMAX_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### 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>
-
-
-
-<!-- ##### STRUCT NMSettingWimax ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG NMSettingWimax:mac-address ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingWimax:network-name ##### -->
-<para>
-
-</para>
-
-<!-- ##### STRUCT NMSettingWimaxClass ##### -->
-<para>
-
-</para>
-
-@parent: 
-
-<!-- ##### FUNCTION nm_setting_wimax_get_type ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### 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
index ef5c784b..8b524247 100644
--- a/docs/libnm-util/tmpl/nm-setting-wired.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-wired.sgml
@@ -9,11 +9,13 @@ NMSettingWired
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-wireless-security.sgml b/docs/libnm-util/tmpl/nm-setting-wireless-security.sgml
index 7ebd57d5..eb576bb9 100644
--- a/docs/libnm-util/tmpl/nm-setting-wireless-security.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-wireless-security.sgml
@@ -9,11 +9,13 @@ NMSettingWirelessSecurity
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-wireless.sgml b/docs/libnm-util/tmpl/nm-setting-wireless.sgml
index caf738c2..69a60b5b 100644
--- a/docs/libnm-util/tmpl/nm-setting-wireless.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-wireless.sgml
@@ -9,11 +9,13 @@ NMSettingWireless
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting.sgml b/docs/libnm-util/tmpl/nm-setting.sgml
index 989e71d1..832a29c6 100644
--- a/docs/libnm-util/tmpl/nm-setting.sgml
+++ b/docs/libnm-util/tmpl/nm-setting.sgml
@@ -9,11 +9,13 @@ NMSetting
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
@@ -203,6 +205,28 @@ NMSetting
 @Returns: 
 
 
+<!-- ##### ENUM NMSettingDiffResult ##### -->
+<para>
+
+</para>
+
+@NM_SETTING_DIFF_RESULT_UNKNOWN: 
+@NM_SETTING_DIFF_RESULT_IN_A: 
+@NM_SETTING_DIFF_RESULT_IN_B: 
+
+<!-- ##### FUNCTION nm_setting_diff ##### -->
+<para>
+
+</para>
+
+@a: 
+@b: 
+@flags: 
+@invert_results: 
+@results: 
+@Returns: 
+
+
 <!-- ##### FUNCTION nm_setting_enumerate_values ##### -->
 <para>
 
diff --git a/docs/libnm-util/tmpl/nm-utils.sgml b/docs/libnm-util/tmpl/nm-utils.sgml
index b8a48acf..15c82f33 100644
--- a/docs/libnm-util/tmpl/nm-utils.sgml
+++ b/docs/libnm-util/tmpl/nm-utils.sgml
@@ -9,11 +9,13 @@ nm-utils
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->