From a4256940da049f91bbbea5e53e469a59ea9c10f7 Mon Sep 17 00:00:00 2001
From: Sjoerd Simons <sjoerd@luon.net>
Date: Fri, 25 Oct 2013 21:20:58 +0200
Subject: Imported Upstream version 0.9.8.8

---
 .../tmpl/nm-setting-wireless-security.sgml         | 252 ++++++++++-----------
 1 file changed, 126 insertions(+), 126 deletions(-)

(limited to 'docs/libnm-util/tmpl/nm-setting-wireless-security.sgml')

diff --git a/docs/libnm-util/tmpl/nm-setting-wireless-security.sgml b/docs/libnm-util/tmpl/nm-setting-wireless-security.sgml
index 01b16ce9..7c8b7dc8 100644
--- a/docs/libnm-util/tmpl/nm-setting-wireless-security.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-wireless-security.sgml
@@ -22,380 +22,381 @@ NMSettingWirelessSecurity
 <!-- ##### SECTION Image ##### -->
 
 
-<!-- ##### STRUCT NMSettingWirelessSecurity ##### -->
+<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_SETTING_NAME ##### -->
 <para>
 
 </para>
 
 
-<!-- ##### ARG NMSettingWirelessSecurity:auth-alg ##### -->
-<para>
-
-</para>
 
-<!-- ##### ARG NMSettingWirelessSecurity:group ##### -->
+<!-- ##### ENUM NMSettingWirelessSecurityError ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG NMSettingWirelessSecurity:key-mgmt ##### -->
+@NM_SETTING_WIRELESS_SECURITY_ERROR_UNKNOWN: 
+@NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY: 
+@NM_SETTING_WIRELESS_SECURITY_ERROR_MISSING_PROPERTY: 
+@NM_SETTING_WIRELESS_SECURITY_ERROR_MISSING_802_1X_SETTING: 
+@NM_SETTING_WIRELESS_SECURITY_ERROR_LEAP_REQUIRES_802_1X: 
+@NM_SETTING_WIRELESS_SECURITY_ERROR_LEAP_REQUIRES_USERNAME: 
+@NM_SETTING_WIRELESS_SECURITY_ERROR_SHARED_KEY_REQUIRES_WEP: 
+
+<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_ERROR ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG NMSettingWirelessSecurity:leap-password ##### -->
-<para>
 
-</para>
 
-<!-- ##### ARG NMSettingWirelessSecurity:leap-password-flags ##### -->
+<!-- ##### FUNCTION nm_setting_wireless_security_error_quark ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG NMSettingWirelessSecurity:leap-username ##### -->
-<para>
+@void: 
+@Returns: 
 
-</para>
 
-<!-- ##### ARG NMSettingWirelessSecurity:pairwise ##### -->
+<!-- ##### ENUM NMWepKeyType ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG NMSettingWirelessSecurity:proto ##### -->
+@NM_WEP_KEY_TYPE_UNKNOWN: 
+@NM_WEP_KEY_TYPE_KEY: 
+@NM_WEP_KEY_TYPE_PASSPHRASE: 
+@NM_WEP_KEY_TYPE_LAST: 
+
+<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_KEY_MGMT ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG NMSettingWirelessSecurity:psk ##### -->
-<para>
 
-</para>
 
-<!-- ##### ARG NMSettingWirelessSecurity:psk-flags ##### -->
+<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG NMSettingWirelessSecurity:wep-key-flags ##### -->
-<para>
 
-</para>
 
-<!-- ##### ARG NMSettingWirelessSecurity:wep-key-type ##### -->
+<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_AUTH_ALG ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG NMSettingWirelessSecurity:wep-key0 ##### -->
-<para>
 
-</para>
 
-<!-- ##### ARG NMSettingWirelessSecurity:wep-key1 ##### -->
+<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_PROTO ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG NMSettingWirelessSecurity:wep-key2 ##### -->
-<para>
 
-</para>
 
-<!-- ##### ARG NMSettingWirelessSecurity:wep-key3 ##### -->
+<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_PAIRWISE ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG NMSettingWirelessSecurity:wep-tx-keyidx ##### -->
-<para>
 
-</para>
 
-<!-- ##### STRUCT NMSettingWirelessSecurityClass ##### -->
+<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_GROUP ##### -->
 <para>
 
 </para>
 
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
 
-<!-- ##### ENUM NMSettingWirelessSecurityError ##### -->
+
+<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME ##### -->
 <para>
 
 </para>
 
-@NM_SETTING_WIRELESS_SECURITY_ERROR_UNKNOWN: 
-@NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_WIRELESS_SECURITY_ERROR_MISSING_PROPERTY: 
-@NM_SETTING_WIRELESS_SECURITY_ERROR_MISSING_802_1X_SETTING: 
-@NM_SETTING_WIRELESS_SECURITY_ERROR_LEAP_REQUIRES_802_1X: 
-@NM_SETTING_WIRELESS_SECURITY_ERROR_LEAP_REQUIRES_USERNAME: 
-@NM_SETTING_WIRELESS_SECURITY_ERROR_SHARED_KEY_REQUIRES_WEP: 
 
-<!-- ##### ENUM NMWepKeyType ##### -->
+
+<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_WEP_KEY0 ##### -->
 <para>
 
 </para>
 
-@NM_WEP_KEY_TYPE_UNKNOWN: 
-@NM_WEP_KEY_TYPE_KEY: 
-@NM_WEP_KEY_TYPE_PASSPHRASE: 
-@NM_WEP_KEY_TYPE_LAST: 
 
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_AUTH_ALG ##### -->
+
+<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_WEP_KEY1 ##### -->
 <para>
 
 </para>
 
 
 
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_ERROR ##### -->
+<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_WEP_KEY2 ##### -->
 <para>
 
 </para>
 
 
 
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_GROUP ##### -->
+<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_WEP_KEY3 ##### -->
 <para>
 
 </para>
 
 
 
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_KEY_MGMT ##### -->
+<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS ##### -->
 <para>
 
 </para>
 
 
 
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD ##### -->
+<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE ##### -->
 <para>
 
 </para>
 
 
 
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS ##### -->
+<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_PSK ##### -->
 <para>
 
 </para>
 
 
 
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME ##### -->
+<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS ##### -->
 <para>
 
 </para>
 
 
 
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_PAIRWISE ##### -->
+<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD ##### -->
 <para>
 
 </para>
 
 
 
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_PROTO ##### -->
+<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS ##### -->
 <para>
 
 </para>
 
 
 
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_PSK ##### -->
+<!-- ##### STRUCT NMSettingWirelessSecurity ##### -->
 <para>
 
 </para>
 
 
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS ##### -->
+<!-- ##### ARG NMSettingWirelessSecurity:auth-alg ##### -->
 <para>
 
 </para>
 
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_SETTING_NAME ##### -->
+<!-- ##### ARG NMSettingWirelessSecurity:group ##### -->
 <para>
 
 </para>
 
+<!-- ##### ARG NMSettingWirelessSecurity:key-mgmt ##### -->
+<para>
 
+</para>
 
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_WEP_KEY0 ##### -->
+<!-- ##### ARG NMSettingWirelessSecurity:leap-password ##### -->
 <para>
 
 </para>
 
+<!-- ##### ARG NMSettingWirelessSecurity:leap-password-flags ##### -->
+<para>
 
+</para>
 
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_WEP_KEY1 ##### -->
+<!-- ##### ARG NMSettingWirelessSecurity:leap-username ##### -->
 <para>
 
 </para>
 
+<!-- ##### ARG NMSettingWirelessSecurity:pairwise ##### -->
+<para>
 
+</para>
 
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_WEP_KEY2 ##### -->
+<!-- ##### ARG NMSettingWirelessSecurity:proto ##### -->
 <para>
 
 </para>
 
+<!-- ##### ARG NMSettingWirelessSecurity:psk ##### -->
+<para>
 
+</para>
 
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_WEP_KEY3 ##### -->
+<!-- ##### ARG NMSettingWirelessSecurity:psk-flags ##### -->
 <para>
 
 </para>
 
