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-glib/tmpl/nm-device.sgml | 248 ++++++++++++++++++------------------
 1 file changed, 124 insertions(+), 124 deletions(-)

(limited to 'docs/libnm-glib/tmpl/nm-device.sgml')

diff --git a/docs/libnm-glib/tmpl/nm-device.sgml b/docs/libnm-glib/tmpl/nm-device.sgml
index d61ff355..7d783dc0 100644
--- a/docs/libnm-glib/tmpl/nm-device.sgml
+++ b/docs/libnm-glib/tmpl/nm-device.sgml
@@ -22,341 +22,336 @@ NMDevice
 <!-- ##### SECTION Image ##### -->
 
 
-<!-- ##### STRUCT NMDevice ##### -->
+<!-- ##### MACRO NM_DEVICE_DEVICE_TYPE ##### -->
 <para>
 
 </para>
 
 
-<!-- ##### SIGNAL NMDevice::state-changed ##### -->
+
+<!-- ##### MACRO NM_DEVICE_UDI ##### -->
 <para>
 
 </para>
 
-@nmdevice: the object which received the signal.
-@arg1: 
-@arg2: 
-@arg3: 
-
-<!-- ##### ARG NMDevice:active-connection ##### -->
-<para>
 
-</para>
 
-<!-- ##### ARG NMDevice:autoconnect ##### -->
+<!-- ##### MACRO NM_DEVICE_INTERFACE ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG NMDevice:available-connections ##### -->
-<para>
 
-</para>
 
-<!-- ##### ARG NMDevice:capabilities ##### -->
+<!-- ##### MACRO NM_DEVICE_IP_INTERFACE ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG NMDevice:device-type ##### -->
-<para>
 
-</para>
 
-<!-- ##### ARG NMDevice:dhcp4-config ##### -->
+<!-- ##### MACRO NM_DEVICE_DRIVER ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG NMDevice:dhcp6-config ##### -->
-<para>
 
-</para>
 
-<!-- ##### ARG NMDevice:driver ##### -->
+<!-- ##### MACRO NM_DEVICE_DRIVER_VERSION ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG NMDevice:driver-version ##### -->
-<para>
 
-</para>
 
-<!-- ##### ARG NMDevice:firmware-missing ##### -->
+<!-- ##### MACRO NM_DEVICE_FIRMWARE_VERSION ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG NMDevice:firmware-version ##### -->
-<para>
 
-</para>
 
-<!-- ##### ARG NMDevice:interface ##### -->
+<!-- ##### MACRO NM_DEVICE_CAPABILITIES ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG NMDevice:ip-interface ##### -->
-<para>
 
-</para>
 
-<!-- ##### ARG NMDevice:ip4-config ##### -->
+<!-- ##### MACRO NM_DEVICE_MANAGED ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG NMDevice:ip6-config ##### -->
-<para>
 
-</para>
 
-<!-- ##### ARG NMDevice:managed ##### -->
+<!-- ##### MACRO NM_DEVICE_AUTOCONNECT ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG NMDevice:product ##### -->
-<para>
 
-</para>
 
-<!-- ##### ARG NMDevice:state ##### -->
+<!-- ##### MACRO NM_DEVICE_FIRMWARE_MISSING ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG NMDevice:state-reason ##### -->
-<para>
 
-</para>
 
-<!-- ##### ARG NMDevice:udi ##### -->
+<!-- ##### MACRO NM_DEVICE_IP4_CONFIG ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG NMDevice:vendor ##### -->
-<para>
 
-</para>
 
-<!-- ##### STRUCT NMDeviceClass ##### -->
+<!-- ##### MACRO NM_DEVICE_DHCP4_CONFIG ##### -->
 <para>
 
 </para>
 
-@parent: 
-@state_changed: 
-@connection_compatible: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
 
-<!-- ##### USER_FUNCTION NMDeviceDeactivateFn ##### -->
+
+<!-- ##### MACRO NM_DEVICE_IP6_CONFIG ##### -->
 <para>
 
 </para>
 
-@device: 
-@error: 
-@user_data: 
 
 
-<!-- ##### MACRO NM_DEVICE_ACTIVE_CONNECTION ##### -->
+<!-- ##### MACRO NM_DEVICE_DHCP6_CONFIG ##### -->
 <para>
 
 </para>
 
 
 
-<!-- ##### MACRO NM_DEVICE_AUTOCONNECT ##### -->
+<!-- ##### MACRO NM_DEVICE_STATE ##### -->
 <para>
 
 </para>
 
 
 
-<!-- ##### MACRO NM_DEVICE_AVAILABLE_CONNECTIONS ##### -->
+<!-- ##### MACRO NM_DEVICE_STATE_REASON ##### -->
 <para>
 
 </para>
 
 
 
-<!-- ##### MACRO NM_DEVICE_CAPABILITIES ##### -->
+<!-- ##### MACRO NM_DEVICE_ACTIVE_CONNECTION ##### -->
 <para>
 
 </para>
 
 
 
