Merge tag 'upstream/0.9.8.8' into experimental

Upstream version 0.9.8.8

1 files changed, 114 insertions, 114 deletions

diff --git a/docs/libnm-util/tmpl/nm-connection.sgml b/docs/libnm-util/tmpl/nm-connection.sgml
index f6a97532..e8491ee1 100644
--- a/docs/libnm-util/tmpl/nm-connection.sgml
+++ b/docs/libnm-util/tmpl/nm-connection.sgml
@@ -22,99 +22,98 @@ NMConnection
 <!-- ##### SECTION Image ##### -->
 
 
-<!-- ##### STRUCT NMConnection ##### -->
+<!-- ##### 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: 
 
-<!-- ##### SIGNAL NMConnection::secrets-cleared ##### -->
+<!-- ##### MACRO NM_CONNECTION_ERROR ##### -->
 <para>
 
 </para>
 
-@nmconnection: the object which received the signal.
 
-<!-- ##### SIGNAL NMConnection::secrets-updated ##### -->
+
+<!-- ##### FUNCTION nm_connection_error_quark ##### -->
 <para>
 
 </para>
 
-@nmconnection: the object which received the signal.
-@arg1: 
+@void: 
+@Returns: 
 
-<!-- ##### ARG NMConnection:path ##### -->
+
+<!-- ##### MACRO NM_CONNECTION_PATH ##### -->
 <para>
 
 </para>
 
-<!-- ##### STRUCT NMConnectionClass ##### -->
+
+
+<!-- ##### STRUCT NMConnection ##### -->
 <para>
 
 </para>
 
-@parent: 
-@secrets_updated: 
 
-<!-- ##### ENUM NMConnectionError ##### -->
+<!-- ##### SIGNAL NMConnection::secrets-cleared ##### -->
 <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: 
+@nmconnection: the object which received the signal.
 
-<!-- ##### MACRO NM_CONNECTION_ERROR ##### -->
+<!-- ##### SIGNAL NMConnection::secrets-updated ##### -->
 <para>
 
 </para>
 
+@nmconnection: the object which received the signal.
+@arg1: 
 
-
-<!-- ##### MACRO NM_CONNECTION_PATH ##### -->
+<!-- ##### ARG NMConnection:path ##### -->
 <para>
 
 </para>
 
-
-
-<!-- ##### FUNCTION nm_connection_add_setting ##### -->
+<!-- ##### STRUCT NMConnectionClass ##### -->
 <para>
 
 </para>
 
-@connection: 
-@setting: 
-
+@parent: 
+@secrets_updated: 
 
-<!-- ##### FUNCTION nm_connection_clear_secrets ##### -->
+<!-- ##### FUNCTION nm_connection_new ##### -->
 <para>
 
 </para>
 
-@connection: 
+@void: 
+@Returns: 
 
 
-<!-- ##### FUNCTION nm_connection_clear_secrets_with_flags ##### -->
+<!-- ##### FUNCTION nm_connection_new_from_hash ##### -->
 <para>
 
 </para>
 
-@connection: 
-@func: 
-@user_data: 
+@hash: 
+@error: 
+@Returns: 
 
 
-<!-- ##### FUNCTION nm_connection_compare ##### -->
+<!-- ##### FUNCTION nm_connection_duplicate ##### -->
 <para>
 
 </para>
 
-@a: 
-@b: 
-@flags: 
+@connection: 
 @Returns: 
 
 
@@ -127,128 +126,138 @@ NMConnection
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_connection_diff ##### -->
+<!-- ##### FUNCTION nm_connection_add_setting ##### -->
 <para>
 
 </para>
 
-@a: 
-@b: 
-@flags: 
-@out_settings: 
-@Returns: 
+@connection: 
+@setting: 
 
 
-<!-- ##### FUNCTION nm_connection_dump ##### -->
+<!-- ##### FUNCTION nm_connection_remove_setting ##### -->
 <para>
 
 </para>
 
 @connection: 
+@setting_type: 
 
 
-<!-- ##### FUNCTION nm_connection_duplicate ##### -->
+<!-- ##### FUNCTION nm_connection_get_setting ##### -->
 <para>
 
 </para>
 
 @connection: 
+@setting_type: 
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_connection_error_quark ##### -->
+<!-- ##### FUNCTION nm_connection_get_setting_by_name ##### -->
 <para>
 
 </para>
 
-@void: 
+@connection: 
+@name: 
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_connection_for_each_setting_value ##### -->
+<!-- ##### FUNCTION nm_connection_replace_settings ##### -->
 <para>
 
 </para>
 
 @connection: 
