Merge tag 'upstream/0.9.8.8' into experimental

Upstream version 0.9.8.8

1 files changed, 82 insertions, 82 deletions

diff --git a/docs/libnm-util/tmpl/nm-setting-connection.sgml b/docs/libnm-util/tmpl/nm-setting-connection.sgml
index 81d6801c..aa04897e 100644
--- a/docs/libnm-util/tmpl/nm-setting-connection.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-connection.sgml
@@ -22,104 +22,90 @@ NMSettingConnection
 <!-- ##### SECTION Image ##### -->
 
 
-<!-- ##### STRUCT NMSettingConnection ##### -->
+<!-- ##### MACRO NM_SETTING_CONNECTION_SETTING_NAME ##### -->
 <para>
 
 </para>
 
 
-<!-- ##### ARG NMSettingConnection:autoconnect ##### -->
+
+<!-- ##### ENUM NMSettingConnectionError ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG NMSettingConnection:id ##### -->
+@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>
 
-<!-- ##### ARG NMSettingConnection:master ##### -->
-<para>
 
-</para>
 
-<!-- ##### ARG NMSettingConnection:permissions ##### -->
+<!-- ##### FUNCTION nm_setting_connection_error_quark ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG NMSettingConnection:read-only ##### -->
-<para>
+@void: 
+@Returns: 
 
-</para>
 
-<!-- ##### ARG NMSettingConnection:secondaries ##### -->
+<!-- ##### MACRO NM_SETTING_CONNECTION_ID ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG NMSettingConnection:slave-type ##### -->
-<para>
 
-</para>
 
-<!-- ##### ARG NMSettingConnection:timestamp ##### -->
+<!-- ##### MACRO NM_SETTING_CONNECTION_UUID ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG NMSettingConnection:type ##### -->
-<para>
 
-</para>
 
-<!-- ##### ARG NMSettingConnection:uuid ##### -->
+<!-- ##### MACRO NM_SETTING_CONNECTION_TYPE ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG NMSettingConnection:zone ##### -->
-<para>
 
-</para>
 
-<!-- ##### STRUCT NMSettingConnectionClass ##### -->
+<!-- ##### MACRO NM_SETTING_CONNECTION_AUTOCONNECT ##### -->
 <para>
 
 </para>
 
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
 
-<!-- ##### ENUM NMSettingConnectionError ##### -->
+
+<!-- ##### MACRO NM_SETTING_CONNECTION_TIMESTAMP ##### -->
 <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_AUTOCONNECT ##### -->
+
+<!-- ##### MACRO NM_SETTING_CONNECTION_READ_ONLY ##### -->
 <para>
 
 </para>
 
 
 
-<!-- ##### MACRO NM_SETTING_CONNECTION_ERROR ##### -->
+<!-- ##### MACRO NM_SETTING_CONNECTION_PERMISSIONS ##### -->
 <para>
 
 </para>
 
 
 
-<!-- ##### MACRO NM_SETTING_CONNECTION_ID ##### -->
+<!-- ##### MACRO NM_SETTING_CONNECTION_ZONE ##### -->
 <para>
 
 </para>
@@ -133,101 +119,111 @@ NMSettingConnection
 
 
 
-<!-- ##### MACRO NM_SETTING_CONNECTION_PERMISSIONS ##### -->
+<!-- ##### MACRO NM_SETTING_CONNECTION_SLAVE_TYPE ##### -->
 <para>
 
 </para>
 
 
 
-<!-- ##### MACRO NM_SETTING_CONNECTION_READ_ONLY ##### -->
+<!-- ##### MACRO NM_SETTING_CONNECTION_SECONDARIES ##### -->
 <para>
 
 </para>
 
 
 
-<!-- ##### MACRO NM_SETTING_CONNECTION_SECONDARIES ##### -->
+<!-- ##### STRUCT NMSettingConnection ##### -->
 <para>
 
 </para>
 
 
-
-<!-- ##### MACRO NM_SETTING_CONNECTION_SETTING_NAME ##### -->
+<!-- ##### ARG NMSettingConnection:autoconnect ##### -->
 <para>
 
 </para>
 
-
-
-<!-- ##### MACRO NM_SETTING_CONNECTION_SLAVE_TYPE ##### -->
+<!-- ##### ARG NMSettingConnection:id ##### -->
 <para>
 
 </para>
 
+<!-- ##### ARG NMSettingConnection:master ##### -->
+<para>
 
+</para>
 
-<!-- ##### MACRO NM_SETTING_CONNECTION_TIMESTAMP ##### -->
+<!-- ##### ARG NMSettingConnection:permissions ##### -->
 <para>
 
 </para>
 
+<!-- ##### ARG NMSettingConnection:read-only ##### -->
+<para>
 
+</para>
 
-<!-- ##### MACRO NM_SETTING_CONNECTION_TYPE ##### -->
+<!-- ##### ARG NMSettingConnection:secondaries ##### -->
 <para>
 
 </para>
 
