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.sgml260
-rw-r--r--docs/libnm-util/tmpl/nm-connection.sgml54
-rw-r--r--docs/libnm-util/tmpl/nm-setting-8021x.sgml72
-rw-r--r--docs/libnm-util/tmpl/nm-setting-adsl.sgml262
-rw-r--r--docs/libnm-util/tmpl/nm-setting-bluetooth.sgml9
-rw-r--r--docs/libnm-util/tmpl/nm-setting-bond.sgml228
-rw-r--r--docs/libnm-util/tmpl/nm-setting-cdma.sgml9
-rw-r--r--docs/libnm-util/tmpl/nm-setting-connection.sgml118
-rw-r--r--docs/libnm-util/tmpl/nm-setting-gsm.sgml9
-rw-r--r--docs/libnm-util/tmpl/nm-setting-infiniband.sgml143
-rw-r--r--docs/libnm-util/tmpl/nm-setting-ip4-config.sgml9
-rw-r--r--docs/libnm-util/tmpl/nm-setting-ip6-config.sgml40
-rw-r--r--docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml9
-rw-r--r--docs/libnm-util/tmpl/nm-setting-ppp.sgml9
-rw-r--r--docs/libnm-util/tmpl/nm-setting-pppoe.sgml9
-rw-r--r--docs/libnm-util/tmpl/nm-setting-private.sgml2
-rw-r--r--docs/libnm-util/tmpl/nm-setting-serial.sgml9
-rw-r--r--docs/libnm-util/tmpl/nm-setting-vlan.sgml270
-rw-r--r--docs/libnm-util/tmpl/nm-setting-vpn.sgml27
-rw-r--r--docs/libnm-util/tmpl/nm-setting-wimax.sgml9
-rw-r--r--docs/libnm-util/tmpl/nm-setting-wired.sgml9
-rw-r--r--docs/libnm-util/tmpl/nm-setting-wireless-security.sgml9
-rw-r--r--docs/libnm-util/tmpl/nm-setting-wireless.sgml9
-rw-r--r--docs/libnm-util/tmpl/nm-setting.sgml20
-rw-r--r--docs/libnm-util/tmpl/nm-utils-enum-types.sgml22
-rw-r--r--docs/libnm-util/tmpl/nm-utils.sgml58
26 files changed, 1643 insertions, 41 deletions
diff --git a/docs/libnm-util/tmpl/libnm-util-unused.sgml b/docs/libnm-util/tmpl/libnm-util-unused.sgml
index e69de29b..26fd8b52 100644
--- a/docs/libnm-util/tmpl/libnm-util-unused.sgml
+++ b/docs/libnm-util/tmpl/libnm-util-unused.sgml
@@ -0,0 +1,260 @@
+<!-- ##### SECTION ./tmpl/nm-setting-adsl.sgml:Image ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/nm-setting-adsl.sgml:Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION ./tmpl/nm-setting-adsl.sgml:See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION ./tmpl/nm-setting-adsl.sgml:Short_Description ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/nm-setting-adsl.sgml:Stability_Level ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/nm-setting-adsl.sgml:Title ##### -->
+NMSettingAdsl
+
+
+<!-- ##### STRUCT NMSettingAdsl ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG NMSettingAdsl:encapsulation ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG NMSettingAdsl:password ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG NMSettingAdsl:password-flags ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG NMSettingAdsl:protocol ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG NMSettingAdsl:username ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG NMSettingAdsl:vci ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG NMSettingAdsl:vpi ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### STRUCT NMSettingAdslClass ##### -->
+<para>
+
+</para>
+
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+
+<!-- ##### 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_ENCAPSULATION ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO NM_SETTING_ADSL_ENCAPSULATION_LLC ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO NM_SETTING_ADSL_ENCAPSULATION_VCMUX ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO NM_SETTING_ADSL_ERROR ##### -->
+<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_PROTOCOL_IPOATM ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO NM_SETTING_ADSL_PROTOCOL_PPPOA ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO NM_SETTING_ADSL_PROTOCOL_PPPOE ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO NM_SETTING_ADSL_SETTING_NAME ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO NM_SETTING_ADSL_USERNAME ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO NM_SETTING_ADSL_VCI ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO NM_SETTING_ADSL_VPI ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### FUNCTION nm_connection_get_setting_adsl ##### -->
+<para>
+
+</para>
+
+@connection: 
+@Returns: 
+
+<!-- ##### FUNCTION nm_setting_adsl_error_quark ##### -->
+<para>
+
+</para>
+
+@void: 
+@Returns: 
+
+<!-- ##### FUNCTION nm_setting_adsl_get_encapsulation ##### -->
+<para>
+
+</para>
+
+@setting: 
+@Returns: 
+
+<!-- ##### FUNCTION nm_setting_adsl_get_password ##### -->
+<para>
+
+</para>
+
+@setting: 
+@Returns: 
+
+<!-- ##### FUNCTION nm_setting_adsl_get_password_flags ##### -->
+<para>
+
+</para>
+
+@setting: 
+@Returns: 
+
+<!-- ##### FUNCTION nm_setting_adsl_get_protocol ##### -->
+<para>
+
+</para>
+
+@setting: 
+@Returns: 
+
+<!-- ##### FUNCTION nm_setting_adsl_get_username ##### -->
+<para>
+
+</para>
+
+@setting: 
+@Returns: 
+
+<!-- ##### FUNCTION nm_setting_adsl_get_vci ##### -->
+<para>
+
+</para>
+
+@setting: 
+@Returns: 
+
+<!-- ##### FUNCTION nm_setting_adsl_get_vpi ##### -->
+<para>
+
+</para>
+
+@setting: 
+@Returns: 
+
+<!-- ##### FUNCTION nm_setting_adsl_new ##### -->
+<para>
+
+</para>
+
+@void: 
+@Returns: 
+
diff --git a/docs/libnm-util/tmpl/nm-connection.sgml b/docs/libnm-util/tmpl/nm-connection.sgml
index ddbbcf74..434e0d1b 100644
--- a/docs/libnm-util/tmpl/nm-connection.sgml
+++ b/docs/libnm-util/tmpl/nm-connection.sgml
@@ -9,13 +9,11 @@ NMConnection
 
 </para>
 
