From 8c98b34228abb4dfde822ad89106b4d8b2287639 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 7 Aug 2012 22:16:03 +0200 Subject: Imported Upstream version 0.9.6.0 --- docs/libnm-glib/Makefile.am | 5 +- docs/libnm-glib/Makefile.in | 16 +- docs/libnm-glib/html/NMClient.html | 112 ++++++++++ docs/libnm-glib/html/NMDevice.html | 5 +- docs/libnm-glib/html/NMDeviceAdsl.html | 237 +++++++++++++++++++++ docs/libnm-glib/html/NMDeviceBond.html | 4 +- docs/libnm-glib/html/NMDeviceWimax.html | 4 +- docs/libnm-glib/html/NMSecretAgent.html | 44 +++- docs/libnm-glib/html/api-index-full.html | 40 ++-- docs/libnm-glib/html/ch02.html | 5 +- docs/libnm-glib/html/index.html | 29 +-- docs/libnm-glib/html/index.sgml | 64 +++++- docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html | 61 ++++++ .../html/libnm-glib-NMVpnPluginUiWidget.html | 104 +++++---- docs/libnm-glib/html/libnm-glib.devhelp2 | 59 ++++- docs/libnm-glib/html/object-tree.html | 1 + docs/libnm-glib/libnm-glib-docs.xml | 33 +-- docs/libnm-glib/libnm-glib-sections.txt | 7 +- docs/libnm-glib/libnm-glib.types | 2 + docs/libnm-glib/tmpl/nm-device-adsl.sgml | 6 +- .../tmpl/nm-vpn-plugin-ui-interface.sgml | 39 +--- docs/libnm-glib/version.xml | 1 + docs/libnm-glib/version.xml.in | 1 + 23 files changed, 710 insertions(+), 169 deletions(-) create mode 100644 docs/libnm-glib/html/NMDeviceAdsl.html create mode 100644 docs/libnm-glib/version.xml create mode 100644 docs/libnm-glib/version.xml.in (limited to 'docs/libnm-glib') diff --git a/docs/libnm-glib/Makefile.am b/docs/libnm-glib/Makefile.am index cd96c046..a2a7d776 100644 --- a/docs/libnm-glib/Makefile.am +++ b/docs/libnm-glib/Makefile.am @@ -61,7 +61,7 @@ IGNORE_HFILES= \ HTML_IMAGES = libnm-glib.png # Extra XML files that are included by $(DOC_MAIN_SGML_FILE). -content_files = +content_files = version.xml # Other files to distribute. extra_files = libnm-glib.png @@ -72,7 +72,6 @@ extra_files = libnm-glib.png GTKDOC_CFLAGS = \ -I$(top_srcdir)/include \ -I$(top_srcdir)/libnm-util \ - -I$(top_builddir)/marshallers \ -I$(top_srcdir)/libnm-glib \ $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) @@ -85,6 +84,8 @@ GTKDOC_LIBS = \ # include common portion ... include $(top_srcdir)/gtk-doc.make +EXTRA_DIST += version.xml.in + CLEANFILES += \ libnm-glib-sections.txt \ html/* \ diff --git a/docs/libnm-glib/Makefile.in b/docs/libnm-glib/Makefile.in index 594126e3..066e42e5 100644 --- a/docs/libnm-glib/Makefile.in +++ b/docs/libnm-glib/Makefile.in @@ -40,7 +40,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/gtk-doc.make + $(srcdir)/version.xml.in $(top_srcdir)/gtk-doc.make subdir = docs/libnm-glib ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ @@ -58,7 +58,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = +CONFIG_CLEAN_FILES = version.xml CONFIG_CLEAN_VPATH_FILES = AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) @@ -366,7 +366,7 @@ IGNORE_HFILES = \ HTML_IMAGES = libnm-glib.png # Extra XML files that are included by $(DOC_MAIN_SGML_FILE). -content_files = +content_files = version.xml # Other files to distribute. extra_files = libnm-glib.png @@ -376,7 +376,6 @@ extra_files = libnm-glib.png GTKDOC_CFLAGS = \ -I$(top_srcdir)/include \ -I$(top_srcdir)/libnm-util \ - -I$(top_builddir)/marshallers \ -I$(top_srcdir)/libnm-glib \ $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) @@ -405,10 +404,9 @@ SETUP_FILES = \ $(DOC_MODULE)-sections.txt \ $(DOC_MODULE)-overrides.txt -EXTRA_DIST = \ - $(HTML_IMAGES) \ - $(SETUP_FILES) +# include common portion ... +EXTRA_DIST = $(HTML_IMAGES) $(SETUP_FILES) version.xml.in DOC_STAMPS = setup-build.stamp scan-build.stamp tmpl-build.stamp sgml-build.stamp \ html-build.stamp pdf-build.stamp \ tmpl.stamp sgml.stamp html.stamp pdf.stamp @@ -425,8 +423,6 @@ REPORT_FILES = \ $(DOC_MODULE)-undeclared.txt \ $(DOC_MODULE)-unused.txt - -# include common portion ... CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) \ libnm-glib-sections.txt html/* tmpl/* xml/* @ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_FALSE@HTML_BUILD_STAMP = @@ -467,6 +463,8 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): +version.xml: $(top_builddir)/config.status $(srcdir)/version.xml.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ mostlyclean-libtool: -rm -f *.lo diff --git a/docs/libnm-glib/html/NMClient.html b/docs/libnm-glib/html/NMClient.html index f15a7839..3e02012b 100644 --- a/docs/libnm-glib/html/NMClient.html +++ b/docs/libnm-glib/html/NMClient.html @@ -241,7 +241,90 @@ NMClient implements } NMClientPermission;