-<!-- ##### MACRO NM_DEVICE_DEVICE_TYPE ##### -->
+<!-- ##### MACRO NM_DEVICE_AVAILABLE_CONNECTIONS ##### -->
 <para>
 
 </para>
 
 
 
-<!-- ##### MACRO NM_DEVICE_DHCP4_CONFIG ##### -->
+<!-- ##### MACRO NM_DEVICE_VENDOR ##### -->
 <para>
 
 </para>
 
 
 
-<!-- ##### MACRO NM_DEVICE_DHCP6_CONFIG ##### -->
+<!-- ##### MACRO NM_DEVICE_PRODUCT ##### -->
 <para>
 
 </para>
 
 
 
-<!-- ##### MACRO NM_DEVICE_DRIVER ##### -->
+<!-- ##### STRUCT NMDevice ##### -->
 <para>
 
 </para>
 
 
-
-<!-- ##### MACRO NM_DEVICE_DRIVER_VERSION ##### -->
+<!-- ##### SIGNAL NMDevice::state-changed ##### -->
 <para>
 
 </para>
 
+@nmdevice: the object which received the signal.
+@arg1: 
+@arg2: 
+@arg3: 
 
-
-<!-- ##### MACRO NM_DEVICE_FIRMWARE_MISSING ##### -->
+<!-- ##### ARG NMDevice:active-connection ##### -->
 <para>
 
 </para>
 
+<!-- ##### ARG NMDevice:autoconnect ##### -->
+<para>
 
+</para>
 
-<!-- ##### MACRO NM_DEVICE_FIRMWARE_VERSION ##### -->
+<!-- ##### ARG NMDevice:available-connections ##### -->
 <para>
 
 </para>
 
+<!-- ##### ARG NMDevice:capabilities ##### -->
+<para>
 
+</para>
 
-<!-- ##### MACRO NM_DEVICE_INTERFACE ##### -->
+<!-- ##### ARG NMDevice:device-type ##### -->
 <para>
 
 </para>
 
+<!-- ##### ARG NMDevice:dhcp4-config ##### -->
+<para>
 
+</para>
 
-<!-- ##### MACRO NM_DEVICE_IP4_CONFIG ##### -->
+<!-- ##### ARG NMDevice:dhcp6-config ##### -->
 <para>
 
 </para>
 
+<!-- ##### ARG NMDevice:driver ##### -->
+<para>
 
+</para>
 
-<!-- ##### MACRO NM_DEVICE_IP6_CONFIG ##### -->
+<!-- ##### ARG NMDevice:driver-version ##### -->
 <para>
 
 </para>
 
+<!-- ##### ARG NMDevice:firmware-missing ##### -->
+<para>
 
+</para>
 
-<!-- ##### MACRO NM_DEVICE_IP_INTERFACE ##### -->
+<!-- ##### ARG NMDevice:firmware-version ##### -->
 <para>
 
 </para>
 
+<!-- ##### ARG NMDevice:interface ##### -->
+<para>
 
+</para>
 
-<!-- ##### MACRO NM_DEVICE_MANAGED ##### -->
+<!-- ##### ARG NMDevice:ip-interface ##### -->
 <para>
 
 </para>
 
+<!-- ##### ARG NMDevice:ip4-config ##### -->
+<para>
 
+</para>
 
-<!-- ##### MACRO NM_DEVICE_PRODUCT ##### -->
+<!-- ##### ARG NMDevice:ip6-config ##### -->
 <para>
 
 </para>
 
+<!-- ##### ARG NMDevice:managed ##### -->
+<para>
 
+</para>
 
-<!-- ##### MACRO NM_DEVICE_STATE ##### -->
+<!-- ##### ARG NMDevice:product ##### -->
 <para>
 
 </para>
 
+<!-- ##### ARG NMDevice:state ##### -->
+<para>
 
+</para>
 
-<!-- ##### MACRO NM_DEVICE_STATE_REASON ##### -->
+<!-- ##### ARG NMDevice:state-reason ##### -->
 <para>
 
 </para>
 
+<!-- ##### ARG NMDevice:udi ##### -->
+<para>
 
+</para>
 
-<!-- ##### MACRO NM_DEVICE_UDI ##### -->
+<!-- ##### ARG NMDevice:vendor ##### -->
 <para>
 
 </para>
 
+<!-- ##### STRUCT NMDeviceClass ##### -->
+<para>
 
+</para>
 
-<!-- ##### MACRO NM_DEVICE_VENDOR ##### -->
+@parent: 
+@state_changed: 
+@connection_compatible: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+@_reserved5: 
+@_reserved6: 
+
+<!-- ##### FUNCTION nm_device_new ##### -->
 <para>
 
 </para>
 
+@connection: 
+@path: 
+@Returns: 
 
 
-<!-- ##### FUNCTION nm_device_connection_compatible ##### -->
+<!-- ##### FUNCTION nm_device_get_iface ##### -->
 <para>
 
 </para>
 
 @device: 
-@connection: 
-@error: 
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_device_connection_valid ##### -->
+<!-- ##### FUNCTION nm_device_get_ip_iface ##### -->
 <para>
 
 </para>
 
 @device: 