+<!-- ##### ARG NMSettingWirelessSecurity:wep-key-flags ##### -->
+<para>
 
+</para>
 
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS ##### -->
+<!-- ##### ARG NMSettingWirelessSecurity:wep-key-type ##### -->
 <para>
 
 </para>
 
+<!-- ##### ARG NMSettingWirelessSecurity:wep-key0 ##### -->
+<para>
 
+</para>
 
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE ##### -->
+<!-- ##### ARG NMSettingWirelessSecurity:wep-key1 ##### -->
 <para>
 
 </para>
 
+<!-- ##### ARG NMSettingWirelessSecurity:wep-key2 ##### -->
+<para>
 
+</para>
 
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX ##### -->
+<!-- ##### ARG NMSettingWirelessSecurity:wep-key3 ##### -->
 <para>
 
 </para>
 
+<!-- ##### ARG NMSettingWirelessSecurity:wep-tx-keyidx ##### -->
+<para>
 
+</para>
 
-<!-- ##### FUNCTION nm_setting_wireless_security_add_group ##### -->
+<!-- ##### STRUCT NMSettingWirelessSecurityClass ##### -->
 <para>
 
 </para>
 
-@setting: 
-@group: 
-@Returns: 
-
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
 
-<!-- ##### FUNCTION nm_setting_wireless_security_add_pairwise ##### -->
+<!-- ##### FUNCTION nm_setting_wireless_security_new ##### -->
 <para>
 
 </para>
 
-@setting: 
-@pairwise: 
+@void: 
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_setting_wireless_security_add_proto ##### -->
+<!-- ##### FUNCTION nm_setting_wireless_security_get_key_mgmt ##### -->
 <para>
 
 </para>
 
 @setting: 
-@proto: 
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_setting_wireless_security_clear_groups ##### -->
+<!-- ##### FUNCTION nm_setting_wireless_security_get_num_protos ##### -->
 <para>
 
 </para>
 
 @setting: 
+@Returns: 
 
 
-<!-- ##### FUNCTION nm_setting_wireless_security_clear_pairwise ##### -->
+<!-- ##### FUNCTION nm_setting_wireless_security_get_proto ##### -->
 <para>
 
 </para>
 
 @setting: 
+@i: 
+@Returns: 
 
 
-<!-- ##### FUNCTION nm_setting_wireless_security_clear_protos ##### -->
+<!-- ##### FUNCTION nm_setting_wireless_security_add_proto ##### -->
 <para>
 
 </para>
 
 @setting: 
+@proto: 
+@Returns: 
 
 
-<!-- ##### FUNCTION nm_setting_wireless_security_error_quark ##### -->
+<!-- ##### FUNCTION nm_setting_wireless_security_remove_proto ##### -->
 <para>
 
 </para>
 
-@void: 
-@Returns: 
+@setting: 
+@i: 
 
 
-<!-- ##### FUNCTION nm_setting_wireless_security_get_auth_alg ##### -->
+<!-- ##### FUNCTION nm_setting_wireless_security_clear_protos ##### -->
 <para>
 
 </para>
 
 @setting: 
-@Returns: 
 
 
-<!-- ##### FUNCTION nm_setting_wireless_security_get_group ##### -->
+<!-- ##### FUNCTION nm_setting_wireless_security_get_num_pairwise ##### -->
 <para>
 
 </para>
 
 @setting: 
-@i: 
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_setting_wireless_security_get_key_mgmt ##### -->
+<!-- ##### FUNCTION nm_setting_wireless_security_get_pairwise ##### -->
 <para>
 
 </para>
 
 @setting: 
+@i: 
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_setting_wireless_security_get_leap_password ##### -->
+<!-- ##### FUNCTION nm_setting_wireless_security_add_pairwise ##### -->
 <para>
 
 </para>
 
 @setting: 
+@pairwise: 
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_setting_wireless_security_get_leap_password_flags ##### -->
+<!-- ##### FUNCTION nm_setting_wireless_security_remove_pairwise ##### -->
 <para>
 
 </para>
 
 @setting: 