-
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
-
 <!-- ##### SECTION Stability_Level ##### -->
 
 
@@ -66,6 +64,13 @@ NMConnection
 @NM_CONNECTION_ERROR_CONNECTION_TYPE_INVALID: 
 @NM_CONNECTION_ERROR_SETTING_NOT_FOUND: 
 
+<!-- ##### MACRO NM_CONNECTION_ERROR ##### -->
+<para>
+
+</para>
+
+
+
 <!-- ##### MACRO NM_CONNECTION_PATH ##### -->
 <para>
 
@@ -214,6 +219,15 @@ NMConnection
 @Returns: 
 
 
+<!-- ##### FUNCTION nm_connection_get_setting_bond ##### -->
+<para>
+
+</para>
+
+@connection: 
+@Returns: 
+
+
 <!-- ##### FUNCTION nm_connection_get_setting_by_name ##### -->
 <para>
 
@@ -251,6 +265,15 @@ NMConnection
 @Returns: 
 
 
+<!-- ##### FUNCTION nm_connection_get_setting_infiniband ##### -->
+<para>
+
+</para>
+
+@connection: 
+@Returns: 
+
+
 <!-- ##### FUNCTION nm_connection_get_setting_ip4_config ##### -->
 <para>
 
@@ -296,6 +319,24 @@ NMConnection
 @Returns: 
 
 
+<!-- ##### FUNCTION nm_connection_get_setting_serial ##### -->
+<para>
+
+</para>
+
+@connection: 
+@Returns: 
+
+
+<!-- ##### FUNCTION nm_connection_get_setting_vlan ##### -->
+<para>
+
+</para>
+
+@connection: 
+@Returns: 
+
+
 <!-- ##### FUNCTION nm_connection_get_setting_vpn ##### -->
 <para>
 
@@ -350,6 +391,15 @@ NMConnection
 @Returns: 
 
 
+<!-- ##### FUNCTION nm_connection_get_virtual_iface_name ##### -->
+<para>
+
+</para>
+
+@connection: 
+@Returns: 
+
+
 <!-- ##### FUNCTION nm_connection_is_type ##### -->
 <para>
 
diff --git a/docs/libnm-util/tmpl/nm-setting-8021x.sgml b/docs/libnm-util/tmpl/nm-setting-8021x.sgml
index 50256d11..10775224 100644
--- a/docs/libnm-util/tmpl/nm-setting-8021x.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-8021x.sgml
@@ -9,13 +9,11 @@ NMSetting8021x
 
 </para>
 
-
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
-
 <!-- ##### SECTION Stability_Level ##### -->
 
 
@@ -63,6 +61,11 @@ NMSetting8021x
 
 </para>
 
+<!-- ##### ARG NMSetting8021x:pac-file ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG NMSetting8021x:password ##### -->
 <para>
 
@@ -73,6 +76,16 @@ NMSetting8021x
 
 </para>
 
+<!-- ##### ARG NMSetting8021x:password-raw ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG NMSetting8021x:password-raw-flags ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG NMSetting8021x:phase1-fast-provisioning ##### -->
 <para>
 
@@ -244,6 +257,13 @@ NMSetting8021x
 
 
 
+<!-- ##### MACRO NM_SETTING_802_1X_ERROR ##### -->
+<para>
+
+</para>
+
+
+
 <!-- ##### MACRO NM_SETTING_802_1X_IDENTITY ##### -->
 <para>
 
@@ -251,6 +271,13 @@ NMSetting8021x
 
 
 
+<!-- ##### MACRO NM_SETTING_802_1X_PAC_FILE ##### -->
+<para>
+
+</para>
+
+
+
 <!-- ##### MACRO NM_SETTING_802_1X_PASSWORD ##### -->
 <para>
 
@@ -265,6 +292,20 @@ NMSetting8021x
 
 
 
+<!-- ##### MACRO NM_SETTING_802_1X_PASSWORD_RAW ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO NM_SETTING_802_1X_PASSWORD_RAW_FLAGS ##### -->
+<para>
+
+</para>
+
+
+
 <!-- ##### MACRO NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING ##### -->
 <para>
 
@@ -603,6 +644,15 @@ NMSetting8021x
 @Returns: 
 
 
+<!-- ##### FUNCTION nm_setting_802_1x_get_pac_file ##### -->
+<para>
+
+</para>
+
+@setting: 
+@Returns: 
+
+
 <!-- ##### FUNCTION nm_setting_802_1x_get_password ##### -->
 <para>
 