+<!-- ##### ARG NMSettingConnection:slave-type ##### -->
+<para>
 
+</para>
 
-<!-- ##### MACRO NM_SETTING_CONNECTION_UUID ##### -->
+<!-- ##### ARG NMSettingConnection:timestamp ##### -->
 <para>
 
 </para>
 
+<!-- ##### ARG NMSettingConnection:type ##### -->
+<para>
 
+</para>
 
-<!-- ##### MACRO NM_SETTING_CONNECTION_ZONE ##### -->
+<!-- ##### ARG NMSettingConnection:uuid ##### -->
 <para>
 
 </para>
 
+<!-- ##### ARG NMSettingConnection:zone ##### -->
+<para>
 
+</para>
 
-<!-- ##### FUNCTION nm_setting_connection_add_permission ##### -->
+<!-- ##### STRUCT NMSettingConnectionClass ##### -->
 <para>
 
 </para>
 
-@setting: 
-@ptype: 
-@pitem: 
-@detail: 
-@Returns: 
-
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
 
-<!-- ##### FUNCTION nm_setting_connection_add_secondary ##### -->
+<!-- ##### FUNCTION nm_setting_connection_new ##### -->
 <para>
 
 </para>
 
-@setting: 
-@sec_uuid: 
+@void: 
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_setting_connection_error_quark ##### -->
+<!-- ##### FUNCTION nm_setting_connection_get_id ##### -->
 <para>
 
 </para>
 
-@void: 
+@setting: 
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_setting_connection_get_autoconnect ##### -->
+<!-- ##### FUNCTION nm_setting_connection_get_uuid ##### -->
 <para>
 
 </para>
@@ -245,7 +241,7 @@ NMSettingConnection
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_setting_connection_get_id ##### -->
+<!-- ##### FUNCTION nm_setting_connection_get_autoconnect ##### -->
 <para>
 
 </para>
@@ -254,7 +250,7 @@ NMSettingConnection
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_setting_connection_get_master ##### -->
+<!-- ##### FUNCTION nm_setting_connection_get_timestamp ##### -->
 <para>
 
 </para>
@@ -263,7 +259,7 @@ NMSettingConnection
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_setting_connection_get_num_permissions ##### -->
+<!-- ##### FUNCTION nm_setting_connection_get_read_only ##### -->
 <para>
 
 </para>
@@ -272,7 +268,7 @@ NMSettingConnection
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_setting_connection_get_num_secondaries ##### -->
+<!-- ##### FUNCTION nm_setting_connection_get_num_permissions ##### -->
 <para>
 
 </para>
@@ -294,7 +290,7 @@ NMSettingConnection
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_setting_connection_get_read_only ##### -->
+<!-- ##### FUNCTION nm_setting_connection_get_zone ##### -->
 <para>
 
 </para>
@@ -303,35 +299,38 @@ NMSettingConnection
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_setting_connection_get_secondary ##### -->
+<!-- ##### FUNCTION nm_setting_connection_permissions_user_allowed ##### -->
 <para>
 
 </para>
 
 @setting: 
-@idx: 
+@uname: 
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_setting_connection_get_slave_type ##### -->
+<!-- ##### FUNCTION nm_setting_connection_add_permission ##### -->
 <para>
 
 </para>
 
 @setting: 
+@ptype: 
+@pitem: 
+@detail: 
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_setting_connection_get_timestamp ##### -->
+<!-- ##### FUNCTION nm_setting_connection_remove_permission ##### -->
 <para>
 
 </para>
 
 @setting: 
-@Returns: 
+@idx: 
 
 
-<!-- ##### FUNCTION nm_setting_connection_get_uuid ##### -->
+<!-- ##### FUNCTION nm_setting_connection_get_master ##### -->
 <para>
 
 </para>
@@ -340,51 +339,52 @@ NMSettingConnection
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_setting_connection_get_zone ##### -->
+<!-- ##### FUNCTION nm_setting_connection_is_slave_type ##### -->
 <para>
 
 </para>
 
 @setting: 
+@type: 
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_setting_connection_is_slave_type ##### -->
+<!-- ##### FUNCTION nm_setting_connection_get_slave_type ##### -->
 <para>
 
 </para>
 
 @setting: 
-@type: 
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_setting_connection_new ##### -->
+<!-- ##### FUNCTION nm_setting_connection_get_num_secondaries ##### -->
 <para>
 
 </para>
 
-@void: 
+@setting: 
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_setting_connection_permissions_user_allowed ##### -->
+<!-- ##### FUNCTION nm_setting_connection_get_secondary ##### -->
 <para>
 
 </para>
 
 @setting: 
-@uname: 
+@idx: 
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_setting_connection_remove_permission ##### -->
+<!-- ##### FUNCTION nm_setting_connection_add_secondary ##### -->
 <para>
 
 </para>
 
 @setting: 
-@idx: 
+@sec_uuid: 
+@Returns: 
 
 
 <!-- ##### FUNCTION nm_setting_connection_remove_secondary ##### -->