Merge tag 'upstream/0.9.8.8' into experimental

Upstream version 0.9.8.8

1 files changed, 72 insertions, 72 deletions

diff --git a/docs/libnm-util/tmpl/nm-setting-vlan.sgml b/docs/libnm-util/tmpl/nm-setting-vlan.sgml
index f7d67364..47b44bd6 100644
--- a/docs/libnm-util/tmpl/nm-setting-vlan.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-vlan.sgml
@@ -22,178 +22,173 @@ NMSettingVlan
 <!-- ##### SECTION Image ##### -->
 
 
-<!-- ##### STRUCT NMSettingVlan ##### -->
+<!-- ##### MACRO NM_SETTING_VLAN_SETTING_NAME ##### -->
 <para>
 
 </para>
 
 
-<!-- ##### ARG NMSettingVlan:egress-priority-map ##### -->
-<para>
 
-</para>
-
-<!-- ##### ARG NMSettingVlan:flags ##### -->
+<!-- ##### ENUM NMSettingVlanError ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG NMSettingVlan:id ##### -->
+@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>
 
-<!-- ##### ARG NMSettingVlan:ingress-priority-map ##### -->
-<para>
 
-</para>
 
-<!-- ##### ARG NMSettingVlan:interface-name ##### -->
+<!-- ##### FUNCTION nm_setting_vlan_error_quark ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG NMSettingVlan:parent ##### -->
-<para>
+@void: 
+@Returns: 
 
-</para>
 
-<!-- ##### STRUCT NMSettingVlanClass ##### -->
+<!-- ##### MACRO NM_SETTING_VLAN_INTERFACE_NAME ##### -->
 <para>
 
 </para>
 
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
 
-<!-- ##### ENUM NMSettingVlanError ##### -->
+
+<!-- ##### MACRO NM_SETTING_VLAN_PARENT ##### -->
 <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: 
 
-<!-- ##### ENUM NMVlanFlags ##### -->
+
+<!-- ##### MACRO NM_SETTING_VLAN_ID ##### -->
 <para>
 
 </para>
 
-@NM_VLAN_FLAG_REORDER_HEADERS: 
-@NM_VLAN_FLAG_GVRP: 
-@NM_VLAN_FLAG_LOOSE_BINDING: 
 
-<!-- ##### ENUM NMVlanPriorityMap ##### -->
+
+<!-- ##### MACRO NM_SETTING_VLAN_FLAGS ##### -->
 <para>
 
 </para>
 
-@NM_VLAN_INGRESS_MAP: 
-@NM_VLAN_EGRESS_MAP: 
 
-<!-- ##### MACRO NM_SETTING_VLAN_EGRESS_PRIORITY_MAP ##### -->
+
+<!-- ##### MACRO NM_SETTING_VLAN_INGRESS_PRIORITY_MAP ##### -->
 <para>
 
 </para>
 
 
 
-<!-- ##### MACRO NM_SETTING_VLAN_ERROR ##### -->
+<!-- ##### MACRO NM_SETTING_VLAN_EGRESS_PRIORITY_MAP ##### -->
 <para>
 
 </para>
 
 
 
-<!-- ##### MACRO NM_SETTING_VLAN_FLAGS ##### -->
+<!-- ##### STRUCT NMSettingVlan ##### -->
 <para>
 
 </para>
 
 
-
-<!-- ##### MACRO NM_SETTING_VLAN_ID ##### -->
+<!-- ##### ARG NMSettingVlan:egress-priority-map ##### -->
 <para>
 
 </para>
 
+<!-- ##### ARG NMSettingVlan:flags ##### -->
+<para>
 
+</para>
 
-<!-- ##### MACRO NM_SETTING_VLAN_INGRESS_PRIORITY_MAP ##### -->
+<!-- ##### ARG NMSettingVlan:id ##### -->
 <para>
 
 </para>
 
+<!-- ##### ARG NMSettingVlan:ingress-priority-map ##### -->
+<para>
 
+</para>
 
