From 867254ea7c2b193fecf8cd36cc6e5dc53c290d92 Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@debian.org>
Date: Fri, 29 Jun 2012 20:12:44 +0200
Subject: Imported Upstream version 0.9.5.95

---
 docs/libnm-util/tmpl/libnm-util-unused.sgml   | 260 --------------------------
 docs/libnm-util/tmpl/nm-connection.sgml       |   9 +
 docs/libnm-util/tmpl/nm-setting-wireless.sgml |  21 +++
 3 files changed, 30 insertions(+), 260 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 26fd8b52..e69de29b 100644
--- a/docs/libnm-util/tmpl/libnm-util-unused.sgml
+++ b/docs/libnm-util/tmpl/libnm-util-unused.sgml
@@ -1,260 +0,0 @@
-<!-- ##### SECTION ./tmpl/nm-setting-adsl.sgml:Image ##### -->
-
-
-
-<!-- ##### SECTION ./tmpl/nm-setting-adsl.sgml:Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION ./tmpl/nm-setting-adsl.sgml:See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION ./tmpl/nm-setting-adsl.sgml:Short_Description ##### -->
-
-
-
-<!-- ##### SECTION ./tmpl/nm-setting-adsl.sgml:Stability_Level ##### -->
-
-
-
-<!-- ##### SECTION ./tmpl/nm-setting-adsl.sgml:Title ##### -->
-NMSettingAdsl
-
-
-<!-- ##### STRUCT NMSettingAdsl ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG NMSettingAdsl:encapsulation ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG NMSettingAdsl:password ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG NMSettingAdsl:password-flags ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG NMSettingAdsl:protocol ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG NMSettingAdsl:username ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG NMSettingAdsl:vci ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG NMSettingAdsl:vpi ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### STRUCT NMSettingAdslClass ##### -->
-<para>
-
-</para>
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-
-<!-- ##### ENUM NMSettingAdslError ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_ADSL_ERROR_UNKNOWN: 
-@NM_SETTING_ADSL_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_ADSL_ERROR_MISSING_PROPERTY: 
-
-<!-- ##### MACRO NM_SETTING_ADSL_ENCAPSULATION ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO NM_SETTING_ADSL_ENCAPSULATION_LLC ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO NM_SETTING_ADSL_ENCAPSULATION_VCMUX ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO NM_SETTING_ADSL_ERROR ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO NM_SETTING_ADSL_PASSWORD ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO NM_SETTING_ADSL_PASSWORD_FLAGS ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO NM_SETTING_ADSL_PROTOCOL ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO NM_SETTING_ADSL_PROTOCOL_IPOATM ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO NM_SETTING_ADSL_PROTOCOL_PPPOA ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO NM_SETTING_ADSL_PROTOCOL_PPPOE ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO NM_SETTING_ADSL_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO NM_SETTING_ADSL_USERNAME ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO NM_SETTING_ADSL_VCI ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO NM_SETTING_ADSL_VPI ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_adsl ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-<!-- ##### FUNCTION nm_setting_adsl_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-<!-- ##### FUNCTION nm_setting_adsl_get_encapsulation ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-<!-- ##### FUNCTION nm_setting_adsl_get_password ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-<!-- ##### FUNCTION nm_setting_adsl_get_password_flags ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-<!-- ##### FUNCTION nm_setting_adsl_get_protocol ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-<!-- ##### FUNCTION nm_setting_adsl_get_username ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-<!-- ##### FUNCTION nm_setting_adsl_get_vci ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-<!-- ##### FUNCTION nm_setting_adsl_get_vpi ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-<!-- ##### FUNCTION nm_setting_adsl_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
diff --git a/docs/libnm-util/tmpl/nm-connection.sgml b/docs/libnm-util/tmpl/nm-connection.sgml
index 434e0d1b..59799611 100644
--- a/docs/libnm-util/tmpl/nm-connection.sgml
+++ b/docs/libnm-util/tmpl/nm-connection.sgml
@@ -210,6 +210,15 @@ NMConnection
 @Returns: 
 
 
+<!-- ##### FUNCTION nm_connection_get_setting_adsl ##### -->
+<para>
+
+</para>
+
+@connection: 
+@Returns: 
+
+
 <!-- ##### FUNCTION nm_connection_get_setting_bluetooth ##### -->
 <para>
 
diff --git a/docs/libnm-util/tmpl/nm-setting-wireless.sgml b/docs/libnm-util/tmpl/nm-setting-wireless.sgml
index 3790e252..6a34f4c5 100644
--- a/docs/libnm-util/tmpl/nm-setting-wireless.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-wireless.sgml
@@ -46,6 +46,11 @@ NMSettingWireless
 
 </para>
 
+<!-- ##### ARG NMSettingWireless:hidden ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG NMSettingWireless:mac-address ##### -->
 <para>
 
@@ -148,6 +153,13 @@ NMSettingWireless
 
 
 
+<!-- ##### MACRO NM_SETTING_WIRELESS_HIDDEN ##### -->
+<para>
+
+</para>
+
+
+
 <!-- ##### MACRO NM_SETTING_WIRELESS_MAC_ADDRESS ##### -->
 <para>
 
@@ -301,6 +313,15 @@ NMSettingWireless
 @Returns: 
 
 
+<!-- ##### FUNCTION nm_setting_wireless_get_hidden ##### -->
+<para>
+
+</para>
+
+@setting: 
+@Returns: 
+
+
 <!-- ##### FUNCTION nm_setting_wireless_get_mac_address ##### -->
 <para>
 
-- 
cgit 1.3.0-6-gf8a5