+NMClientPermission values indicate various permissions that NetworkManager +clients can obtain to perform certain tasks on behalf of the current user.

+
++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

NM_CLIENT_PERMISSION_NONE

unknown or no permission +

NM_CLIENT_PERMISSION_ENABLE_DISABLE_NETWORK

controls whether networking + can be globally enabled or disabled +

NM_CLIENT_PERMISSION_ENABLE_DISABLE_WIFI

controls whether WiFi can be + globally enabled or disabled +

NM_CLIENT_PERMISSION_ENABLE_DISABLE_WWAN

controls whether WWAN (3G) can be + globally enabled or disabled +

NM_CLIENT_PERMISSION_ENABLE_DISABLE_WIMAX

controls whether WiMAX can be + globally enabled or disabled +

NM_CLIENT_PERMISSION_SLEEP_WAKE

controls whether the client can ask + NetworkManager to sleep and wake +

NM_CLIENT_PERMISSION_NETWORK_CONTROL

controls whether networking connections + can be started, stopped, and changed +

NM_CLIENT_PERMISSION_WIFI_SHARE_PROTECTED

controls whether a password + protected WiFi hotspot can be created +

NM_CLIENT_PERMISSION_WIFI_SHARE_OPEN

controls whether an open WiFi hotspot + can be created +

NM_CLIENT_PERMISSION_SETTINGS_MODIFY_SYSTEM

controls whether connections + that are available to all users can be modified +

NM_CLIENT_PERMISSION_SETTINGS_MODIFY_OWN

controls whether connections + owned by the current user can be modified +

NM_CLIENT_PERMISSION_SETTINGS_MODIFY_HOSTNAME

controls whether the + persistent hostname can be changed +

NM_CLIENT_PERMISSION_LAST

a reserved boundary value +
@@ -254,7 +337,36 @@ NMClient implements } NMClientPermissionResult;

+NMClientPermissionResult values indicate what authorizations and permissions +the user requires to obtain a given NMClientPermission

+
++ + + + + + + + + + + + + + + + + + +

NM_CLIENT_PERMISSION_RESULT_UNKNOWN

unknown or no authorization +

NM_CLIENT_PERMISSION_RESULT_YES

the permission is available +

NM_CLIENT_PERMISSION_RESULT_AUTH

authorization is necessary before the + permission is available +

NM_CLIENT_PERMISSION_RESULT_NO

permission to perform the operation is + denied by system policy +
diff --git a/docs/libnm-glib/html/NMDevice.html b/docs/libnm-glib/html/NMDevice.html index 7602b851..fd8061ce 100644 --- a/docs/libnm-glib/html/NMDevice.html +++ b/docs/libnm-glib/html/NMDevice.html @@ -119,6 +119,7 @@ const char * NMDeviceBt +----NMDeviceWimax +----NMDeviceOlpcMesh + +----NMDeviceAdsl +----NMDeviceInfiniband +----NMDeviceBond +----NMDeviceVlan @@ -632,7 +633,7 @@ Gets the current

Returns :

-the NMDHCPConfig or NULL if the device is not activated or not +the NMDHCP4Config or NULL if the device is not activated or not using DHCP. [transfer none] @@ -656,7 +657,7 @@ Gets the current

Returns :

-the NMDHCPConfig or NULL if the device is not activated or not +the NMDHCP6Config or NULL if the device is not activated or not using DHCP. [transfer none] diff --git a/docs/libnm-glib/html/NMDeviceAdsl.html b/docs/libnm-glib/html/NMDeviceAdsl.html new file mode 100644 index 00000000..3dae6d21 --- /dev/null +++ b/docs/libnm-glib/html/NMDeviceAdsl.html @@ -0,0 +1,237 @@ + + + + +NMDeviceAdsl + + + + + + + + + + + + + + + + + + + +
+
+
+ + +
+

NMDeviceAdsl

+

NMDeviceAdsl

+
+
+

Synopsis

+
                    NMDeviceAdsl;
+                    NMDeviceAdslClass;
+enum                NMDeviceAdslError;
+#define             NM_DEVICE_ADSL_CARRIER
+#define             NM_DEVICE_ADSL_ERROR
+GQuark              nm_device_adsl_error_quark          (void);
+gboolean            nm_device_adsl_get_carrier          (NMDeviceAdsl *device);
+GObject *           nm_device_adsl_new                  (DBusGConnection *connection,
+                                                         const char *path);
+
+
+
+

Object Hierarchy

+
+  GObject
+   +----NMObject
+         +----NMDevice
+               +----NMDeviceAdsl
+
+
+
+

Implemented Interfaces

+

+NMDeviceAdsl implements + GInitable and GAsyncInitable.

+
+
+

Properties

+
+  "carrier"                  gboolean              : Read
+
+
+
+

Description

+

+

+
+
+

Details

+
+

NMDeviceAdsl

+
typedef struct _NMDeviceAdsl NMDeviceAdsl;
+

+

+
+
+
+

NMDeviceAdslClass

+
typedef struct {
+	NMDeviceClass parent;
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+	void (*_reserved5) (void);
+	void (*_reserved6) (void);
+} NMDeviceAdslClass;
+
+

+

+
+
+
+

enum NMDeviceAdslError

+
typedef enum {
+	NM_DEVICE_ADSL_ERROR_UNKNOWN = 0,             /*< nick=UnknownError >*/
+	NM_DEVICE_ADSL_ERROR_NOT_ADSL_CONNECTION,     /*< nick=NotAdslConnection >*/
+	NM_DEVICE_ADSL_ERROR_INVALID_ADSL_CONNECTION, /*< nick=InvalidAdslConnection >*/
+} NMDeviceAdslError;
+
+
++ + + + + + + + + + + + + + +

NM_DEVICE_ADSL_ERROR_UNKNOWN

unknown or unclassified error +

NM_DEVICE_ADSL_ERROR_NOT_ADSL_CONNECTION

the connection was not of ADSL type +

NM_DEVICE_ADSL_ERROR_INVALID_ADSL_CONNECTION

the ADSL connection was invalid +
+
+
+
+

NM_DEVICE_ADSL_CARRIER

+
#define NM_DEVICE_ADSL_CARRIER "carrier"
+
+

+

+
+
+
+

NM_DEVICE_ADSL_ERROR

+
#define NM_DEVICE_ADSL_ERROR nm_device_adsl_error_quark ()
+
+

+

+
+
+
+

nm_device_adsl_error_quark ()

+
GQuark              nm_device_adsl_error_quark          (void);
+

+Registers an error quark for NMDeviceAdsl if necessary. +

+
++ + + + +

Returns :

the error quark used for NMDeviceAdsl errors.
+
+
+
+

nm_device_adsl_get_carrier ()

+
gboolean            nm_device_adsl_get_carrier          (NMDeviceAdsl *device);
+

+Whether the device has carrier. +

+
++ + + + + + + + + + +

device :

a NMDeviceAdsl +

Returns :

 +TRUE if the device has carrier
+
+
+
+

nm_device_adsl_new ()

+
GObject *           nm_device_adsl_new                  (DBusGConnection *connection,
+                                                         const char *path);
+

+Creates a new NMDeviceAdsl. +

+
++ + + + + + + + + + + + + + +

connection :

the DBusGConnection +

path :

the DBus object path of the device

Returns :

a new device
+
+
+
+

Property Details

+
+

The "carrier" property

+
  "carrier"                  gboolean              : Read
+

+Whether the device has carrier. +

+

Default value: FALSE

+
+
+
+
+
+ Generated by GTK-Doc V1.18
+ + \ No newline at end of file diff --git a/docs/libnm-glib/html/NMDeviceBond.html b/docs/libnm-glib/html/NMDeviceBond.html index 0fb8a415..1cdc8e2a 100644 --- a/docs/libnm-glib/html/NMDeviceBond.html +++ b/docs/libnm-glib/html/NMDeviceBond.html @@ -6,7 +6,7 @@ - + @@ -14,7 +14,7 @@ - + diff --git a/docs/libnm-glib/html/NMDeviceWimax.html b/docs/libnm-glib/html/NMDeviceWimax.html index 598f77b5..e36f9d08 100644 --- a/docs/libnm-glib/html/NMDeviceWimax.html +++ b/docs/libnm-glib/html/NMDeviceWimax.html @@ -7,7 +7,7 @@ - + @@ -18,7 +18,7 @@ - +

Synopsis

-
NMVpnPluginUiInterface * (*NMVpnPluginUiFactory)        (GError **error);
+
enum                NMVpnPluginUiCapability;
+NMVpnPluginUiInterface * (*NMVpnPluginUiFactory)        (GError **error);
 struct              NMVpnPluginUiInterface;
 enum                NMVpnPluginUiInterfaceProp;
 struct              NMVpnPluginUiWidgetInterface;
-#define             NM_VPN_PLUGIN_UI_CAPABILITY_EXPORT
-#define             NM_VPN_PLUGIN_UI_CAPABILITY_IMPORT
-#define             NM_VPN_PLUGIN_UI_CAPABILITY_IPV6
-#define             NM_VPN_PLUGIN_UI_CAPABILITY_NONE
 #define             NM_VPN_PLUGIN_UI_INTERFACE_DESC
 #define             NM_VPN_PLUGIN_UI_INTERFACE_NAME
 #define             NM_VPN_PLUGIN_UI_INTERFACE_SERVICE
@@ -89,6 +86,45 @@ struct              
 
Details

 

+
enum NMVpnPluginUiCapability

+
typedef enum {
+	NM_VPN_PLUGIN_UI_CAPABILITY_NONE   = 0x00,
+	NM_VPN_PLUGIN_UI_CAPABILITY_IMPORT = 0x01,
+	NM_VPN_PLUGIN_UI_CAPABILITY_EXPORT = 0x02,
+	NM_VPN_PLUGIN_UI_CAPABILITY_IPV6   = 0x04
+} NMVpnPluginUiCapability;
+

+

+Flags that indicate to UI programs certain capabilities of the plugin.
+

+

++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+


NM_VPN_PLUGIN_UI_CAPABILITY_NONE
unknown or no capability
+
NM_VPN_PLUGIN_UI_CAPABILITY_IMPORT
the plugin can import new connections
+
NM_VPN_PLUGIN_UI_CAPABILITY_EXPORT
the plugin can export connections
+
NM_VPN_PLUGIN_UI_CAPABILITY_IPV6
the plugin supports IPv6 addressing
+

+

+

+

 
NMVpnPluginUiFactory ()

 
NMVpnPluginUiInterface * (*NMVpnPluginUiFactory)        (GError **error);

 

@@ -157,15 +193,37 @@ struct              
 
enum NMVpnPluginUiInterfaceProp

 
typedef enum {
-	NM_VPN_PLUGIN_UI_INTERFACE_PROP_FIRST = 0x1000,
-
 	NM_VPN_PLUGIN_UI_INTERFACE_PROP_NAME = NM_VPN_PLUGIN_UI_INTERFACE_PROP_FIRST,
 	NM_VPN_PLUGIN_UI_INTERFACE_PROP_DESC,
 	NM_VPN_PLUGIN_UI_INTERFACE_PROP_SERVICE
 } NMVpnPluginUiInterfaceProp;
 

 

+GObject property numbers that plugins should override to provide certain
+information to UI programs.
 

+

++
+
+
+
+
+
+
+
+
+
+
+
+
+
+


NM_VPN_PLUGIN_UI_INTERFACE_PROP_NAME
the VPN plugin's name
+
NM_VPN_PLUGIN_UI_INTERFACE_PROP_DESC
description of the VPN plugin and what
+VPN services it supports
+
NM_VPN_PLUGIN_UI_INTERFACE_PROP_SERVICE
the D-Bus service name used by the
+plugin's VPN service daemon
+

 

 

 

@@ -202,38 +260,6 @@ struct              
-
NM_VPN_PLUGIN_UI_CAPABILITY_EXPORT