@@ -621,6 +671,24 @@ NMSetting8021x
 @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_phase1_fast_provisioning ##### -->
 <para>
 
diff --git a/docs/libnm-util/tmpl/nm-setting-adsl.sgml b/docs/libnm-util/tmpl/nm-setting-adsl.sgml
new file mode 100644
index 00000000..d81ae07f
--- /dev/null
+++ b/docs/libnm-util/tmpl/nm-setting-adsl.sgml
@@ -0,0 +1,262 @@
+<!-- ##### SECTION Title ##### -->
+NMSettingAdsl
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
+<!-- ##### STRUCT NMSettingAdsl ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG NMSettingAdsl:encapsulation ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG NMSettingAdsl:password ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG NMSettingAdsl:password-flags ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG NMSettingAdsl:protocol ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG NMSettingAdsl:username ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG NMSettingAdsl:vci ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG NMSettingAdsl:vpi ##### -->
+<para>
+
+</para>
+
+<!-- ##### STRUCT NMSettingAdslClass ##### -->
+<para>
+
+</para>
+
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+
+<!-- ##### 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_ENCAPSULATION ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO NM_SETTING_ADSL_ENCAPSULATION_LLC ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO NM_SETTING_ADSL_ENCAPSULATION_VCMUX ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO NM_SETTING_ADSL_ERROR ##### -->
+<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_PROTOCOL_IPOATM ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO NM_SETTING_ADSL_PROTOCOL_PPPOA ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO NM_SETTING_ADSL_PROTOCOL_PPPOE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO NM_SETTING_ADSL_SETTING_NAME ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO NM_SETTING_ADSL_USERNAME ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO NM_SETTING_ADSL_VCI ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO NM_SETTING_ADSL_VPI ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION nm_setting_adsl_error_quark ##### -->
+<para>
+
+</para>
+
+@void: 
+@Returns: 
+
+
+<!-- ##### FUNCTION nm_setting_adsl_get_encapsulation ##### -->
+<para>
+
+</para>
+
+@setting: 
+@Returns: 
+
+
+<!-- ##### FUNCTION nm_setting_adsl_get_password ##### -->
+<para>
+
+</para>
+
+@setting: 
+@Returns: 
+
+
+<!-- ##### FUNCTION nm_setting_adsl_get_password_flags ##### -->
+<para>
+
+</para>
+
+@setting: 
+@Returns: 
+
+
+<!-- ##### FUNCTION nm_setting_adsl_get_protocol ##### -->
+<para>
+
+</para>
+
+@setting: 
+@Returns: 
+
+
+<!-- ##### FUNCTION nm_setting_adsl_get_username ##### -->
+<para>
+
+</para>
+
+@setting: 
+@Returns: 
+
+
+<!-- ##### FUNCTION nm_setting_adsl_get_vci ##### -->
+<para>
+
+</para>
+
+@setting: 
+@Returns: 
+
+
+<!-- ##### FUNCTION nm_setting_adsl_get_vpi ##### -->
+<para>
+
+</para>
+
+@setting: 
+@Returns: 
+
+
+<!-- ##### FUNCTION nm_setting_adsl_new ##### -->
+<para>
+
+</para>
+
+@void: 
+@Returns: 
+
+
diff --git a/docs/libnm-util/tmpl/nm-setting-bluetooth.sgml b/docs/libnm-util/tmpl/nm-setting-bluetooth.sgml
index ef059fad..9ab1b4b2 100644
--- a/docs/libnm-util/tmpl/nm-setting-bluetooth.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-bluetooth.sgml
@@ -9,13 +9,11 @@ NMSettingBluetooth
 
 </para>
 
-
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
-
 <!-- ##### SECTION Stability_Level ##### -->
 
 
@@ -66,6 +64,13 @@ NMSettingBluetooth
 
 
 
+<!-- ##### MACRO NM_SETTING_BLUETOOTH_ERROR ##### -->
+<para>
+
+</para>
+
+
+
 <!-- ##### MACRO NM_SETTING_BLUETOOTH_SETTING_NAME ##### -->
 <para>
 
diff --git a/docs/libnm-util/tmpl/nm-setting-bond.sgml b/docs/libnm-util/tmpl/nm-setting-bond.sgml
new file mode 100644
index 00000000..8f7dbfc1
--- /dev/null
+++ b/docs/libnm-util/tmpl/nm-setting-bond.sgml
@@ -0,0 +1,228 @@
+<!-- ##### SECTION Title ##### -->
+NMSettingBond
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
+<!-- ##### STRUCT NMSettingBond ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG NMSettingBond:interface-name ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG NMSettingBond:options ##### -->
+<para>
+
+</para>
+
+<!-- ##### STRUCT NMSettingBondClass ##### -->
+<para>
+
+</para>
+
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+
+<!-- ##### 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>
+
+
+
+<!-- ##### MACRO NM_SETTING_BOND_INTERFACE_NAME ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO NM_SETTING_BOND_OPTIONS ##### -->
+<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_DOWNDELAY ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO NM_SETTING_BOND_OPTION_MIIMON ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO NM_SETTING_BOND_OPTION_MODE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO NM_SETTING_BOND_OPTION_UPDELAY ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO NM_SETTING_BOND_SETTING_NAME ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION nm_setting_bond_add_option ##### -->
+<para>
+
+</para>
+
+@setting: 
+@name: 
+@value: 
+@Returns: 
+
+
+<!-- ##### FUNCTION nm_setting_bond_error_quark ##### -->
+<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_get_option_default ##### -->
+<para>
+
+</para>
+
+@setting: 
+@name: 
+@Returns: 
+
+
+<!-- ##### FUNCTION nm_setting_bond_get_valid_options ##### -->
+<para>
+
+</para>
+
+@setting: 
+@Returns: 
+
+
+<!-- ##### FUNCTION nm_setting_bond_new ##### -->
+<para>
+
+</para>
+
+@void: 
+@Returns: 
+
+
+<!-- ##### FUNCTION nm_setting_bond_remove_option ##### -->
+<para>
+
+</para>
+
+@setting: 
+@name: 
+@Returns: 
+
+
diff --git a/docs/libnm-util/tmpl/nm-setting-cdma.sgml b/docs/libnm-util/tmpl/nm-setting-cdma.sgml
index 9a23158a..7837016d 100644
--- a/docs/libnm-util/tmpl/nm-setting-cdma.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-cdma.sgml
@@ -9,13 +9,11 @@ NMSettingCdma
 
 </para>
 