-<!-- ##### MACRO NM_SETTING_VLAN_INTERFACE_NAME ##### -->
+<!-- ##### ARG NMSettingVlan:interface-name ##### -->
 <para>
 
 </para>
 
+<!-- ##### ARG NMSettingVlan:parent ##### -->
+<para>
 
+</para>
 
-<!-- ##### MACRO NM_SETTING_VLAN_PARENT ##### -->
+<!-- ##### STRUCT NMSettingVlanClass ##### -->
 <para>
 
 </para>
 
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
 
-
-<!-- ##### MACRO NM_SETTING_VLAN_SETTING_NAME ##### -->
+<!-- ##### ENUM NMVlanPriorityMap ##### -->
 <para>
 
 </para>
 
+@NM_VLAN_INGRESS_MAP: 
+@NM_VLAN_EGRESS_MAP: 
 
-
-<!-- ##### FUNCTION nm_setting_vlan_add_priority ##### -->
+<!-- ##### ENUM NMVlanFlags ##### -->
 <para>
 
 </para>
 
-@setting: 
-@map: 
-@from: 
-@to: 
-@Returns: 
-
+@NM_VLAN_FLAG_REORDER_HEADERS: 
+@NM_VLAN_FLAG_GVRP: 
+@NM_VLAN_FLAG_LOOSE_BINDING: 
 
-<!-- ##### FUNCTION nm_setting_vlan_add_priority_str ##### -->
+<!-- ##### FUNCTION nm_setting_vlan_new ##### -->
 <para>
 
 </para>
 
-@setting: 
-@map: 
-@str: 
+@void: 
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_setting_vlan_clear_priorities ##### -->
+<!-- ##### FUNCTION nm_setting_vlan_get_interface_name ##### -->
 <para>
 
 </para>
 
 @setting: 
-@map: 
+@Returns: 
 
 
-<!-- ##### FUNCTION nm_setting_vlan_error_quark ##### -->
+<!-- ##### FUNCTION nm_setting_vlan_get_parent ##### -->
 <para>
 
 </para>
 
-@void: 
+@setting: 
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_setting_vlan_get_flags ##### -->
+<!-- ##### FUNCTION nm_setting_vlan_get_id ##### -->
 <para>
 
 </para>
@@ -202,7 +197,7 @@ NMSettingVlan
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_setting_vlan_get_id ##### -->
+<!-- ##### FUNCTION nm_setting_vlan_get_flags ##### -->
 <para>
 
 </para>
@@ -211,35 +206,42 @@ NMSettingVlan
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_setting_vlan_get_interface_name ##### -->
+<!-- ##### FUNCTION nm_setting_vlan_get_num_priorities ##### -->
 <para>
 
 </para>
 
 @setting: 
+@map: 
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_setting_vlan_get_num_priorities ##### -->
+<!-- ##### FUNCTION nm_setting_vlan_get_priority ##### -->
 <para>
 
 </para>
 
 @setting: 
 @map: 
+@idx: 
+@out_from: 
+@out_to: 
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_setting_vlan_get_parent ##### -->
+<!-- ##### FUNCTION nm_setting_vlan_add_priority ##### -->
 <para>
 
 </para>
 
 @setting: 
+@map: 
+@from: 
+@to: 
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_setting_vlan_get_priority ##### -->
+<!-- ##### FUNCTION nm_setting_vlan_remove_priority ##### -->
 <para>
 
 </para>
@@ -247,27 +249,25 @@ NMSettingVlan
 @setting: 
 @map: 
 @idx: 
-@out_from: 
-@out_to: 
-@Returns: 
 
 
-<!-- ##### FUNCTION nm_setting_vlan_new ##### -->
+<!-- ##### FUNCTION nm_setting_vlan_clear_priorities ##### -->
 <para>
 
 </para>
 
-@void: 
-@Returns: 
+@setting: 
+@map: 
 
 
-<!-- ##### FUNCTION nm_setting_vlan_remove_priority ##### -->
+<!-- ##### FUNCTION nm_setting_vlan_add_priority_str ##### -->
 <para>
 
 </para>
 
 @setting: 
 @map: 
-@idx: 
+@str: 
+@Returns: