From a6b89d35fabd9f5934b84d7cde22e9268f92c3d3 Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@debian.org>
Date: Mon, 29 Nov 2010 19:00:22 +0100
Subject: Imported Upstream version 0.8.2

---
 docs/libnm-util/tmpl/libnm-util-unused.sgml     | 177 +++---------------------
 docs/libnm-util/tmpl/nm-setting-ip6-config.sgml |   7 +
 docs/libnm-util/tmpl/nm-setting-wired.sgml      | 127 +++++++++++++++++
 docs/libnm-util/tmpl/nm-setting-wireless.sgml   |  21 +++
 docs/libnm-util/tmpl/nm-utils.sgml              |  40 ++++++
 5 files changed, 218 insertions(+), 154 deletions(-)

(limited to 'docs/libnm-util/tmpl')

diff --git a/docs/libnm-util/tmpl/libnm-util-unused.sgml b/docs/libnm-util/tmpl/libnm-util-unused.sgml
index ea59da27..14ec2d31 100644
--- a/docs/libnm-util/tmpl/libnm-util-unused.sgml
+++ b/docs/libnm-util/tmpl/libnm-util-unused.sgml
@@ -113,6 +113,12 @@ NMSettingWimax
 @NM_SETTING_BRIDGE_ERROR_INVALID_PROPERTY: 
 @NM_SETTING_BRIDGE_ERROR_MISSING_PROPERTY: 
 
+<!-- ##### ARG NMSettingConnection:permissions ##### -->
+<para>
+
+</para>
+
+
 <!-- ##### ENUM NMSettingGsmNetworkMode ##### -->
 <para>
 
@@ -158,24 +164,6 @@ NMSettingWimax
 @NM_SETTING_WIMAX_ERROR_INVALID_PROPERTY: 
 @NM_SETTING_WIMAX_ERROR_MISSING_PROPERTY: 
 
-<!-- ##### ARG NMSettingWired:cloned-mac-address ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG NMSettingWired:s390-nettype ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG NMSettingWired:s390-options ##### -->
-<para>
-
-</para>
-
-
 <!-- ##### ARG NMSettingWired:s390-port-name ##### -->
 <para>
 
@@ -194,19 +182,19 @@ NMSettingWimax
 </para>
 
 
-<!-- ##### ARG NMSettingWired:s390-subchannels ##### -->
+<!-- ##### ARG NMSettingWired:zvm-subchannels ##### -->
 <para>
 
 </para>
 
 
-<!-- ##### ARG NMSettingWired:zvm-subchannels ##### -->
+<!-- ##### MACRO NM_SETTINGS_CONNECTION_PERMISSION_PREFIX_GROUP ##### -->
 <para>
 
 </para>
 
 
-<!-- ##### ARG NMSettingWireless:cloned-mac-address ##### -->
+<!-- ##### MACRO NM_SETTINGS_CONNECTION_PERMISSION_PREFIX_USER ##### -->
 <para>
 
 </para>
@@ -272,7 +260,7 @@ NMSettingWimax
 </para>
 
 
-<!-- ##### MACRO NM_SETTING_IP6_CONFIG_METHOD_DHCP ##### -->
+<!-- ##### MACRO NM_SETTING_CONNECTION_PERMISSIONS ##### -->
 <para>
 
 </para>
@@ -302,24 +290,6 @@ NMSettingWimax
 </para>
 
 
-<!-- ##### MACRO NM_SETTING_WIRED_CLONED_MAC_ADDRESS ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO NM_SETTING_WIRED_S390_NETTYPE ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO NM_SETTING_WIRED_S390_OPTIONS ##### -->
-<para>
-
-</para>
-
-
 <!-- ##### MACRO NM_SETTING_WIRED_S390_PORT_NAME ##### -->
 <para>
 
@@ -338,24 +308,12 @@ NMSettingWimax
 </para>
 
 
-<!-- ##### MACRO NM_SETTING_WIRED_S390_SUBCHANNELS ##### -->
-<para>
-
-</para>
-
-
 <!-- ##### MACRO NM_SETTING_WIRED_ZVM_SUBCHANNELS ##### -->
 <para>
 
 </para>
 
 
-<!-- ##### MACRO NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS ##### -->
-<para>
-
-</para>
-
-
 <!-- ##### MACRO NM_TYPE_SETTING_BRIDGE_ERROR ##### -->
 <para>
 
@@ -506,15 +464,7 @@ NMSettingWimax
 @setting: 
 @i: 
 
-<!-- ##### FUNCTION nm_setting_wimax_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-<!-- ##### FUNCTION nm_setting_wimax_get_mac_address ##### -->
+<!-- ##### FUNCTION nm_setting_connection_get_num_permissions ##### -->
 <para>
 
 </para>
@@ -522,49 +472,33 @@ NMSettingWimax
 @setting: 
 @Returns: 
 
-<!-- ##### FUNCTION nm_setting_wimax_get_network_name ##### -->
+<!-- ##### FUNCTION nm_setting_connection_get_permission ##### -->
 <para>
 
 </para>
 
 @setting: 
+@index: 
 @Returns: 
 
-<!-- ##### FUNCTION nm_setting_wimax_get_type ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-<!-- ##### FUNCTION nm_setting_wimax_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-<!-- ##### FUNCTION nm_setting_wired_add_s390_option ##### -->
+<!-- ##### FUNCTION nm_setting_connection_get_permission_entry ##### -->
 <para>
 
 </para>
 
 @setting: 
-@key: 
-@item: 
+@index: 
 @Returns: 
 
-<!-- ##### FUNCTION nm_setting_wired_get_cloned_mac_address ##### -->
+<!-- ##### FUNCTION nm_setting_wimax_error_quark ##### -->
 <para>
 
 </para>
 
-@setting: 
+@void: 
 @Returns: 
 
-<!-- ##### FUNCTION nm_setting_wired_get_num_s390_options ##### -->
+<!-- ##### FUNCTION nm_setting_wimax_get_mac_address ##### -->
 <para>
 
 </para>
@@ -572,7 +506,7 @@ NMSettingWimax
 @setting: 
 @Returns: 
 
-<!-- ##### FUNCTION nm_setting_wired_get_s390_nettype ##### -->
+<!-- ##### FUNCTION nm_setting_wimax_get_network_name ##### -->
 <para>
 
 </para>
@@ -580,24 +514,20 @@ NMSettingWimax
 @setting: 
 @Returns: 
 
-<!-- ##### FUNCTION nm_setting_wired_get_s390_option ##### -->
+<!-- ##### FUNCTION nm_setting_wimax_get_type ##### -->
 <para>
 
 </para>
 
-@setting: 
-@idx: 
-@out_key: 
-@out_value: 
+@void: 
 @Returns: 
 
-<!-- ##### FUNCTION nm_setting_wired_get_s390_option_by_key ##### -->
+<!-- ##### FUNCTION nm_setting_wimax_new ##### -->
 <para>
 
 </para>
 
-@setting: 
-@key: 
+@void: 
 @Returns: 
 
 <!-- ##### FUNCTION nm_setting_wired_get_s390_port_name ##### -->
@@ -624,14 +554,6 @@ NMSettingWimax
 @setting: 
 @Returns: 
 
-<!-- ##### FUNCTION nm_setting_wired_get_s390_subchannels ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
 <!-- ##### FUNCTION nm_setting_wired_get_zvm_subchannels ##### -->
 <para>
 
@@ -640,56 +562,3 @@ NMSettingWimax
 @setting: 
 @Returns: 
 
-<!-- ##### FUNCTION nm_setting_wired_remove_s390_option ##### -->
-<para>
-
-</para>
-
-@setting: 
-@key: 
-@Returns: 
-
-<!-- ##### FUNCTION nm_setting_wireless_get_cloned_mac_address ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-<!-- ##### FUNCTION nm_utils_wifi_channel_to_freq ##### -->
-<para>
-
-</para>
-
-@channel: 
-@band: 
-@Returns: 
-
-<!-- ##### FUNCTION nm_utils_wifi_find_next_channel ##### -->
-<para>
-
-</para>
-
-@channel: 
-@direction: 
-@band: 
-@Returns: 
-
-<!-- ##### FUNCTION nm_utils_wifi_freq_to_channel ##### -->
-<para>
-
-</para>
-
-@freq: 
-@Returns: 
-
-<!-- ##### FUNCTION nm_utils_wifi_is_channel_valid ##### -->
-<para>
-
-</para>
-
-@channel: 
-@band: 
-@Returns: 
-
diff --git a/docs/libnm-util/tmpl/nm-setting-ip6-config.sgml b/docs/libnm-util/tmpl/nm-setting-ip6-config.sgml
index aabe6d24..cb06ed92 100644
--- a/docs/libnm-util/tmpl/nm-setting-ip6-config.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-ip6-config.sgml
@@ -137,6 +137,13 @@ NMSettingIP6Config
 
 
 
+<!-- ##### MACRO NM_SETTING_IP6_CONFIG_METHOD_DHCP ##### -->
+<para>
+
+</para>
+
+
+
 <!-- ##### MACRO NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL ##### -->
 <para>
 
diff --git a/docs/libnm-util/tmpl/nm-setting-wired.sgml b/docs/libnm-util/tmpl/nm-setting-wired.sgml
index 4ac2c691..ef5c784b 100644
--- a/docs/libnm-util/tmpl/nm-setting-wired.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-wired.sgml
@@ -94,6 +94,13 @@ NMSettingWired
 
 
 
+<!-- ##### MACRO NM_SETTING_WIRED_CLONED_MAC_ADDRESS ##### -->
+<para>
+
+</para>
+
+
+
 <!-- ##### MACRO NM_SETTING_WIRED_MTU ##### -->
 <para>
 
@@ -101,6 +108,27 @@ NMSettingWired
 
 
 
+<!-- ##### MACRO NM_SETTING_WIRED_S390_SUBCHANNELS ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO NM_SETTING_WIRED_S390_NETTYPE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO NM_SETTING_WIRED_S390_OPTIONS ##### -->
+<para>
+
+</para>
+
+
+
 <!-- ##### STRUCT NMSettingWired ##### -->
 <para>
 
@@ -112,6 +140,11 @@ NMSettingWired
 
 </para>
 
+<!-- ##### ARG NMSettingWired:cloned-mac-address ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG NMSettingWired:duplex ##### -->
 <para>
 
@@ -132,6 +165,21 @@ NMSettingWired
 
 </para>
 
+<!-- ##### ARG NMSettingWired:s390-nettype ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG NMSettingWired:s390-options ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG NMSettingWired:s390-subchannels ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG NMSettingWired:speed ##### -->
 <para>
 
@@ -211,6 +259,15 @@ NMSettingWired
 @Returns: 
 
 
+<!-- ##### FUNCTION nm_setting_wired_get_cloned_mac_address ##### -->
+<para>
+
+</para>
+
+@setting: 
+@Returns: 
+
+
 <!-- ##### FUNCTION nm_setting_wired_get_mtu ##### -->
 <para>
 
@@ -220,3 +277,73 @@ NMSettingWired
 @Returns: 
 
 
+<!-- ##### FUNCTION nm_setting_wired_get_s390_subchannels ##### -->
+<para>
+
+</para>
+
+@setting: 
+@Returns: 
+
+
+<!-- ##### FUNCTION nm_setting_wired_get_s390_nettype ##### -->
+<para>
+
+</para>
+
+@setting: 
+@Returns: 
+
+
+<!-- ##### FUNCTION nm_setting_wired_get_num_s390_options ##### -->
+<para>
+
+</para>
+
+@setting: 
+@Returns: 
+
+
+<!-- ##### FUNCTION nm_setting_wired_get_s390_option ##### -->
+<para>
+
+</para>
+
+@setting: 
+@idx: 
+@out_key: 
+@out_value: 
+@Returns: 
+
+
+<!-- ##### FUNCTION nm_setting_wired_get_s390_option_by_key ##### -->
+<para>
+
+</para>
+
+@setting: 
+@key: 
+@Returns: 
+
+
+<!-- ##### FUNCTION nm_setting_wired_add_s390_option ##### -->
+<para>
+
+</para>
+
+@setting: 
+@key: 
+@item: 
+@Returns: 
+
+
+<!-- ##### FUNCTION nm_setting_wired_remove_s390_option ##### -->
+<para>
+
+</para>
+
+@setting: 
+@key: 
+@Returns: 
+
+
diff --git a/docs/libnm-util/tmpl/nm-setting-wireless.sgml b/docs/libnm-util/tmpl/nm-setting-wireless.sgml
index d1734f16..caf738c2 100644
--- a/docs/libnm-util/tmpl/nm-setting-wireless.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-wireless.sgml
@@ -117,6 +117,13 @@ NMSettingWireless
 
 
 
+<!-- ##### MACRO NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS ##### -->
+<para>
+
+</para>
+
+
+
 <!-- ##### MACRO NM_SETTING_WIRELESS_MTU ##### -->
 <para>
 
@@ -159,6 +166,11 @@ NMSettingWireless
 
 </para>
 
+<!-- ##### ARG NMSettingWireless:cloned-mac-address ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG NMSettingWireless:mac-address ##### -->
 <para>
 
@@ -300,6 +312,15 @@ NMSettingWireless
 @Returns: 
 
 
+<!-- ##### FUNCTION nm_setting_wireless_get_cloned_mac_address ##### -->
+<para>
+
+</para>
+
+@setting: 
+@Returns: 
+
+
 <!-- ##### FUNCTION nm_setting_wireless_get_mtu ##### -->
 <para>
 
diff --git a/docs/libnm-util/tmpl/nm-utils.sgml b/docs/libnm-util/tmpl/nm-utils.sgml
index 7c7d3d5e..b8a48acf 100644
--- a/docs/libnm-util/tmpl/nm-utils.sgml
+++ b/docs/libnm-util/tmpl/nm-utils.sgml
@@ -360,3 +360,43 @@ nm-utils
 @Returns: 
 
 
+<!-- ##### FUNCTION nm_utils_wifi_freq_to_channel ##### -->
+<para>
+
+</para>
+
+@freq: 
+@Returns: 
+
+
+<!-- ##### FUNCTION nm_utils_wifi_channel_to_freq ##### -->
+<para>
+
+</para>
+
+@channel: 
+@band: 
+@Returns: 
+
+
+<!-- ##### FUNCTION nm_utils_wifi_find_next_channel ##### -->
+<para>
+
+</para>
+
+@channel: 
+@direction: 
+@band: 
+@Returns: 
+
+
+<!-- ##### FUNCTION nm_utils_wifi_is_channel_valid ##### -->
+<para>
+
+</para>
+
+@channel: 
+@band: 
+@Returns: 
+
+
-- 
cgit 1.3.0-6-gf8a5