-
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
-
 <!-- ##### SECTION Stability_Level ##### -->
 
 
@@ -69,6 +67,13 @@ NMSettingCdma
 @NM_SETTING_CDMA_ERROR_MISSING_PROPERTY: 
 @NM_SETTING_CDMA_ERROR_MISSING_SERIAL_SETTING: 
 
+<!-- ##### MACRO NM_SETTING_CDMA_ERROR ##### -->
+<para>
+
+</para>
+
+
+
 <!-- ##### MACRO NM_SETTING_CDMA_NUMBER ##### -->
 <para>
 
diff --git a/docs/libnm-util/tmpl/nm-setting-connection.sgml b/docs/libnm-util/tmpl/nm-setting-connection.sgml
index 7bbce879..cee42ea4 100644
--- a/docs/libnm-util/tmpl/nm-setting-connection.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-connection.sgml
@@ -9,13 +9,11 @@ NMSettingConnection
 
 </para>
 
-
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
-
 <!-- ##### SECTION Stability_Level ##### -->
 
 
@@ -38,6 +36,11 @@ NMSettingConnection
 
 </para>
 
+<!-- ##### ARG NMSettingConnection:master ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG NMSettingConnection:permissions ##### -->
 <para>
 
@@ -48,6 +51,11 @@ NMSettingConnection
 
 </para>
 
+<!-- ##### ARG NMSettingConnection:slave-type ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG NMSettingConnection:timestamp ##### -->
 <para>
 
@@ -63,6 +71,11 @@ NMSettingConnection
 
 </para>
 
+<!-- ##### ARG NMSettingConnection:zone ##### -->
+<para>
+
+</para>
+
 <!-- ##### STRUCT NMSettingConnectionClass ##### -->
 <para>
 
@@ -83,6 +96,7 @@ NMSettingConnection
 @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_AUTOCONNECT ##### -->
 <para>
@@ -91,6 +105,13 @@ NMSettingConnection
 
 
 
+<!-- ##### MACRO NM_SETTING_CONNECTION_ERROR ##### -->
+<para>
+
+</para>
+
+
+
 <!-- ##### MACRO NM_SETTING_CONNECTION_ID ##### -->
 <para>
 
@@ -98,6 +119,13 @@ NMSettingConnection
 
 
 
+<!-- ##### MACRO NM_SETTING_CONNECTION_MASTER ##### -->
+<para>
+
+</para>
+
+
+
 <!-- ##### MACRO NM_SETTING_CONNECTION_PERMISSIONS ##### -->
 <para>
 
@@ -119,6 +147,13 @@ NMSettingConnection
 
 
 
+<!-- ##### MACRO NM_SETTING_CONNECTION_SLAVE_TYPE ##### -->
+<para>
+
+</para>
+
+
+
 <!-- ##### MACRO NM_SETTING_CONNECTION_TIMESTAMP ##### -->
 <para>
 
@@ -140,6 +175,48 @@ NMSettingConnection
 
 
 
+<!-- ##### MACRO NM_SETTING_CONNECTION_ZONE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO NM_SETTING_CONNECTION_ZONE_BLOCK ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO NM_SETTING_CONNECTION_ZONE_HOME ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO NM_SETTING_CONNECTION_ZONE_PUBLIC ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO NM_SETTING_CONNECTION_ZONE_TRUSTED ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO NM_SETTING_CONNECTION_ZONE_WORK ##### -->
+<para>
+
+</para>
+
+
+
 <!-- ##### FUNCTION nm_setting_connection_add_permission ##### -->
 <para>
 
@@ -188,6 +265,15 @@ NMSettingConnection
 @Returns: 
 
 
+<!-- ##### FUNCTION nm_setting_connection_get_master ##### -->
+<para>
+
+</para>
+
+@setting: 
+@Returns: 
+
+
 <!-- ##### FUNCTION nm_setting_connection_get_num_permissions ##### -->
 <para>
 
@@ -219,6 +305,15 @@ NMSettingConnection
 @Returns: 
 
 
+<!-- ##### FUNCTION nm_setting_connection_get_slave_type ##### -->
+<para>
+
+</para>
+
+@setting: 
+@Returns: 
+
+
 <!-- ##### FUNCTION nm_setting_connection_get_timestamp ##### -->
 <para>
 