-@connection: 
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_device_disconnect ##### -->
+<!-- ##### FUNCTION nm_device_get_device_type ##### -->
 <para>
 
 </para>
 
 @device: 
-@callback: 
-@user_data: 
+@Returns: 
 
 
-<!-- ##### FUNCTION nm_device_filter_connections ##### -->
+<!-- ##### FUNCTION nm_device_get_udi ##### -->
 <para>
 
 </para>
 
 @device: 
-@connections: 
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_device_get_active_connection ##### -->
+<!-- ##### FUNCTION nm_device_get_driver ##### -->
 <para>
 
 </para>
@@ -365,7 +360,7 @@ NMDevice
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_device_get_autoconnect ##### -->
+<!-- ##### FUNCTION nm_device_get_driver_version ##### -->
 <para>
 
 </para>
@@ -374,7 +369,7 @@ NMDevice
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_device_get_available_connections ##### -->
+<!-- ##### FUNCTION nm_device_get_firmware_version ##### -->
 <para>
 
 </para>
@@ -392,7 +387,7 @@ NMDevice
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_device_get_device_type ##### -->
+<!-- ##### FUNCTION nm_device_get_managed ##### -->
 <para>
 
 </para>
@@ -401,7 +396,7 @@ NMDevice
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_device_get_dhcp4_config ##### -->
+<!-- ##### FUNCTION nm_device_get_autoconnect ##### -->
 <para>
 
 </para>
@@ -410,16 +405,16 @@ NMDevice
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_device_get_dhcp6_config ##### -->
+<!-- ##### FUNCTION nm_device_set_autoconnect ##### -->
 <para>
 
 </para>
 
 @device: 
-@Returns: 
+@autoconnect: 
 
 
-<!-- ##### FUNCTION nm_device_get_driver ##### -->
+<!-- ##### FUNCTION nm_device_get_firmware_missing ##### -->
 <para>
 
 </para>
@@ -428,7 +423,7 @@ NMDevice
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_device_get_driver_version ##### -->
+<!-- ##### FUNCTION nm_device_get_ip4_config ##### -->
 <para>
 
 </para>
@@ -437,7 +432,7 @@ NMDevice
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_device_get_firmware_missing ##### -->
+<!-- ##### FUNCTION nm_device_get_dhcp4_config ##### -->
 <para>
 
 </para>
@@ -446,7 +441,7 @@ NMDevice
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_device_get_firmware_version ##### -->
+<!-- ##### FUNCTION nm_device_get_ip6_config ##### -->
 <para>
 
 </para>
@@ -455,7 +450,7 @@ NMDevice
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_device_get_iface ##### -->
+<!-- ##### FUNCTION nm_device_get_dhcp6_config ##### -->
 <para>
 
 </para>
@@ -464,7 +459,7 @@ NMDevice
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_device_get_ip4_config ##### -->
+<!-- ##### FUNCTION nm_device_get_state ##### -->
 <para>
 
 </para>
@@ -473,16 +468,17 @@ NMDevice
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_device_get_ip6_config ##### -->
+<!-- ##### FUNCTION nm_device_get_state_reason ##### -->
 <para>
 
 </para>
 
 @device: 
+@reason: 
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_device_get_ip_iface ##### -->
+<!-- ##### FUNCTION nm_device_get_active_connection ##### -->
 <para>
 
 </para>
@@ -491,7 +487,7 @@ NMDevice
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_device_get_managed ##### -->
+<!-- ##### FUNCTION nm_device_get_available_connections ##### -->
 <para>
 
 </para>
@@ -509,7 +505,7 @@ NMDevice
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_device_get_state ##### -->
+<!-- ##### FUNCTION nm_device_get_vendor ##### -->
 <para>
 
 </para>
@@ -518,50 +514,54 @@ NMDevice
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_device_get_state_reason ##### -->
+<!-- ##### USER_FUNCTION NMDeviceDeactivateFn ##### -->
 <para>
 
 </para>
 
 @device: 
-@reason: 
-@Returns: 
+@error: 
+@user_data: 
 
 
-<!-- ##### FUNCTION nm_device_get_udi ##### -->
+<!-- ##### FUNCTION nm_device_disconnect ##### -->
 <para>
 
 </para>
 
 @device: 
-@Returns: 
+@callback: 
+@user_data: 
 
 
-<!-- ##### FUNCTION nm_device_get_vendor ##### -->
+<!-- ##### FUNCTION nm_device_filter_connections ##### -->
 <para>
 
 </para>
 
 @device: 
+@connections: 
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_device_new ##### -->
+<!-- ##### FUNCTION nm_device_connection_valid ##### -->
 <para>
 
 </para>
 
+@device: 
 @connection: 
-@path: 
 @Returns: 
 
 
-<!-- ##### FUNCTION nm_device_set_autoconnect ##### -->
+<!-- ##### FUNCTION nm_device_connection_compatible ##### -->
 <para>
 
 </para>
 
 @device: 
-@autoconnect: 
+@connection: 
+@error: 
+@Returns: 
 
 
-- 
cgit 1.3.0-6-gf8a5