-@func: 
-@user_data: 
+@new_settings: 
+@error: 
+@Returns: 
 
 
-<!-- ##### FUNCTION nm_connection_get_id ##### -->
+<!-- ##### FUNCTION nm_connection_compare ##### -->
 <para>
 
 </para>
 
-@connection: 
+@a: 
+@b: 
+@flags: 
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_connection_get_path ##### -->
+<!-- ##### FUNCTION nm_connection_diff ##### -->
 <para>
 
 </para>
 
-@connection: 
+@a: 
+@b: 
+@flags: 
+@out_settings: 
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_connection_get_setting ##### -->
+<!-- ##### FUNCTION nm_connection_verify ##### -->
 <para>
 
 </para>
 
 @connection: 
-@setting_type: 
+@error: 
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_connection_get_setting_802_1x ##### -->
+<!-- ##### FUNCTION nm_connection_need_secrets ##### -->
 <para>
 
 </para>
 
 @connection: 
+@hints: 
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_connection_get_setting_adsl ##### -->
+<!-- ##### FUNCTION nm_connection_clear_secrets ##### -->
 <para>
 
 </para>
 
 @connection: 
-@Returns: 
 
 
-<!-- ##### FUNCTION nm_connection_get_setting_bluetooth ##### -->
+<!-- ##### FUNCTION nm_connection_clear_secrets_with_flags ##### -->
 <para>
 
 </para>
 
 @connection: 
-@Returns: 
+@func: 
+@user_data: 
 
 
-<!-- ##### FUNCTION nm_connection_get_setting_bond ##### -->
+<!-- ##### FUNCTION nm_connection_update_secrets ##### -->
 <para>
 
 </para>
 
 @connection: 
+@setting_name: 
+@secrets: 
+@error: 
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_connection_get_setting_bridge ##### -->
+<!-- ##### FUNCTION nm_connection_set_path ##### -->
 <para>
 
 </para>
 
 @connection: 
-@Returns: 
+@path: 
 
 
-<!-- ##### FUNCTION nm_connection_get_setting_bridge_port ##### -->
+<!-- ##### FUNCTION nm_connection_get_path ##### -->
 <para>
 
 </para>
@@ -257,71 +266,72 @@ NMConnection
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_connection_get_setting_by_name ##### -->
+<!-- ##### FUNCTION nm_connection_get_virtual_iface_name ##### -->
 <para>
 
 </para>
 
 @connection: 
-@name: 
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_connection_get_setting_cdma ##### -->
+<!-- ##### FUNCTION nm_connection_is_type ##### -->
 <para>
 
 </para>
 
 @connection: 
+@type: 
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_connection_get_setting_connection ##### -->
+<!-- ##### FUNCTION nm_connection_for_each_setting_value ##### -->
 <para>
 
 </para>
 
 @connection: 
-@Returns: 
+@func: 
+@user_data: 
 
 
-<!-- ##### FUNCTION nm_connection_get_setting_gsm ##### -->
+<!-- ##### FUNCTION nm_connection_to_hash ##### -->
 <para>
 
 </para>
 
 @connection: 
+@flags: 
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_connection_get_setting_infiniband ##### -->
+<!-- ##### FUNCTION nm_connection_dump ##### -->
 <para>
 
 </para>
 
 @connection: 
-@Returns: 
 
 
-<!-- ##### FUNCTION nm_connection_get_setting_ip4_config ##### -->
+<!-- ##### FUNCTION nm_connection_lookup_setting_type ##### -->
 <para>
 
 </para>
 
-@connection: 
+@name: 
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_connection_get_setting_ip6_config ##### -->
+<!-- ##### FUNCTION nm_connection_lookup_setting_type_by_quark ##### -->
 <para>
 
 </para>
 
-@connection: 
+@error_quark: 
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_connection_get_setting_olpc_mesh ##### -->
+<!-- ##### FUNCTION nm_connection_get_uuid ##### -->
 <para>
 
 </para>
@@ -330,7 +340,7 @@ NMConnection
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_connection_get_setting_ppp ##### -->
+<!-- ##### FUNCTION nm_connection_get_id ##### -->
 <para>
 
 </para>
@@ -339,7 +349,7 @@ NMConnection
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_connection_get_setting_pppoe ##### -->
+<!-- ##### FUNCTION nm_connection_get_setting_802_1x ##### -->
 <para>
 
 </para>