@@ -237,6 +332,25 @@ NMSettingConnection
 @Returns: 
 
 
+<!-- ##### FUNCTION nm_setting_connection_get_zone ##### -->
+<para>
+
+</para>
+
+@setting: 
+@Returns: 
+
+
+<!-- ##### FUNCTION nm_setting_connection_is_slave_type ##### -->
+<para>
+
+</para>
+
+@setting: 
+@type: 
+@Returns: 
+
+
 <!-- ##### FUNCTION nm_setting_connection_new ##### -->
 <para>
 
diff --git a/docs/libnm-util/tmpl/nm-setting-gsm.sgml b/docs/libnm-util/tmpl/nm-setting-gsm.sgml
index 7d572ddb..5a6a3c48 100644
--- a/docs/libnm-util/tmpl/nm-setting-gsm.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-gsm.sgml
@@ -9,13 +9,11 @@ NMSettingGsm
 
 </para>
 
-
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
-
 <!-- ##### SECTION Stability_Level ##### -->
 
 
@@ -150,6 +148,13 @@ NMSettingGsm
 
 
 
+<!-- ##### MACRO NM_SETTING_GSM_ERROR ##### -->
+<para>
+
+</para>
+
+
+
 <!-- ##### MACRO NM_SETTING_GSM_HOME_ONLY ##### -->
 <para>
 
diff --git a/docs/libnm-util/tmpl/nm-setting-infiniband.sgml b/docs/libnm-util/tmpl/nm-setting-infiniband.sgml
new file mode 100644
index 00000000..ba7117c0
--- /dev/null
+++ b/docs/libnm-util/tmpl/nm-setting-infiniband.sgml
@@ -0,0 +1,143 @@
+<!-- ##### SECTION Title ##### -->
+NMSettingInfiniband
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
+<!-- ##### STRUCT NMSettingInfiniband ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG NMSettingInfiniband:mac-address ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG NMSettingInfiniband:mtu ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG NMSettingInfiniband:transport-mode ##### -->
+<para>
+
+</para>
+
+<!-- ##### STRUCT NMSettingInfinibandClass ##### -->
+<para>
+
+</para>
+
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+
+<!-- ##### 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>
+
+
+
+<!-- ##### MACRO NM_SETTING_INFINIBAND_MAC_ADDRESS ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO NM_SETTING_INFINIBAND_MTU ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO NM_SETTING_INFINIBAND_SETTING_NAME ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO NM_SETTING_INFINIBAND_TRANSPORT_MODE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION nm_setting_infiniband_error_quark ##### -->
+<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_new ##### -->
+<para>
+
+</para>
+
+@void: 
+@Returns: 
+
+
diff --git a/docs/libnm-util/tmpl/nm-setting-ip4-config.sgml b/docs/libnm-util/tmpl/nm-setting-ip4-config.sgml
index 9d710571..fbc1b4cc 100644
--- a/docs/libnm-util/tmpl/nm-setting-ip4-config.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-ip4-config.sgml
@@ -9,13 +9,11 @@ NMSettingIP4Config
 
 </para>
 
-
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
-
 <!-- ##### SECTION Stability_Level ##### -->
 
 
@@ -163,6 +161,13 @@ NMSettingIP4Config
 
 
 
+<!-- ##### MACRO NM_SETTING_IP4_CONFIG_ERROR ##### -->
+<para>
+
+</para>
+
+
+
 <!-- ##### MACRO NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS ##### -->
 <para>
 
diff --git a/docs/libnm-util/tmpl/nm-setting-ip6-config.sgml b/docs/libnm-util/tmpl/nm-setting-ip6-config.sgml
index 959a0e28..400bfced 100644
--- a/docs/libnm-util/tmpl/nm-setting-ip6-config.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-ip6-config.sgml
@@ -9,13 +9,11 @@ NMSettingIP6Config
 
 </para>
 
-
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
-
 <!-- ##### SECTION Stability_Level ##### -->
 
 
@@ -65,6 +63,11 @@ NMSettingIP6Config
 
 </para>
 
+<!-- ##### ARG NMSettingIP6Config:ip6-privacy ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG NMSettingIP6Config:may-fail ##### -->
 <para>
 
@@ -106,6 +109,16 @@ NMSettingIP6Config
 @NM_SETTING_IP6_CONFIG_ERROR_MISSING_PROPERTY: 
 @NM_SETTING_IP6_CONFIG_ERROR_NOT_ALLOWED_FOR_METHOD: 
 
+<!-- ##### 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: 
+
 <!-- ##### MACRO NM_SETTING_IP6_CONFIG_ADDRESSES ##### -->
 <para>
 
@@ -127,6 +140,13 @@ NMSettingIP6Config
 
 
 
+<!-- ##### MACRO NM_SETTING_IP6_CONFIG_ERROR ##### -->
+<para>
+
+</para>
+
+
+
 <!-- ##### MACRO NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS ##### -->
 <para>
 
@@ -141,6 +161,13 @@ NMSettingIP6Config
 
 
 
+<!-- ##### MACRO NM_SETTING_IP6_CONFIG_IP6_PRIVACY ##### -->
+<para>
+
+</para>
+
+
+
 <!-- ##### MACRO NM_SETTING_IP6_CONFIG_MAY_FAIL ##### -->
 <para>
 