-
#define NM_VPN_PLUGIN_UI_CAPABILITY_EXPORT   0x02
-

-

-

-

-

-

-
NM_VPN_PLUGIN_UI_CAPABILITY_IMPORT

-
#define NM_VPN_PLUGIN_UI_CAPABILITY_IMPORT   0x01
-

-

-

-

-

-

-
NM_VPN_PLUGIN_UI_CAPABILITY_IPV6

-
#define NM_VPN_PLUGIN_UI_CAPABILITY_IPV6     0x04
-

-

-

-

-

-

-
NM_VPN_PLUGIN_UI_CAPABILITY_NONE

-
#define NM_VPN_PLUGIN_UI_CAPABILITY_NONE     0x00
-

-

-

-

-

-

 
NM_VPN_PLUGIN_UI_INTERFACE_DESC

 
#define NM_VPN_PLUGIN_UI_INTERFACE_DESC "desc"
 

diff --git a/docs/libnm-glib/html/libnm-glib.devhelp2 b/docs/libnm-glib/html/libnm-glib.devhelp2
index 56ad45ea..64e57d5f 100644
--- a/docs/libnm-glib/html/libnm-glib.devhelp2
+++ b/docs/libnm-glib/html/libnm-glib.devhelp2
@@ -1,6 +1,6 @@
 
 
-
+
   
     
     
@@ -12,6 +12,7 @@
       
       
       
+      
       
       
       
@@ -294,6 +295,15 @@
     
     
     
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
     
@@ -547,14 +557,11 @@
     
     
     
+    
     
     
     
     
-    
-    
-    
-    
     
     
     
@@ -570,6 +577,23 @@
     
     
     
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
     
@@ -597,6 +621,9 @@
     
     
     
+    
+    
+    
     
     
     
@@ -619,9 +646,31 @@
     
     
     
+    
+    
+    
+    
+    
+    
     
     
     
     
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
   
 
diff --git a/docs/libnm-glib/html/object-tree.html b/docs/libnm-glib/html/object-tree.html
index 40bce23a..ae88a436 100644
--- a/docs/libnm-glib/html/object-tree.html
+++ b/docs/libnm-glib/html/object-tree.html
@@ -33,6 +33,7 @@
                 NMDeviceBt
                 NMDeviceWimax
                 NMDeviceOlpcMesh
+                NMDeviceAdsl
                 NMDeviceInfiniband
                 NMDeviceBond
                 NMDeviceVlan
diff --git a/docs/libnm-glib/libnm-glib-docs.xml b/docs/libnm-glib/libnm-glib-docs.xml
index 7f855aa0..1b989cb6 100644
--- a/docs/libnm-glib/libnm-glib-docs.xml
+++ b/docs/libnm-glib/libnm-glib-docs.xml
@@ -1,28 +1,20 @@
 
 
+               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
+  
+]>
+
 
   
     libnm-glib Reference Manual
     
-      for libnm-glib 0.9
+      for libnm-glib &version;
       The latest version of this documentation can be found on-line at
       http://projects.gnome.org/NetworkManager/developers/libnm-glib/09/.
     
-    
-      
-	Dan
-	Williams
-	
-	  

-	    dcbw@redhat.com
-	  

-	
-      
-    
 
     
-      2011
+      2012
       The NetworkManager Authors
     
 
@@ -41,19 +33,11 @@
 
 	

 	  The Free Software Foundation, Inc.,
-	  59 Temple Place - Suite 330,
-	  Boston, MA 02111-1307,
+	  51 Franklin Street - Fifth Floor,
+	  Boston, MA 02110-1301,
 	  USA
 	

       
-
-      
-	Many of the names used by companies to distinguish their
-	products and services are claimed as trademarks. Where those
-	names appear in any GNOME documentation, and those trademarks
-	are made aware to the members of the GNOME Documentation
-	Project, the names have been printed in caps or initial caps.
-      
     
   
 
@@ -88,6 +72,7 @@
     
     
     
+    
     
     
     
diff --git a/docs/libnm-glib/libnm-glib-sections.txt b/docs/libnm-glib/libnm-glib-sections.txt
index 59d41933..ff603451 100644
--- a/docs/libnm-glib/libnm-glib-sections.txt
+++ b/docs/libnm-glib/libnm-glib-sections.txt
@@ -735,8 +735,10 @@ nm_vpn_connection_get_type
 nm-vpn-enum-types
 
 NM_TYPE_VPN_PLUGIN_ERROR