@@ -348,7 +358,7 @@ NMConnection
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_connection_get_setting_serial ##### -->
+<!-- ##### FUNCTION nm_connection_get_setting_bluetooth ##### -->
 <para>
 
 </para>
@@ -357,7 +367,7 @@ NMConnection
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_connection_get_setting_vlan ##### -->
+<!-- ##### FUNCTION nm_connection_get_setting_bond ##### -->
 <para>
 
 </para>
@@ -366,7 +376,7 @@ NMConnection
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_connection_get_setting_vpn ##### -->
+<!-- ##### FUNCTION nm_connection_get_setting_bridge ##### -->
 <para>
 
 </para>
@@ -375,7 +385,7 @@ NMConnection
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_connection_get_setting_wimax ##### -->
+<!-- ##### FUNCTION nm_connection_get_setting_bridge_port ##### -->
 <para>
 
 </para>
@@ -384,7 +394,7 @@ NMConnection
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_connection_get_setting_wired ##### -->
+<!-- ##### FUNCTION nm_connection_get_setting_cdma ##### -->
 <para>
 
 </para>
@@ -393,7 +403,7 @@ NMConnection
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_connection_get_setting_wireless ##### -->
+<!-- ##### FUNCTION nm_connection_get_setting_connection ##### -->
 <para>
 
 </para>
@@ -402,7 +412,7 @@ NMConnection
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_connection_get_setting_wireless_security ##### -->
+<!-- ##### FUNCTION nm_connection_get_setting_gsm ##### -->
 <para>
 
 </para>
@@ -411,7 +421,7 @@ NMConnection
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_connection_get_uuid ##### -->
+<!-- ##### FUNCTION nm_connection_get_setting_infiniband ##### -->
 <para>
 
 </para>
@@ -420,7 +430,7 @@ NMConnection
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_connection_get_virtual_iface_name ##### -->
+<!-- ##### FUNCTION nm_connection_get_setting_ip4_config ##### -->
 <para>
 
 </para>
@@ -429,121 +439,111 @@ NMConnection
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_connection_is_type ##### -->
+<!-- ##### FUNCTION nm_connection_get_setting_ip6_config ##### -->
 <para>
 
 </para>
 
 @connection: 
-@type: 
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_connection_lookup_setting_type ##### -->
+<!-- ##### FUNCTION nm_connection_get_setting_olpc_mesh ##### -->
 <para>
 
 </para>
 
-@name: 
+@connection: 
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_connection_lookup_setting_type_by_quark ##### -->
+<!-- ##### FUNCTION nm_connection_get_setting_ppp ##### -->
 <para>
 
 </para>
 
-@error_quark: 
+@connection: 
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_connection_need_secrets ##### -->
+<!-- ##### FUNCTION nm_connection_get_setting_pppoe ##### -->
 <para>
 
 </para>
 
 @connection: 
-@hints: 
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_connection_new ##### -->
+<!-- ##### FUNCTION nm_connection_get_setting_serial ##### -->
 <para>
 
 </para>
 
-@void: 
+@connection: 
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_connection_new_from_hash ##### -->
+<!-- ##### FUNCTION nm_connection_get_setting_vpn ##### -->
 <para>
 
 </para>
 
-@hash: 
-@error: 
+@connection: 
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_connection_remove_setting ##### -->
+<!-- ##### FUNCTION nm_connection_get_setting_wimax ##### -->
 <para>
 
 </para>
 
 @connection: 
-@setting_type: 
+@Returns: 
 
 
-<!-- ##### FUNCTION nm_connection_replace_settings ##### -->
+<!-- ##### FUNCTION nm_connection_get_setting_adsl ##### -->
 <para>
 
 </para>
 
 @connection: 
-@new_settings: 
-@error: 
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_connection_set_path ##### -->
+<!-- ##### FUNCTION nm_connection_get_setting_wired ##### -->
 <para>
 
 </para>
 
 @connection: 
-@path: 
+@Returns: 
 
 
-<!-- ##### FUNCTION nm_connection_to_hash ##### -->
+<!-- ##### FUNCTION nm_connection_get_setting_wireless ##### -->
 <para>
 
 </para>
 
 @connection: 
-@flags: 
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_connection_update_secrets ##### -->
+<!-- ##### FUNCTION nm_connection_get_setting_wireless_security ##### -->
 <para>
 
 </para>
 
 @connection: 
-@setting_name: 
-@secrets: 
-@error: 
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_connection_verify ##### -->
+<!-- ##### FUNCTION nm_connection_get_setting_vlan ##### -->
 <para>
 
 </para>
 
 @connection: 
-@error: 
 @Returns: