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

---
 docs/libnm-util/tmpl/nm-setting-bridge.sgml | 100 ++++++++++++++--------------
 1 file changed, 50 insertions(+), 50 deletions(-)

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

diff --git a/docs/libnm-util/tmpl/nm-setting-bridge.sgml b/docs/libnm-util/tmpl/nm-setting-bridge.sgml
index 7e2cb5a4..bf9593e5 100644
--- a/docs/libnm-util/tmpl/nm-setting-bridge.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-bridge.sgml
@@ -22,149 +22,149 @@ NMSettingBridge
 <!-- ##### SECTION Image ##### -->
 
 
-<!-- ##### STRUCT NMSettingBridge ##### -->
+<!-- ##### MACRO NM_SETTING_BRIDGE_SETTING_NAME ##### -->
 <para>
 
 </para>
 
 
-<!-- ##### ARG NMSettingBridge:ageing-time ##### -->
+
+<!-- ##### ENUM NMSettingBridgeError ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG NMSettingBridge:forward-delay ##### -->
+@NM_SETTING_BRIDGE_ERROR_UNKNOWN: 
+@NM_SETTING_BRIDGE_ERROR_INVALID_PROPERTY: 
+@NM_SETTING_BRIDGE_ERROR_MISSING_PROPERTY: 
+
+<!-- ##### MACRO NM_SETTING_BRIDGE_ERROR ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG NMSettingBridge:hello-time ##### -->
-<para>
 
-</para>
 
-<!-- ##### ARG NMSettingBridge:interface-name ##### -->
+<!-- ##### FUNCTION nm_setting_bridge_error_quark ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG NMSettingBridge:max-age ##### -->
-<para>
+@void: 
+@Returns: 
 
-</para>
 
-<!-- ##### ARG NMSettingBridge:priority ##### -->
+<!-- ##### MACRO NM_SETTING_BRIDGE_INTERFACE_NAME ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG NMSettingBridge:stp ##### -->
-<para>
 
-</para>
 
-<!-- ##### STRUCT NMSettingBridgeClass ##### -->
+<!-- ##### MACRO NM_SETTING_BRIDGE_STP ##### -->
 <para>
 
 </para>
 
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
 
-<!-- ##### ENUM NMSettingBridgeError ##### -->
+
+<!-- ##### MACRO NM_SETTING_BRIDGE_PRIORITY ##### -->
 <para>
 
 </para>
 
-@NM_SETTING_BRIDGE_ERROR_UNKNOWN: 
-@NM_SETTING_BRIDGE_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_BRIDGE_ERROR_MISSING_PROPERTY: 
 
-<!-- ##### MACRO NM_SETTING_BRIDGE_AGEING_TIME ##### -->
+
+<!-- ##### MACRO NM_SETTING_BRIDGE_FORWARD_DELAY ##### -->
 <para>
 
 </para>
 
 
 
-<!-- ##### MACRO NM_SETTING_BRIDGE_ERROR ##### -->
+<!-- ##### MACRO NM_SETTING_BRIDGE_HELLO_TIME ##### -->
 <para>
 
 </para>
 
 
 
-<!-- ##### MACRO NM_SETTING_BRIDGE_FORWARD_DELAY ##### -->
+<!-- ##### MACRO NM_SETTING_BRIDGE_MAX_AGE ##### -->
 <para>
 
 </para>
 
 
 
-<!-- ##### MACRO NM_SETTING_BRIDGE_HELLO_TIME ##### -->
+<!-- ##### MACRO NM_SETTING_BRIDGE_AGEING_TIME ##### -->
 <para>
 
 </para>
 
 
 
-<!-- ##### MACRO NM_SETTING_BRIDGE_INTERFACE_NAME ##### -->
+<!-- ##### STRUCT NMSettingBridge ##### -->
 <para>
 
 </para>
 
 
-
-<!-- ##### MACRO NM_SETTING_BRIDGE_MAX_AGE ##### -->
+<!-- ##### ARG NMSettingBridge:ageing-time ##### -->
 <para>
 
 </para>
 
-
-
-<!-- ##### MACRO NM_SETTING_BRIDGE_PRIORITY ##### -->
+<!-- ##### ARG NMSettingBridge:forward-delay ##### -->
 <para>
 
 </para>
 
+<!-- ##### ARG NMSettingBridge:hello-time ##### -->
+<para>
 
+</para>
 
-<!-- ##### MACRO NM_SETTING_BRIDGE_SETTING_NAME ##### -->
+<!-- ##### ARG NMSettingBridge:interface-name ##### -->
 <para>
 
 </para>
 
+<!-- ##### ARG NMSettingBridge:max-age ##### -->
+<para>
 
+</para>
 
-<!-- ##### MACRO NM_SETTING_BRIDGE_STP ##### -->
+<!-- ##### ARG NMSettingBridge:priority ##### -->
 <para>
 
 </para>
 
+<!-- ##### ARG NMSettingBridge:stp ##### -->
+<para>
 
+</para>
 
-<!-- ##### FUNCTION nm_setting_bridge_error_quark ##### -->
+<!-- ##### STRUCT NMSettingBridgeClass ##### -->
 <para>
 
 </para>
 
-@void: 
-@Returns: 
-
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
 
-<!-- ##### FUNCTION nm_setting_bridge_get_ageing_time ##### -->
+<!-- ##### FUNCTION nm_setting_bridge_new ##### -->
 <para>
 
 </para>
 
-@setting: 
+@void: 
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_setting_bridge_get_forward_delay ##### -->
+<!-- ##### FUNCTION nm_setting_bridge_get_interface_name ##### -->
 <para>
 
 </para>
@@ -173,7 +173,7 @@ NMSettingBridge
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_setting_bridge_get_hello_time ##### -->
+<!-- ##### FUNCTION nm_setting_bridge_get_stp ##### -->
 <para>
 
 </para>
@@ -182,7 +182,7 @@ NMSettingBridge
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_setting_bridge_get_interface_name ##### -->
+<!-- ##### FUNCTION nm_setting_bridge_get_priority ##### -->
 <para>
 
 </para>
@@ -191,7 +191,7 @@ NMSettingBridge
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_setting_bridge_get_max_age ##### -->
+<!-- ##### FUNCTION nm_setting_bridge_get_forward_delay ##### -->
 <para>
 
 </para>
@@ -200,7 +200,7 @@ NMSettingBridge
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_setting_bridge_get_priority ##### -->
+<!-- ##### FUNCTION nm_setting_bridge_get_hello_time ##### -->
 <para>
 
 </para>
@@ -209,7 +209,7 @@ NMSettingBridge
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_setting_bridge_get_stp ##### -->
+<!-- ##### FUNCTION nm_setting_bridge_get_max_age ##### -->
 <para>
 
 </para>
@@ -218,12 +218,12 @@ NMSettingBridge
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_setting_bridge_new ##### -->
+<!-- ##### FUNCTION nm_setting_bridge_get_ageing_time ##### -->
 <para>
 
 </para>
 
-@void: 
+@setting: 
 @Returns: 
 
 
-- 
cgit 1.3.0-6-gf8a5