@@ -561,6 +588,15 @@ NMSettingIP6Config
 @Returns: 
 
 
+<!-- ##### FUNCTION nm_setting_ip6_config_get_ip6_privacy ##### -->
+<para>
+
+</para>
+
+@setting: 
+@Returns: 
+
+
 <!-- ##### FUNCTION nm_setting_ip6_config_get_may_fail ##### -->
 <para>
 
diff --git a/docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml b/docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml
index 4db8508e..744c87e3 100644
--- a/docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml
@@ -9,13 +9,11 @@ NMSettingOlpcMesh
 
 </para>
 
-
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
-
 <!-- ##### SECTION Stability_Level ##### -->
 
 
@@ -77,6 +75,13 @@ NMSettingOlpcMesh
 
 
 
+<!-- ##### MACRO NM_SETTING_OLPC_MESH_ERROR ##### -->
+<para>
+
+</para>
+
+
+
 <!-- ##### MACRO NM_SETTING_OLPC_MESH_SETTING_NAME ##### -->
 <para>
 
diff --git a/docs/libnm-util/tmpl/nm-setting-ppp.sgml b/docs/libnm-util/tmpl/nm-setting-ppp.sgml
index 34647654..f26d56fa 100644
--- a/docs/libnm-util/tmpl/nm-setting-ppp.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-ppp.sgml
@@ -9,13 +9,11 @@ NMSettingPPP
 
 </para>
 
-
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
-
 <!-- ##### SECTION Stability_Level ##### -->
 
 
@@ -153,6 +151,13 @@ NMSettingPPP
 
 
 
+<!-- ##### MACRO NM_SETTING_PPP_ERROR ##### -->
+<para>
+
+</para>
+
+
+
 <!-- ##### MACRO NM_SETTING_PPP_LCP_ECHO_FAILURE ##### -->
 <para>
 
diff --git a/docs/libnm-util/tmpl/nm-setting-pppoe.sgml b/docs/libnm-util/tmpl/nm-setting-pppoe.sgml
index d5772a87..942b5a04 100644
--- a/docs/libnm-util/tmpl/nm-setting-pppoe.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-pppoe.sgml
@@ -9,13 +9,11 @@ NMSettingPPPOE
 
 </para>
 
-
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
-
 <!-- ##### SECTION Stability_Level ##### -->
 
 
@@ -69,6 +67,13 @@ NMSettingPPPOE
 @NM_SETTING_PPPOE_ERROR_MISSING_PROPERTY: 
 @NM_SETTING_PPPOE_ERROR_MISSING_PPP_SETTING: 
 
+<!-- ##### MACRO NM_SETTING_PPPOE_ERROR ##### -->
+<para>
+
+</para>
+
+
+
 <!-- ##### MACRO NM_SETTING_PPPOE_PASSWORD ##### -->
 <para>
 
diff --git a/docs/libnm-util/tmpl/nm-setting-private.sgml b/docs/libnm-util/tmpl/nm-setting-private.sgml
index b9740165..b5cdc70e 100644
--- a/docs/libnm-util/tmpl/nm-setting-private.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-private.sgml
@@ -9,13 +9,11 @@ nm-setting-private
 
 </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 6a43dc3f..542b9fbc 100644
--- a/docs/libnm-util/tmpl/nm-setting-serial.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-serial.sgml
@@ -9,13 +9,11 @@ NMSettingSerial
 
 </para>
 
-
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
-
 <!-- ##### SECTION Stability_Level ##### -->
 
 
@@ -88,6 +86,13 @@ NMSettingSerial
 
 
 
+<!-- ##### MACRO NM_SETTING_SERIAL_ERROR ##### -->
+<para>
+
+</para>
+
+
+
 <!-- ##### MACRO NM_SETTING_SERIAL_PARITY ##### -->
 <para>
 