-@Returns: 
+@i: 
 
 
-<!-- ##### FUNCTION nm_setting_wireless_security_get_leap_username ##### -->
+<!-- ##### FUNCTION nm_setting_wireless_security_clear_pairwise ##### -->
 <para>
 
 </para>
 
 @setting: 
-@Returns: 
 
 
 <!-- ##### FUNCTION nm_setting_wireless_security_get_num_groups ##### -->
@@ -407,42 +408,41 @@ NMSettingWirelessSecurity
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_setting_wireless_security_get_num_pairwise ##### -->
+<!-- ##### FUNCTION nm_setting_wireless_security_get_group ##### -->
 <para>
 
 </para>
 
 @setting: 
+@i: 
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_setting_wireless_security_get_num_protos ##### -->
+<!-- ##### FUNCTION nm_setting_wireless_security_add_group ##### -->
 <para>
 
 </para>
 
 @setting: 
+@group: 
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_setting_wireless_security_get_pairwise ##### -->
+<!-- ##### FUNCTION nm_setting_wireless_security_remove_group ##### -->
 <para>
 
 </para>
 
 @setting: 
 @i: 
-@Returns: 
 
 
-<!-- ##### FUNCTION nm_setting_wireless_security_get_proto ##### -->
+<!-- ##### FUNCTION nm_setting_wireless_security_clear_groups ##### -->
 <para>
 
 </para>
 
 @setting: 
-@i: 
-@Returns: 
 
 
 <!-- ##### FUNCTION nm_setting_wireless_security_get_psk ##### -->
@@ -463,17 +463,16 @@ NMSettingWirelessSecurity
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_setting_wireless_security_get_wep_key ##### -->
+<!-- ##### FUNCTION nm_setting_wireless_security_get_leap_username ##### -->
 <para>
 
 </para>
 
 @setting: 
-@idx: 
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_setting_wireless_security_get_wep_key_flags ##### -->
+<!-- ##### FUNCTION nm_setting_wireless_security_get_leap_password ##### -->
 <para>
 
 </para>
@@ -482,7 +481,7 @@ NMSettingWirelessSecurity
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_setting_wireless_security_get_wep_key_type ##### -->
+<!-- ##### FUNCTION nm_setting_wireless_security_get_leap_password_flags ##### -->
 <para>
 
 </para>
@@ -491,58 +490,59 @@ NMSettingWirelessSecurity
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_setting_wireless_security_get_wep_tx_keyidx ##### -->
+<!-- ##### FUNCTION nm_setting_wireless_security_get_wep_key ##### -->
 <para>
 
 </para>
 
 @setting: 
+@idx: 
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_setting_wireless_security_new ##### -->
+<!-- ##### FUNCTION nm_setting_wireless_security_set_wep_key ##### -->
 <para>
 
 </para>
 
-@void: 
-@Returns: 
+@setting: 
+@idx: 
+@key: 
 
 
-<!-- ##### FUNCTION nm_setting_wireless_security_remove_group ##### -->
+<!-- ##### FUNCTION nm_setting_wireless_security_get_wep_tx_keyidx ##### -->
 <para>
 
 </para>
 
 @setting: 
-@i: 
+@Returns: 
 
 
-<!-- ##### FUNCTION nm_setting_wireless_security_remove_pairwise ##### -->
+<!-- ##### FUNCTION nm_setting_wireless_security_get_auth_alg ##### -->
 <para>
 
 </para>
 
 @setting: 
-@i: 
+@Returns: 
 
 
-<!-- ##### FUNCTION nm_setting_wireless_security_remove_proto ##### -->
+<!-- ##### FUNCTION nm_setting_wireless_security_get_wep_key_flags ##### -->
 <para>
 
 </para>
 
 @setting: 
-@i: 
+@Returns: 
 
 
-<!-- ##### FUNCTION nm_setting_wireless_security_set_wep_key ##### -->
+<!-- ##### FUNCTION nm_setting_wireless_security_get_wep_key_type ##### -->
 <para>
 
 </para>
 
 @setting: 
-@idx: 
-@key: 
+@Returns: 
 
 
-- 
cgit 1.3.0-6-gf8a5