+NM_TYPE_VPN_PLUGIN_UI_CAPABILITY
 NM_TYPE_VPN_PLUGIN_UI_INTERFACE_PROP
 nm_vpn_plugin_error_get_type
+nm_vpn_plugin_ui_capability_get_type
 nm_vpn_plugin_ui_interface_prop_get_type
 
 
@@ -774,14 +776,11 @@ nm_vpn_plugin_get_type
 nm-vpn-plugin-ui-interface
 NMVpnPluginUi
 NMVpnPluginUiWidget
+NMVpnPluginUiCapability
 NMVpnPluginUiFactory
 NMVpnPluginUiInterface
 NMVpnPluginUiInterfaceProp
 NMVpnPluginUiWidgetInterface
-NM_VPN_PLUGIN_UI_CAPABILITY_EXPORT
-NM_VPN_PLUGIN_UI_CAPABILITY_IMPORT
-NM_VPN_PLUGIN_UI_CAPABILITY_IPV6
-NM_VPN_PLUGIN_UI_CAPABILITY_NONE
 NM_VPN_PLUGIN_UI_INTERFACE_DESC
 NM_VPN_PLUGIN_UI_INTERFACE_NAME
 NM_VPN_PLUGIN_UI_INTERFACE_SERVICE
diff --git a/docs/libnm-glib/libnm-glib.types b/docs/libnm-glib/libnm-glib.types
index 9f6419d9..e3750af9 100644
--- a/docs/libnm-glib/libnm-glib.types
+++ b/docs/libnm-glib/libnm-glib.types
@@ -7,6 +7,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -30,6 +31,7 @@ nm_device_modem_get_type
 nm_device_bt_get_type
 nm_device_wimax_get_type
 nm_device_olpc_mesh_get_type
+nm_device_adsl_get_type
 nm_device_infiniband_get_type
 nm_device_bond_get_type
 nm_device_vlan_get_type
diff --git a/docs/libnm-glib/tmpl/nm-device-adsl.sgml b/docs/libnm-glib/tmpl/nm-device-adsl.sgml
index dc12af8e..286f2f41 100644
--- a/docs/libnm-glib/tmpl/nm-device-adsl.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-adsl.sgml
@@ -27,7 +27,11 @@ NMDeviceAdsl
 
 
 
-@parent: 
+
+
+
+
+
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-vpn-plugin-ui-interface.sgml b/docs/libnm-glib/tmpl/nm-vpn-plugin-ui-interface.sgml
index d8b74774..f4c724a8 100644
--- a/docs/libnm-glib/tmpl/nm-vpn-plugin-ui-interface.sgml
+++ b/docs/libnm-glib/tmpl/nm-vpn-plugin-ui-interface.sgml
@@ -22,6 +22,16 @@ NMVpnPluginUiWidget
 
 
 
+
+
+
+
+
+@NM_VPN_PLUGIN_UI_CAPABILITY_NONE: 
+@NM_VPN_PLUGIN_UI_CAPABILITY_IMPORT: 
+@NM_VPN_PLUGIN_UI_CAPABILITY_EXPORT: 
+@NM_VPN_PLUGIN_UI_CAPABILITY_IPV6: 
+
 
 
 
@@ -55,7 +65,6 @@ NMVpnPluginUiWidget
 
 
 
-@NM_VPN_PLUGIN_UI_INTERFACE_PROP_FIRST: 
 @NM_VPN_PLUGIN_UI_INTERFACE_PROP_NAME: 
 @NM_VPN_PLUGIN_UI_INTERFACE_PROP_DESC: 
 @NM_VPN_PLUGIN_UI_INTERFACE_PROP_SERVICE: 
@@ -71,34 +80,6 @@ NMVpnPluginUiWidget
 @save_secrets: 
 @changed: 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
 
 
diff --git a/docs/libnm-glib/version.xml b/docs/libnm-glib/version.xml
new file mode 100644
index 00000000..c318497f
--- /dev/null
+++ b/docs/libnm-glib/version.xml
@@ -0,0 +1 @@
+0.9.6.0
diff --git a/docs/libnm-glib/version.xml.in b/docs/libnm-glib/version.xml.in
new file mode 100644
index 00000000..d78bda93
--- /dev/null
+++ b/docs/libnm-glib/version.xml.in
@@ -0,0 +1 @@
+@VERSION@
-- 
cgit 1.3.0-6-gf8a5