diff --git a/docs/libnm-util/tmpl/nm-setting-vlan.sgml b/docs/libnm-util/tmpl/nm-setting-vlan.sgml
new file mode 100644
index 00000000..79cb88db
--- /dev/null
+++ b/docs/libnm-util/tmpl/nm-setting-vlan.sgml
@@ -0,0 +1,270 @@
+<!-- ##### SECTION Title ##### -->
+NMSettingVlan
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
+<!-- ##### STRUCT NMSettingVlan ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG NMSettingVlan:egress-priority-map ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG NMSettingVlan:flags ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG NMSettingVlan:id ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG NMSettingVlan:ingress-priority-map ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG NMSettingVlan:interface-name ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG NMSettingVlan:parent ##### -->
+<para>
+
+</para>
+
+<!-- ##### STRUCT NMSettingVlanClass ##### -->
+<para>
+
+</para>
+
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+
+<!-- ##### ENUM NMSettingVlanError ##### -->
+<para>
+
+</para>
+
+@NM_SETTING_VLAN_ERROR_UNKNOWN: 
+@NM_SETTING_VLAN_ERROR_INVALID_PROPERTY: 
+@NM_SETTING_VLAN_ERROR_MISSING_PROPERTY: 
+
+<!-- ##### ENUM NMVlanFlags ##### -->
+<para>
+
+</para>
+
+@NM_VLAN_FLAG_REORDER_HEADERS: 
+@NM_VLAN_FLAG_GVRP: 
+@NM_VLAN_FLAG_LOOSE_BINDING: 
+
+<!-- ##### ENUM NMVlanPriorityMap ##### -->
+<para>
+
+</para>
+
+@NM_VLAN_INGRESS_MAP: 
+@NM_VLAN_EGRESS_MAP: 
+
+<!-- ##### MACRO NM_SETTING_VLAN_EGRESS_PRIORITY_MAP ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO NM_SETTING_VLAN_ERROR ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO NM_SETTING_VLAN_FLAGS ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO NM_SETTING_VLAN_ID ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO NM_SETTING_VLAN_INGRESS_PRIORITY_MAP ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO NM_SETTING_VLAN_INTERFACE_NAME ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO NM_SETTING_VLAN_PARENT ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO NM_SETTING_VLAN_SETTING_NAME ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION nm_setting_vlan_add_priority ##### -->
+<para>
+
+</para>
+
+@setting: 
+@map: 
+@from: 
+@to: 
+@Returns: 
+
+
+<!-- ##### FUNCTION nm_setting_vlan_add_priority_str ##### -->
+<para>
+
+</para>
+
+@setting: 
+@map: 
+@str: 
+@Returns: 
+
+
+<!-- ##### FUNCTION nm_setting_vlan_clear_priorities ##### -->
+<para>
+
+</para>
+
+@setting: 
+@map: 
+
+
+<!-- ##### FUNCTION nm_setting_vlan_error_quark ##### -->
+<para>
+
+</para>
+
+@void: 
+@Returns: 
+
+
+<!-- ##### FUNCTION nm_setting_vlan_get_flags ##### -->
+<para>
+
+</para>
+
+@setting: 
+@Returns: 
+
+
+<!-- ##### FUNCTION nm_setting_vlan_get_id ##### -->
+<para>
+
+</para>
+
+@setting: 
+@Returns: 
+
+
+<!-- ##### FUNCTION nm_setting_vlan_get_interface_name ##### -->
+<para>
+
+</para>
+
+@setting: 
+@Returns: 
+
+
+<!-- ##### FUNCTION nm_setting_vlan_get_num_priorities ##### -->
+<para>
+
+</para>
+
+@setting: 
+@map: 
+@Returns: 
+
+
+<!-- ##### FUNCTION nm_setting_vlan_get_parent ##### -->
+<para>
+
+</para>
+
+@setting: 
+@Returns: 
+
+
+<!-- ##### FUNCTION nm_setting_vlan_get_priority ##### -->
+<para>
+
+</para>
+
+@setting: 
+@map: 
+@idx: 
+@out_from: 
+@out_to: 
+@Returns: 
+
+
+<!-- ##### FUNCTION nm_setting_vlan_new ##### -->
+<para>
+
+</para>
+
+@void: 
+@Returns: 
+
+
+<!-- ##### FUNCTION nm_setting_vlan_remove_priority ##### -->
+<para>
+
+</para>
+
+@setting: 
+@map: 
+@idx: 
+
+
diff --git a/docs/libnm-util/tmpl/nm-setting-vpn.sgml b/docs/libnm-util/tmpl/nm-setting-vpn.sgml
index e7b724f2..e29dfff9 100644
--- a/docs/libnm-util/tmpl/nm-setting-vpn.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-vpn.sgml
@@ -9,13 +9,11 @@ NMSettingVPN
 
 </para>
 
-
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
-
 <!-- ##### SECTION Stability_Level ##### -->
 
 
@@ -85,6 +83,13 @@ NMSettingVPN
 
 
 
+<!-- ##### MACRO NM_SETTING_VPN_ERROR ##### -->
+<para>
+
+</para>
+
+
+
 <!-- ##### MACRO NM_SETTING_VPN_SECRETS ##### -->
 <para>
 
@@ -172,6 +177,24 @@ NMSettingVPN
 @Returns: 
 
 
+<!-- ##### FUNCTION nm_setting_vpn_get_num_data_items ##### -->
+<para>
+
+</para>
+
+@setting: 
+@Returns: 
+
+
+<!-- ##### FUNCTION nm_setting_vpn_get_num_secrets ##### -->
+<para>
+
+</para>
+
+@setting: 
+@Returns: 
+
+
 <!-- ##### FUNCTION nm_setting_vpn_get_secret ##### -->
 <para>
 
diff --git a/docs/libnm-util/tmpl/nm-setting-wimax.sgml b/docs/libnm-util/tmpl/nm-setting-wimax.sgml
index 733fe165..9225504a 100644
--- a/docs/libnm-util/tmpl/nm-setting-wimax.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-wimax.sgml
@@ -9,13 +9,11 @@ NMSettingWimax
 
 </para>
 
-
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
-
 <!-- ##### SECTION Stability_Level ##### -->
 
 
@@ -54,6 +52,13 @@ NMSettingWimax
 @NM_SETTING_WIMAX_ERROR_INVALID_PROPERTY: 
 @NM_SETTING_WIMAX_ERROR_MISSING_PROPERTY: 
 
+<!-- ##### MACRO NM_SETTING_WIMAX_ERROR ##### -->
+<para>
+
+</para>
+
+
+
 <!-- ##### MACRO NM_SETTING_WIMAX_MAC_ADDRESS ##### -->
 <para>
 
diff --git a/docs/libnm-util/tmpl/nm-setting-wired.sgml b/docs/libnm-util/tmpl/nm-setting-wired.sgml
index c3872575..cff79594 100644
--- a/docs/libnm-util/tmpl/nm-setting-wired.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-wired.sgml
@@ -9,13 +9,11 @@ NMSettingWired
 
 </para>
 
-
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
-
 <!-- ##### SECTION Stability_Level ##### -->
 
 
@@ -124,6 +122,13 @@ NMSettingWired
 
 
 
+<!-- ##### MACRO NM_SETTING_WIRED_ERROR ##### -->
+<para>
+
+</para>
+
+
+
 <!-- ##### MACRO NM_SETTING_WIRED_MAC_ADDRESS ##### -->
 <para>
 
diff --git a/docs/libnm-util/tmpl/nm-setting-wireless-security.sgml b/docs/libnm-util/tmpl/nm-setting-wireless-security.sgml
index 6fec769c..d653c682 100644
--- a/docs/libnm-util/tmpl/nm-setting-wireless-security.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-wireless-security.sgml
@@ -9,13 +9,11 @@ NMSettingWirelessSecurity
 
 </para>
 
-
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
-
 <!-- ##### SECTION Stability_Level ##### -->
 
 
@@ -154,6 +152,13 @@ NMSettingWirelessSecurity
 
 
 
+<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_ERROR ##### -->
+<para>
+
+</para>
+
+
+
 <!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_GROUP ##### -->
 <para>
 
diff --git a/docs/libnm-util/tmpl/nm-setting-wireless.sgml b/docs/libnm-util/tmpl/nm-setting-wireless.sgml
index d3ce038f..3790e252 100644
--- a/docs/libnm-util/tmpl/nm-setting-wireless.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-wireless.sgml
@@ -9,13 +9,11 @@ NMSettingWireless
 
 </para>
 
-
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
-
 <!-- ##### SECTION Stability_Level ##### -->
 
 
@@ -143,6 +141,13 @@ NMSettingWireless
 
 
 
+<!-- ##### MACRO NM_SETTING_WIRELESS_ERROR ##### -->
+<para>
+
+</para>
+
+
+
 <!-- ##### MACRO NM_SETTING_WIRELESS_MAC_ADDRESS ##### -->
 <para>
 
diff --git a/docs/libnm-util/tmpl/nm-setting.sgml b/docs/libnm-util/tmpl/nm-setting.sgml
index 912a47c6..a5198c10 100644
--- a/docs/libnm-util/tmpl/nm-setting.sgml
+++ b/docs/libnm-util/tmpl/nm-setting.sgml
@@ -9,13 +9,11 @@ NMSetting
 
 </para>
 
-
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
-
 <!-- ##### SECTION Stability_Level ##### -->
 
 
@@ -46,8 +44,8 @@ NMSetting
 @set_secret_flags: 
 @compare_property: 
 @clear_secrets_with_flags: 
+@get_virtual_iface_name: 
 @_reserved1: 
-@_reserved2: 
 
 <!-- ##### USER_FUNCTION NMSettingClearSecretsWithFlagsFn ##### -->
 <para>
@@ -123,6 +121,13 @@ NMSetting
 @user_data: 
 
 
+<!-- ##### MACRO NM_SETTING_ERROR ##### -->
+<para>
+
+</para>
+
+
+
 <!-- ##### MACRO NM_SETTING_NAME ##### -->
 <para>
 
@@ -249,6 +254,15 @@ NMSetting
 @Returns: 
 
 
+<!-- ##### FUNCTION nm_setting_get_virtual_iface_name ##### -->
+<para>
+
+</para>
+
+@setting: 
+@Returns: 
+
+
 <!-- ##### FUNCTION nm_setting_need_secrets ##### -->
 <para>
 
diff --git a/docs/libnm-util/tmpl/nm-utils-enum-types.sgml b/docs/libnm-util/tmpl/nm-utils-enum-types.sgml
new file mode 100644
index 00000000..5171db34
--- /dev/null
+++ b/docs/libnm-util/tmpl/nm-utils-enum-types.sgml
@@ -0,0 +1,22 @@
+<!-- ##### 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
index 0d77c832..9195b502 100644
--- a/docs/libnm-util/tmpl/nm-utils.sgml
+++ b/docs/libnm-util/tmpl/nm-utils.sgml
@@ -9,13 +9,11 @@ nm-utils
 
 </para>
 
-
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
-
 <!-- ##### SECTION Stability_Level ##### -->
 
 
@@ -37,6 +35,13 @@ nm-utils
 @NMU_SEC_WPA2_PSK: 
 @NMU_SEC_WPA2_ENTERPRISE: 
 
+<!-- ##### MACRO NM_UTILS_HWADDR_LEN_MAX ##### -->
+<para>
+
+</para>
+
+
+
 <!-- ##### FUNCTION nm_utils_deinit ##### -->
 <para>
 
@@ -64,6 +69,55 @@ nm-utils
 @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_len ##### -->
+<para>
+
+</para>
+
+@type: 
+@Returns: 
+
+
+<!-- ##### FUNCTION nm_utils_hwaddr_ntoa ##### -->
+<para>
+
+</para>
+
+@addr: 
+@type: 
+@Returns: 
+
+
+<!-- ##### FUNCTION nm_utils_hwaddr_type ##### -->
+<para>
+
+</para>
+
+@len: 
+@Returns: 
+
+
 <!-- ##### FUNCTION nm_utils_init ##### -->
 <para>