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/api/html/NetworkManager.devhelp2 | 30 +- docs/api/html/index.html | 53 +-- docs/api/html/ix01.html | 2 +- docs/api/html/ref-migrating.html | 58 +-- docs/api/html/ref-settings.html | 46 +- docs/api/html/spec.html | 4 +- docs/api/network-manager-docs.xml | 25 +- docs/api/settings-spec.xml | 4 +- docs/api/spec.html | 4 +- docs/api/version.xml | 2 +- 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 + docs/libnm-util/Makefile.am | 5 +- docs/libnm-util/Makefile.in | 16 +- docs/libnm-util/html/NMConnection.html | 10 +- docs/libnm-util/html/NMSetting.html | 2 +- docs/libnm-util/html/NMSetting8021x.html | 4 +- docs/libnm-util/html/NMSettingAdsl.html | 511 +++++++++++++++++++++ docs/libnm-util/html/NMSettingOlpcMesh.html | 27 +- docs/libnm-util/html/NMSettingVlan.html | 6 +- docs/libnm-util/html/api-index-full.html | 66 +-- docs/libnm-util/html/ch01.html | 5 +- docs/libnm-util/html/index.html | 29 +- docs/libnm-util/html/index.sgml | 47 ++ docs/libnm-util/html/libnm-util.devhelp2 | 40 ++ docs/libnm-util/html/object-tree.html | 4 +- docs/libnm-util/libnm-util-docs.sgml | 31 +- docs/libnm-util/tmpl/nm-connection.sgml | 2 + docs/libnm-util/tmpl/nm-setting-8021x.sgml | 2 + docs/libnm-util/tmpl/nm-setting-adsl.sgml | 2 + docs/libnm-util/tmpl/nm-setting-bluetooth.sgml | 2 + docs/libnm-util/tmpl/nm-setting-bond.sgml | 2 + docs/libnm-util/tmpl/nm-setting-cdma.sgml | 2 + docs/libnm-util/tmpl/nm-setting-connection.sgml | 2 + docs/libnm-util/tmpl/nm-setting-gsm.sgml | 2 + docs/libnm-util/tmpl/nm-setting-infiniband.sgml | 2 + docs/libnm-util/tmpl/nm-setting-ip4-config.sgml | 2 + docs/libnm-util/tmpl/nm-setting-ip6-config.sgml | 2 + docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml | 2 + docs/libnm-util/tmpl/nm-setting-ppp.sgml | 2 + docs/libnm-util/tmpl/nm-setting-pppoe.sgml | 2 + docs/libnm-util/tmpl/nm-setting-private.sgml | 2 + docs/libnm-util/tmpl/nm-setting-serial.sgml | 2 + docs/libnm-util/tmpl/nm-setting-vlan.sgml | 2 + docs/libnm-util/tmpl/nm-setting-vpn.sgml | 2 + docs/libnm-util/tmpl/nm-setting-wimax.sgml | 2 + docs/libnm-util/tmpl/nm-setting-wired.sgml | 2 + .../tmpl/nm-setting-wireless-security.sgml | 2 + docs/libnm-util/tmpl/nm-setting-wireless.sgml | 2 + docs/libnm-util/tmpl/nm-setting.sgml | 2 + docs/libnm-util/tmpl/nm-utils-enum-types.sgml | 2 + docs/libnm-util/tmpl/nm-utils.sgml | 2 + docs/libnm-util/version.xml | 1 + docs/libnm-util/version.xml.in | 1 + 75 files changed, 1597 insertions(+), 365 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 create mode 100644 docs/libnm-util/html/NMSettingAdsl.html create mode 100644 docs/libnm-util/version.xml create mode 100644 docs/libnm-util/version.xml.in (limited to 'docs') diff --git a/docs/api/html/NetworkManager.devhelp2 b/docs/api/html/NetworkManager.devhelp2 index afff285e..fc52a922 100644 --- a/docs/api/html/NetworkManager.devhelp2 +++ b/docs/api/html/NetworkManager.devhelp2 @@ -1,26 +1,26 @@ - + - + - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/docs/api/html/index.html b/docs/api/html/index.html index 573f364f..f1188e1a 100644 --- a/docs/api/html/index.html +++ b/docs/api/html/index.html @@ -14,19 +14,11 @@
-
-

-Dan Williams -

-


-     
-   

-
-

Version 0.9.5.96 +

Version 0.9.6.0

-

Copyright © 2011 The NetworkManager Authors

+

Copyright © 2012 The NetworkManager Authors

-

+

Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.1 or any later @@ -40,19 +32,12 @@


  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. -

@@ -61,25 +46,25 @@
D-Bus API Reference
Network Configuration Setting Specification
-
Configuration Settings
+
Configuration Settings
Secret flag types
Migrating from NetworkManager 0.8 to NetworkManager 0.9
-
Architecture and D-Bus API Changes in 0.9
+
Architecture and D-Bus API Changes in 0.9
-
Elimination of the User Settings Service
-
User Secret Agents
-
Settings Service Interface Changes
-
Connection Object Interface Changes
-
Permissions Methods Consolidation
-
AddConnection Returns Object Path of New Connection
-
Support for WiMAX Devices
-
New Device States
-
New Active Connection State
-
Consolidated Modem Devices
-
Secret Property Flags
-
Deprecated Methods Removed
+
Elimination of the User Settings Service
+
User Secret Agents
+
Settings Service Interface Changes
+
Connection Object Interface Changes
+
Permissions Methods Consolidation
+
AddConnection Returns Object Path of New Connection
+
Support for WiMAX Devices
+
New Device States
+
New Active Connection State
+
Consolidated Modem Devices
+
Secret Property Flags
+
Deprecated Methods Removed
Index
diff --git a/docs/api/html/ix01.html b/docs/api/html/ix01.html index 81608829..9101be21 100644 --- a/docs/api/html/ix01.html +++ b/docs/api/html/ix01.html @@ -21,7 +21,7 @@

-Index

+Index
diff --git a/docs/api/html/ref-migrating.html b/docs/api/html/ref-migrating.html index 3dbedb5e..9db380b9 100644 --- a/docs/api/html/ref-migrating.html +++ b/docs/api/html/ref-migrating.html @@ -23,20 +23,20 @@

Migrating from NetworkManager 0.8 to NetworkManager 0.9

-
Architecture and D-Bus API Changes in 0.9
+
Architecture and D-Bus API Changes in 0.9
-
Elimination of the User Settings Service
-
User Secret Agents
-
Settings Service Interface Changes
-
Connection Object Interface Changes
-
Permissions Methods Consolidation
-
AddConnection Returns Object Path of New Connection
-
Support for WiMAX Devices
-
New Device States
-
New Active Connection State
-
Consolidated Modem Devices
-
Secret Property Flags
-
Deprecated Methods Removed
+
Elimination of the User Settings Service
+
User Secret Agents
+
Settings Service Interface Changes
+
Connection Object Interface Changes
+
Permissions Methods Consolidation
+
AddConnection Returns Object Path of New Connection
+
Support for WiMAX Devices
+
New Device States
+
New Active Connection State
+
Consolidated Modem Devices
+
Secret Property Flags
+
Deprecated Methods Removed

@@ -50,14 +50,14 @@

-Architecture and D-Bus API Changes in 0.9

+Architecture and D-Bus API Changes in 0.9

This section details the architectural and D-Bus API changes in NetworkManager 0.9.

-Elimination of the User Settings Service

+Elimination of the User Settings Service

Previously there were two "settings services", or D-Bus services that provided and saved network configuration information. NetworkManager @@ -103,7 +103,7 @@

-User Secret Agents

+User Secret Agents

Even with the elimination of the user settings service, in some cases it is still desirable to store secrets in the user's session and not in @@ -152,7 +152,7 @@

-Settings Service Interface Changes

+Settings Service Interface Changes

With the elimination of the user settings service, the old org.freedesktop.NetworkManagerUserSettings and @@ -190,7 +190,7 @@

-Connection Object Interface Changes

+Connection Object Interface Changes

Consistent with the interface changes to the Settings object, the Connection object's D-Bus interface has changed to @@ -224,7 +224,7 @@

-Permissions Methods Consolidation

+Permissions Methods Consolidation

Previously there were two D-Bus method calls to retrieve the list of operations that a user client could perform, and two signals notifying @@ -256,7 +256,7 @@ are now string-based permissions. The mapping is as follows:

-

Table 20. 

+

Table 20. 

@@ -307,7 +307,7 @@

-AddConnection Returns Object Path of New Connection

+AddConnection Returns Object Path of New Connection

The org.freedesktop.NetworkManager.Settings.AddConnection @@ -325,7 +325,7 @@

-Support for WiMAX Devices

+Support for WiMAX Devices

NetworkManager now supports Intel WiMAX mobile broadband devices. A corresponding device type (NM_DEVICE_TYPE_WIMAX) and @@ -348,7 +348,7 @@

-New Device States

+New Device States

A few new device states have been added, and all device states have been renumbered for flexibility. @@ -363,7 +363,7 @@

-New Active Connection State

+New Active Connection State

Along with the new device states, an additional @@ -379,7 +379,7 @@

-Consolidated Modem Devices

+Consolidated Modem Devices

Many new mobile broadband devices support multiple access families, like Qualcomm Gobi cards (CDMA/EVDO and GSM/UMTS), or multi-mode EVDO/LTE @@ -415,7 +415,7 @@

-Secret Property Flags

+Secret Property Flags

In the Connection object's configuration properties, each setting's secret properties (like WiFi passphrases, or public key passwords, etc) now has @@ -424,7 +424,7 @@ following values:

-

Table 21. 

+

Table 21. 

@@ -486,7 +486,7 @@

-Deprecated Methods Removed

+Deprecated Methods Removed

A few methods and signals of the org.freedesktop.NetworkManager interface deprecated in version 0.7 have been removed. All the @@ -496,7 +496,7 @@ their replacements:

-

Table 22. 

+

Table 22. 

diff --git a/docs/api/html/ref-settings.html b/docs/api/html/ref-settings.html index abdef1d7..45929d62 100644 --- a/docs/api/html/ref-settings.html +++ b/docs/api/html/ref-settings.html @@ -23,7 +23,7 @@

Network Configuration Setting Specification

-
Configuration Settings
+
Configuration Settings
Secret flag types

@@ -35,11 +35,11 @@

-Configuration Settings

+Configuration Settings

-

Table 1. 802-1x setting

+

Table 1. 802-1x setting

@@ -246,7 +246,7 @@


-

Table 2. bluetooth setting

+

Table 2. bluetooth setting

@@ -285,7 +285,7 @@


-

Table 3. bond setting

+

Table 3. bond setting

@@ -324,7 +324,7 @@


-

Table 4. cdma setting

+

Table 4. cdma setting

@@ -375,7 +375,7 @@


-

Table 5. connection setting

+

Table 5. connection setting

@@ -462,7 +462,7 @@


-

Table 6. gsm setting

+

Table 6. gsm setting

@@ -555,7 +555,7 @@


-

Table 7. infiniband setting

+

Table 7. infiniband setting

@@ -600,7 +600,7 @@


-

Table 8. ipv4 setting

+

Table 8. ipv4 setting

@@ -699,7 +699,7 @@


-

Table 9. ipv6 setting

+

Table 9. ipv6 setting

@@ -786,7 +786,7 @@


-

Table 10. 802-11-olpc-mesh setting

+

Table 10. 802-11-olpc-mesh setting

@@ -831,7 +831,7 @@


-

Table 11. ppp setting

+

Table 11. ppp setting

@@ -966,7 +966,7 @@


-

Table 12. pppoe setting

+

Table 12. pppoe setting

@@ -1017,7 +1017,7 @@


-

Table 13. serial setting

+

Table 13. serial setting

@@ -1074,7 +1074,7 @@


-

Table 14. vlan setting

+

Table 14. vlan setting

@@ -1099,13 +1099,13 @@ - + - + @@ -1137,7 +1137,7 @@


-

Table 15. vpn setting

+

Table 15. vpn setting

interface-name
 
string
 
If given, specifies the kernel name of the VLAN interface. If not given, a default name will be constructed from the interface described by the parent interface and the 'id' property, ex 'eth2.1'. The parent interface may be given by the 'parent' property or by a hardware address property, eg the 'wired' or 'infiniband' settings' 'mac-address' property.If given, specifies the kernel name of the VLAN interface. If not given, a default name will be constructed from the interface described by the parent interface and the 'id' property, ex 'eth2.1'. The parent interface may be given by the 'parent' property or by a hardware address property, eg the 'wired' settings' 'mac-address' property.
 

 

 
parent

 
string

 
If given, specifies the parent interface name or parent connection UUID from which this VLAN interface should be created.  If this property is not specified, the connection must contain a hardware address in a hardware-specific setting, like the 'wired' or 'infiniband' settings' 'mac-address' property.If given, specifies the parent interface name or parent connection UUID from which this VLAN interface should be created.  If this property is not specified, the connection must contain a hardware address in a hardware-specific setting, like the 'wired' settings' 'mac-address' property.
 

 

 
id

 
@@ -1188,7 +1188,7 @@
 


 

-
Table 16. wimax setting

+
Table 16. wimax setting

 

 
 

 
@@ -1227,7 +1227,7 @@
 


 

-
Table 17. 802-3-ethernet setting

+
Table 17. 802-3-ethernet setting

 

 
 

 
@@ -1320,7 +1320,7 @@
 


 

-
Table 18. 802-11-wireless setting

+
Table 18. 802-11-wireless setting

 

 
 

 
@@ -1431,7 +1431,7 @@
 


 

-
Table 19. 802-11-wireless-security setting

+
Table 19. 802-11-wireless-security setting

 

 
 

 
diff --git a/docs/api/html/spec.html b/docs/api/html/spec.html
index 4796dfd1..a6c8ca5b 100644
--- a/docs/api/html/spec.html
+++ b/docs/api/html/spec.html
@@ -1,5 +1,5 @@
 
-NetworkManager D-Bus Interface Specification version 0.9.5.96
NetworkManager D-Bus Interface Specification
Version 0.9.5.96
Copyright (C) 2008 - 2011 Red Hat, Inc.
Copyright (C) 2008 - 2009 Novell, Inc.

+        
NetworkManager D-Bus Interface Specification
Version 0.9.6.0
Copyright (C) 2008 - 2011 Red Hat, Inc.
Copyright (C) 2008 - 2009 Novell, Inc.

 
This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2 of the License, or
diff --git a/docs/api/network-manager-docs.xml b/docs/api/network-manager-docs.xml
index 885ff7f1..fadc8862 100644
--- a/docs/api/network-manager-docs.xml
+++ b/docs/api/network-manager-docs.xml
@@ -7,20 +7,9 @@
   
     NetworkManager D-Bus Reference Manual
     Version &version;
-    
-      
-	Dan
-	Williams
-	
-	  

-	    dcbw@redhat.com
-	  

-	
-      
-    
 
     
-      2011
+      2012
       The NetworkManager Authors
     
 
@@ -39,19 +28,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.
-      
     
   
 
diff --git a/docs/api/settings-spec.xml b/docs/api/settings-spec.xml
index d90814d7..1e7eead4 100644
--- a/docs/api/settings-spec.xml
+++ b/docs/api/settings-spec.xml
@@ -983,13 +983,13 @@
         interface-name
         string
         
-        If given, specifies the kernel name of the VLAN interface. If not given, a default name will be constructed from the interface described by the parent interface and the 'id' property, ex 'eth2.1'. The parent interface may be given by the 'parent' property or by a hardware address property, eg the 'wired' or 'infiniband' settings' 'mac-address' property.
+        If given, specifies the kernel name of the VLAN interface. If not given, a default name will be constructed from the interface described by the parent interface and the 'id' property, ex 'eth2.1'. The parent interface may be given by the 'parent' property or by a hardware address property, eg the 'wired' settings' 'mac-address' property.
       
       
         parent
         string
         
-        If given, specifies the parent interface name or parent connection UUID from which this VLAN interface should be created.  If this property is not specified, the connection must contain a hardware address in a hardware-specific setting, like the 'wired' or 'infiniband' settings' 'mac-address' property.
+        If given, specifies the parent interface name or parent connection UUID from which this VLAN interface should be created.  If this property is not specified, the connection must contain a hardware address in a hardware-specific setting, like the 'wired' settings' 'mac-address' property.
       
       
         id
diff --git a/docs/api/spec.html b/docs/api/spec.html
index 4796dfd1..a6c8ca5b 100644
--- a/docs/api/spec.html
+++ b/docs/api/spec.html
@@ -1,5 +1,5 @@
 
-NetworkManager D-Bus Interface Specification version 0.9.5.96
NetworkManager D-Bus Interface Specification
Version 0.9.5.96
Copyright (C) 2008 - 2011 Red Hat, Inc.
Copyright (C) 2008 - 2009 Novell, Inc.

+        
NetworkManager D-Bus Interface Specification
Version 0.9.6.0
Copyright (C) 2008 - 2011 Red Hat, Inc.
Copyright (C) 2008 - 2009 Novell, Inc.

 
This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2 of the License, or
diff --git a/docs/api/version.xml b/docs/api/version.xml
index b8a4eaee..c318497f 100644
--- a/docs/api/version.xml
+++ b/docs/api/version.xml
@@ -1 +1 @@
-0.9.5.96
+0.9.6.0
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@
diff --git a/docs/libnm-util/Makefile.am b/docs/libnm-util/Makefile.am
index 89a5db98..be1bdeeb 100644
--- a/docs/libnm-util/Makefile.am
+++ b/docs/libnm-util/Makefile.am
@@ -39,7 +39,7 @@ IGNORE_HFILES= \
 HTML_IMAGES = 
 
 # Extra XML files that are included by $(DOC_MAIN_SGML_FILE).
-content_files = 
+content_files = version.xml
 
 # Other files to distribute.
 extra_files =
@@ -50,7 +50,6 @@ extra_files =
 GTKDOC_CFLAGS =				\
 	-I$(top_srcdir)/include		\
 	-I$(top_srcdir)/libnm-util	\
-	-I$(top_builddir)/marshallers	\
 	$(GLIB_CFLAGS)			\
 	$(DBUS_CFLAGS)
 
@@ -63,6 +62,8 @@ GTKDOC_LIBS = \
 # include common portion ...
 include $(top_srcdir)/gtk-doc.make
 
+EXTRA_DIST += version.xml.in
+
 CLEANFILES += \
 	libnm-util-sections.txt \
 	html/* \
diff --git a/docs/libnm-util/Makefile.in b/docs/libnm-util/Makefile.in
index 2d444e76..5890524e 100644
--- a/docs/libnm-util/Makefile.in
+++ b/docs/libnm-util/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-util
 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@)
@@ -344,7 +344,7 @@ IGNORE_HFILES = \
 HTML_IMAGES = 
 
 # Extra XML files that are included by $(DOC_MAIN_SGML_FILE).
-content_files = 
+content_files = version.xml
 
 # Other files to distribute.
 extra_files = 
@@ -354,7 +354,6 @@ extra_files =
 GTKDOC_CFLAGS = \
 	-I$(top_srcdir)/include		\
 	-I$(top_srcdir)/libnm-util	\
-	-I$(top_builddir)/marshallers	\
 	$(GLIB_CFLAGS)			\
 	$(DBUS_CFLAGS)
 
@@ -382,10 +381,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
@@ -402,8 +400,6 @@ REPORT_FILES = \
 	$(DOC_MODULE)-undeclared.txt \
 	$(DOC_MODULE)-unused.txt
 
-
-# include common portion ...
 CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) \
 	libnm-util-sections.txt html/* tmpl/* xml/*
 @ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_FALSE@HTML_BUILD_STAMP = 
@@ -444,6 +440,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-util/html/NMConnection.html b/docs/libnm-util/html/NMConnection.html
index c1bd42e1..9e62ec8a 100644
--- a/docs/libnm-util/html/NMConnection.html
+++ b/docs/libnm-util/html/NMConnection.html
@@ -78,7 +78,7 @@ const char *        NMSetting *         nm_connection_get_setting           (NMConnection *connection,
                                                          GType setting_type);
 NMSetting8021x *    nm_connection_get_setting_802_1x    (NMConnection *connection);
-NMSettingAdsl *     nm_connection_get_setting_adsl      (NMConnection *connection);
+NMSettingAdsl *     nm_connection_get_setting_adsl      (NMConnection *connection);
 NMSettingBluetooth * nm_connection_get_setting_bluetooth
                                                         (NMConnection *connection);
 NMSettingBond *     nm_connection_get_setting_bond      (NMConnection *connection);
@@ -631,9 +631,9 @@ A shortcut to return any 
 
nm_connection_get_setting_adsl ()

-
NMSettingAdsl *     nm_connection_get_setting_adsl      (NMConnection *connection);

+
NMSettingAdsl *     nm_connection_get_setting_adsl      (NMConnection *connection);

 

-A shortcut to return any NMSettingAdsl the connection might contain.
+A shortcut to return any NMSettingAdsl the connection might contain.
 

 
@@ -645,7 +645,7 @@ A shortcut to return any NMSettingAdsl the connection
 
-
@@ -921,7 +921,7 @@ A shortcut to return any 
nm_connection_get_setting_pppoe ()
NMSettingPPPOE *    nm_connection_get_setting_pppoe     (NMConnection *connection);

-A shortcut to return any NMSettingPPOE the connection might contain.
+A shortcut to return any NMSettingPPPOE the connection might contain.
 

 

 

 
Returns :
an NMSettingAdsl if the connection contains one, otherwise NULL. [transfer none]
+an NMSettingAdsl if the connection contains one, otherwise NULL. [transfer none]
 
 

 
 
 
 
diff --git a/docs/libnm-util/html/NMSetting.html b/docs/libnm-util/html/NMSetting.html
index cccfd00b..8a8b2b8c 100644
--- a/docs/libnm-util/html/NMSetting.html
+++ b/docs/libnm-util/html/NMSetting.html
@@ -113,7 +113,7 @@ const char *        GObject
    +----NMSetting
          +----NMSetting8021x
-         +----NMSettingAdsl
+         +----NMSettingAdsl
          +----NMSettingBluetooth
          +----NMSettingBond
          +----NMSettingCdma
diff --git a/docs/libnm-util/html/NMSetting8021x.html b/docs/libnm-util/html/NMSetting8021x.html
index ba179c4a..a81f903d 100644
--- a/docs/libnm-util/html/NMSetting8021x.html
+++ b/docs/libnm-util/html/NMSetting8021x.html
@@ -6,7 +6,7 @@
 
-
+
@@ -14,7 +14,7 @@
 

 

 
 
 
 
 
 

-
+
diff --git a/docs/libnm-util/html/NMSettingAdsl.html b/docs/libnm-util/html/NMSettingAdsl.html
new file mode 100644
index 00000000..c7289a0a
--- /dev/null
+++ b/docs/libnm-util/html/NMSettingAdsl.html
@@ -0,0 +1,511 @@
+
+
+
+
+NMSettingAdsl
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+

+

+
+
+

+
NMSettingAdsl

+
NMSettingAdsl — Describes ADSL-based properties

+

+

+
Synopsis

+
+#include <nm-setting-adsl.h>
+
+                    NMSettingAdsl;
+                    NMSettingAdslClass;
+enum                NMSettingAdslError;
+#define             NM_SETTING_ADSL_ENCAPSULATION
+#define             NM_SETTING_ADSL_ENCAPSULATION_LLC
+#define             NM_SETTING_ADSL_ENCAPSULATION_VCMUX
+#define             NM_SETTING_ADSL_ERROR
+#define             NM_SETTING_ADSL_PASSWORD
+#define             NM_SETTING_ADSL_PASSWORD_FLAGS
+#define             NM_SETTING_ADSL_PROTOCOL
+#define             NM_SETTING_ADSL_PROTOCOL_IPOATM
+#define             NM_SETTING_ADSL_PROTOCOL_PPPOA
+#define             NM_SETTING_ADSL_PROTOCOL_PPPOE
+#define             NM_SETTING_ADSL_SETTING_NAME
+#define             NM_SETTING_ADSL_USERNAME
+#define             NM_SETTING_ADSL_VCI
+#define             NM_SETTING_ADSL_VPI
+GQuark              nm_setting_adsl_error_quark         (void);
+const char *        nm_setting_adsl_get_encapsulation   (NMSettingAdsl *setting);
+const char *        nm_setting_adsl_get_password        (NMSettingAdsl *setting);
+NMSettingSecretFlags nm_setting_adsl_get_password_flags (NMSettingAdsl *setting);
+const char *        nm_setting_adsl_get_protocol        (NMSettingAdsl *setting);
+const char *        nm_setting_adsl_get_username        (NMSettingAdsl *setting);
+guint32             nm_setting_adsl_get_vci             (NMSettingAdsl *setting);
+guint32             nm_setting_adsl_get_vpi             (NMSettingAdsl *setting);
+NMSetting *         nm_setting_adsl_new                 (void);
+

+

+

+
Object Hierarchy

+
+  GObject
+   +----NMSetting
+         +----NMSettingAdsl
+

+
+  GEnum
+   +----NMSettingAdslError
+

+

+

+
Properties

+
+  "encapsulation"            gchar*                : Read / Write
+  "password"                 gchar*                : Read / Write
+  "password-flags"           guint                 : Read / Write
+  "protocol"                 gchar*                : Read / Write
+  "username"                 gchar*                : Read / Write
+  "vci"                      guint                 : Read / Write
+  "vpi"                      guint                 : Read / Write
+

+

+

+
Description

+

+The NMSettingAdsl object is a NMSetting subclass that describes
+properties of ADSL connections.
+

+

+

+
Details

+

+
NMSettingAdsl

+
typedef struct _NMSettingAdsl NMSettingAdsl;

+

+

+

+

+

+
NMSettingAdslClass

+
typedef struct {
+	NMSettingClass parent;
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+} NMSettingAdslClass;
+

+

+

+

+

+

+
enum NMSettingAdslError

+
typedef enum {
+	NM_SETTING_ADSL_ERROR_UNKNOWN = 0,              /*< nick=UnknownError >*/
+	NM_SETTING_ADSL_ERROR_INVALID_PROPERTY,         /*< nick=InvalidProperty >*/
+	NM_SETTING_ADSL_ERROR_MISSING_PROPERTY          /*< nick=MissingProperty >*/
+} NMSettingAdslError;
+

+

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


NM_SETTING_ADSL_ERROR_UNKNOWN
unknown or unclassified error
+
NM_SETTING_ADSL_ERROR_INVALID_PROPERTY
the property was invalid
+
NM_SETTING_ADSL_ERROR_MISSING_PROPERTY
the property was missing and is
+required
+

+

+

+

+
NM_SETTING_ADSL_ENCAPSULATION

+
#define NM_SETTING_ADSL_ENCAPSULATION       "encapsulation"
+

+

+

+

+

+

+
NM_SETTING_ADSL_ENCAPSULATION_LLC

+
#define NM_SETTING_ADSL_ENCAPSULATION_LLC   "llc"
+

+

+

+

+

+

+
NM_SETTING_ADSL_ENCAPSULATION_VCMUX

+
#define NM_SETTING_ADSL_ENCAPSULATION_VCMUX "vcmux"
+

+

+

+

+

+

+
NM_SETTING_ADSL_ERROR

+
#define NM_SETTING_ADSL_ERROR nm_setting_adsl_error_quark ()
+

+

+

+

+

+

+
NM_SETTING_ADSL_PASSWORD

+
#define NM_SETTING_ADSL_PASSWORD            "password"
+

+

+

+

+

+

+
NM_SETTING_ADSL_PASSWORD_FLAGS

+
#define NM_SETTING_ADSL_PASSWORD_FLAGS      "password-flags"
+

+

+

+

+

+

+
NM_SETTING_ADSL_PROTOCOL

+
#define NM_SETTING_ADSL_PROTOCOL            "protocol"
+

+

+

+

+

+

+
NM_SETTING_ADSL_PROTOCOL_IPOATM

+
#define NM_SETTING_ADSL_PROTOCOL_IPOATM     "ipoatm"
+

+

+

+

+

+

+
NM_SETTING_ADSL_PROTOCOL_PPPOA

+
#define NM_SETTING_ADSL_PROTOCOL_PPPOA      "pppoa"
+

+

+

+

+

+

+
NM_SETTING_ADSL_PROTOCOL_PPPOE

+
#define NM_SETTING_ADSL_PROTOCOL_PPPOE      "pppoe"
+

+

+

+

+

+

+
NM_SETTING_ADSL_SETTING_NAME

+
#define NM_SETTING_ADSL_SETTING_NAME "adsl"
+

+

+

+

+

+

+
NM_SETTING_ADSL_USERNAME

+
#define NM_SETTING_ADSL_USERNAME            "username"
+

+

+

+

+

+

+
NM_SETTING_ADSL_VCI

+
#define NM_SETTING_ADSL_VCI                 "vci"
+

+

+

+

+

+

+
NM_SETTING_ADSL_VPI

+
#define NM_SETTING_ADSL_VPI                 "vpi"
+

+

+

+

+

+

+
nm_setting_adsl_error_quark ()

+
GQuark              nm_setting_adsl_error_quark         (void);

+

+Registers an error quark for NMSettingAdsl if necessary.
+

+

++
+
+
+
+


Returns :
the error quark used for NMSettingAdsl errors.

+

+

+

+
nm_setting_adsl_get_encapsulation ()

+
const char *        nm_setting_adsl_get_encapsulation   (NMSettingAdsl *setting);

+

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


setting :
the NMSettingAdsl
+
Returns :
the "encapsulation" property of the setting

+

+

+

+
nm_setting_adsl_get_password ()

+
const char *        nm_setting_adsl_get_password        (NMSettingAdsl *setting);

+

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


setting :
the NMSettingAdsl
+
Returns :
the "password" property of the setting

+

+

+

+
nm_setting_adsl_get_password_flags ()

+
NMSettingSecretFlags nm_setting_adsl_get_password_flags (NMSettingAdsl *setting);

+

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


setting :
the NMSettingAdsl
+
Returns :
the NMSettingSecretFlags pertaining to the "password"
+

+

+

+

+
nm_setting_adsl_get_protocol ()

+
const char *        nm_setting_adsl_get_protocol        (NMSettingAdsl *setting);

+

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


setting :
the NMSettingAdsl
+
Returns :
the "protocol" property of the setting

+

+

+

+
nm_setting_adsl_get_username ()

+
const char *        nm_setting_adsl_get_username        (NMSettingAdsl *setting);

+

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


setting :
the NMSettingAdsl
+
Returns :
the "username" property of the setting

+

+

+

+
nm_setting_adsl_get_vci ()

+
guint32             nm_setting_adsl_get_vci             (NMSettingAdsl *setting);

+

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


setting :
the NMSettingAdsl
+
Returns :
the "vci" property of the setting

+

+

+

+
nm_setting_adsl_get_vpi ()

+
guint32             nm_setting_adsl_get_vpi             (NMSettingAdsl *setting);

+

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


setting :
the NMSettingAdsl
+
Returns :
the "vpi" property of the setting

+

+

+

+
nm_setting_adsl_new ()

+
NMSetting *         nm_setting_adsl_new                 (void);

+

+Creates a new NMSettingAdsl object with default values.
+

+

++
+
+
+
+


Returns :
the new empty NMSettingAdsl object

+

+

+

+
Property Details

+

+
The "encapsulation" property

+
  "encapsulation"            gchar*                : Read / Write

+

+ADSL connection encapsulation, can be vcmux or llc.
+

+
Default value: NULL

+

+

+

+
The "password" property

+
  "password"                 gchar*                : Read / Write

+

+Password used to authenticate with the ADSL service.
+

+
Default value: NULL

+

+

+

+
The "password-flags" property

+
  "password-flags"           guint                 : Read / Write

+

+Flags indicating how to handle "password":.
+

+
Allowed values: <= 7

+
Default value: 0

+

+

+

+
The "protocol" property

+
  "protocol"                 gchar*                : Read / Write

+

+ADSL connection protocol, can be pppoa, pppoe or ipoatm.
+

+
Default value: NULL

+

+

+

+
The "username" property

+
  "username"                 gchar*                : Read / Write

+

+Username used to authenticate with the ADSL service.
+

+
Default value: NULL

+

+

+

+
The "vci" property

+
  "vci"                      guint                 : Read / Write

+

+ADSL connection vci.
+

+
Allowed values: <= 65536

+
Default value: 0

+

+

+

+
The "vpi" property

+
  "vpi"                      guint                 : Read / Write

+

+ADSL connection vpi.
+

+
Allowed values: <= 65536

+
Default value: 0

+

+

+

+

+

+          Generated by GTK-Doc V1.18

+
+
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingOlpcMesh.html b/docs/libnm-util/html/NMSettingOlpcMesh.html
index 53ee169c..fe2fa095 100644
--- a/docs/libnm-util/html/NMSettingOlpcMesh.html
+++ b/docs/libnm-util/html/NMSettingOlpcMesh.html
@@ -7,7 +7,7 @@
 
 
 
-
+
 
 
 
@@ -18,7 +18,7 @@
 Up
 Home
 libnm-util Reference Manual
-Next
+Next
 
 
 Top
@@ -115,8 +115,27 @@ const 
++
+
+
+
+
+
+
+
+
+
+
+
+
+
+


NM_SETTING_OLPC_MESH_ERROR_UNKNOWN
unknown or unclassified error
+
NM_SETTING_OLPC_MESH_ERROR_INVALID_PROPERTY
the property was invalid
+
NM_SETTING_OLPC_MESH_ERROR_MISSING_PROPERTY
the property was missing and is
+required
+

 

 

 

diff --git a/docs/libnm-util/html/NMSettingVlan.html b/docs/libnm-util/html/NMSettingVlan.html
index cc50161e..013c31f1 100644
--- a/docs/libnm-util/html/NMSettingVlan.html
+++ b/docs/libnm-util/html/NMSettingVlan.html
@@ -681,8 +681,7 @@ If given, specifies the kernel name of the VLAN interface. If not given,
 a default name will be constructed from the interface described by the
 parent interface and the "id" , ex 'eth2.1'. The parent
 interface may be given by the "parent" property or by a
-hardware address property, eg "mac-address" or
-"mac-address".
+hardware address property, eg "mac-address".
 

 
Default value: NULL

 

@@ -694,8 +693,7 @@ hardware address property, eg "mac-address" or
-"mac-address".
+hardware-specific setting, like "mac-address".
 

 
Default value: NULL

 

diff --git a/docs/libnm-util/html/api-index-full.html b/docs/libnm-util/html/api-index-full.html
index 053cb332..2e5d124d 100644
--- a/docs/libnm-util/html/api-index-full.html
+++ b/docs/libnm-util/html/api-index-full.html
@@ -621,43 +621,43 @@
 
 

 

-NMSettingAdsl, struct in NMSettingAdsl
+NMSettingAdsl, struct in NMSettingAdsl
 

 

 

-NMSettingAdsl:encapsulation, object property in NMSettingAdsl
+NMSettingAdsl:encapsulation, object property in NMSettingAdsl
 

 

 

-NMSettingAdsl:password, object property in NMSettingAdsl
+NMSettingAdsl:password, object property in NMSettingAdsl
 

 

 

-NMSettingAdsl:password-flags, object property in NMSettingAdsl
+NMSettingAdsl:password-flags, object property in NMSettingAdsl
 

 

 

-NMSettingAdsl:protocol, object property in NMSettingAdsl
+NMSettingAdsl:protocol, object property in NMSettingAdsl
 

 

 

-NMSettingAdsl:username, object property in NMSettingAdsl
+NMSettingAdsl:username, object property in NMSettingAdsl
 

 

 

-NMSettingAdsl:vci, object property in NMSettingAdsl
+NMSettingAdsl:vci, object property in NMSettingAdsl
 

 

 

-NMSettingAdsl:vpi, object property in NMSettingAdsl
+NMSettingAdsl:vpi, object property in NMSettingAdsl
 

 

 

-NMSettingAdslClass, struct in NMSettingAdsl
+NMSettingAdslClass, struct in NMSettingAdsl
 

 

 

-NMSettingAdslError, enum in NMSettingAdsl
+NMSettingAdslError, enum in NMSettingAdsl
 

 

 

@@ -1873,95 +1873,95 @@ NMSettingAdslError, enum in NMSettingAdsl
 

 

 

-NM_SETTING_ADSL_ENCAPSULATION, macro in NMSettingAdsl
+NM_SETTING_ADSL_ENCAPSULATION, macro in NMSettingAdsl
 

 

 

-NM_SETTING_ADSL_ENCAPSULATION_LLC, macro in NMSettingAdsl
+NM_SETTING_ADSL_ENCAPSULATION_LLC, macro in NMSettingAdsl
 

 

 

-NM_SETTING_ADSL_ENCAPSULATION_VCMUX, macro in NMSettingAdsl
+NM_SETTING_ADSL_ENCAPSULATION_VCMUX, macro in NMSettingAdsl
 

 

 

-NM_SETTING_ADSL_ERROR, macro in NMSettingAdsl
+NM_SETTING_ADSL_ERROR, macro in NMSettingAdsl
 

 

 

-nm_setting_adsl_error_quark, function in NMSettingAdsl
+nm_setting_adsl_error_quark, function in NMSettingAdsl
 

 

 

-nm_setting_adsl_get_encapsulation, function in NMSettingAdsl
+nm_setting_adsl_get_encapsulation, function in NMSettingAdsl
 

 

 

-nm_setting_adsl_get_password, function in NMSettingAdsl
+nm_setting_adsl_get_password, function in NMSettingAdsl
 

 

 

-nm_setting_adsl_get_password_flags, function in NMSettingAdsl
+nm_setting_adsl_get_password_flags, function in NMSettingAdsl
 

 

 

-nm_setting_adsl_get_protocol, function in NMSettingAdsl
+nm_setting_adsl_get_protocol, function in NMSettingAdsl
 

 

 

-nm_setting_adsl_get_username, function in NMSettingAdsl
+nm_setting_adsl_get_username, function in NMSettingAdsl
 

 

 

-nm_setting_adsl_get_vci, function in NMSettingAdsl
+nm_setting_adsl_get_vci, function in NMSettingAdsl
 

 

 

-nm_setting_adsl_get_vpi, function in NMSettingAdsl
+nm_setting_adsl_get_vpi, function in NMSettingAdsl
 

 

 

-nm_setting_adsl_new, function in NMSettingAdsl
+nm_setting_adsl_new, function in NMSettingAdsl
 

 

 

-NM_SETTING_ADSL_PASSWORD, macro in NMSettingAdsl
+NM_SETTING_ADSL_PASSWORD, macro in NMSettingAdsl
 

 

 

-NM_SETTING_ADSL_PASSWORD_FLAGS, macro in NMSettingAdsl
+NM_SETTING_ADSL_PASSWORD_FLAGS, macro in NMSettingAdsl
 

 

 

-NM_SETTING_ADSL_PROTOCOL, macro in NMSettingAdsl
+NM_SETTING_ADSL_PROTOCOL, macro in NMSettingAdsl
 

 

 

-NM_SETTING_ADSL_PROTOCOL_IPOATM, macro in NMSettingAdsl
+NM_SETTING_ADSL_PROTOCOL_IPOATM, macro in NMSettingAdsl
 

 

 

-NM_SETTING_ADSL_PROTOCOL_PPPOA, macro in NMSettingAdsl
+NM_SETTING_ADSL_PROTOCOL_PPPOA, macro in NMSettingAdsl
 

 

 

-NM_SETTING_ADSL_PROTOCOL_PPPOE, macro in NMSettingAdsl
+NM_SETTING_ADSL_PROTOCOL_PPPOE, macro in NMSettingAdsl
 

 

 

-NM_SETTING_ADSL_SETTING_NAME, macro in NMSettingAdsl
+NM_SETTING_ADSL_SETTING_NAME, macro in NMSettingAdsl
 

 

 

-NM_SETTING_ADSL_USERNAME, macro in NMSettingAdsl
+NM_SETTING_ADSL_USERNAME, macro in NMSettingAdsl
 

 

 

-NM_SETTING_ADSL_VCI, macro in NMSettingAdsl
+NM_SETTING_ADSL_VCI, macro in NMSettingAdsl
 

 

 

-NM_SETTING_ADSL_VPI, macro in NMSettingAdsl
+NM_SETTING_ADSL_VPI, macro in NMSettingAdsl
 

 

 

diff --git a/docs/libnm-util/html/ch01.html b/docs/libnm-util/html/ch01.html
index 39768bae..6f1e37fe 100644
--- a/docs/libnm-util/html/ch01.html
+++ b/docs/libnm-util/html/ch01.html
@@ -21,7 +21,7 @@
 
 

 

-libnm-util API Reference

+libnm-util API Reference

 

 

 NMConnection — Describes a connection to specific network or provider
@@ -71,6 +71,9 @@ serial communications
 NMSettingOlpcMesh
 

 

+NMSettingAdsl — Describes ADSL-based properties
+

+

 NMSetting8021x — Describes 802.1x-authenticated connection properties
 

 

diff --git a/docs/libnm-util/html/index.html b/docs/libnm-util/html/index.html
index dea375f6..a97eb48a 100644
--- a/docs/libnm-util/html/index.html
+++ b/docs/libnm-util/html/index.html
@@ -15,10 +15,34 @@
 

 

 

-      for libnm-util 0.9
+      for libnm-util 0.9.6.0
+
       The latest version of this documentation can be found on-line at
       http://projects.gnome.org/NetworkManager/developers/libnm-util/09/.
     

+
Copyright © 2012 The NetworkManager Authors

+

+

+	Permission is granted to copy, distribute and/or modify this
+	document under the terms of the GNU Free
+	Documentation License, Version 1.1 or any later
+	version published by the Free Software Foundation with no
+	Invariant Sections, no Front-Cover Texts, and no Back-Cover
+	Texts. You may obtain a copy of the GNU Free
+	Documentation License from the Free Software
+	Foundation by visiting their Web site or by writing
+	to:
+
+	

+


+	  The Free Software Foundation, Inc.,

+	  51 Franklin Street - Fifth Floor,

+	  Boston, MA 02110-1301,

+	  USA

+	

+

+      

+

 

 

 

@@ -73,6 +97,9 @@ serial communications
 NMSettingOlpcMesh
 

 

+NMSettingAdsl — Describes ADSL-based properties
+

+

 NMSetting8021x — Describes 802.1x-authenticated connection properties
 

 

diff --git a/docs/libnm-util/html/index.sgml b/docs/libnm-util/html/index.sgml
index e8f2d4ea..2fa04eaf 100644
--- a/docs/libnm-util/html/index.sgml
+++ b/docs/libnm-util/html/index.sgml
@@ -716,6 +716,9 @@
 
 
 
+
+
+
 
 
 
@@ -730,6 +733,50 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
diff --git a/docs/libnm-util/html/libnm-util.devhelp2 b/docs/libnm-util/html/libnm-util.devhelp2
index 93646eec..5b50abff 100644
--- a/docs/libnm-util/html/libnm-util.devhelp2
+++ b/docs/libnm-util/html/libnm-util.devhelp2
@@ -18,6 +18,7 @@
       
       
       
+      
       
       
       
@@ -528,6 +529,39 @@
     
     
     
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
     
@@ -1087,6 +1121,12 @@
     
     
     
+    
+    
+    
+    
+    
+    
     
     
     
diff --git a/docs/libnm-util/html/object-tree.html b/docs/libnm-util/html/object-tree.html
index edb82a82..ea1caff3 100644
--- a/docs/libnm-util/html/object-tree.html
+++ b/docs/libnm-util/html/object-tree.html
@@ -27,7 +27,7 @@
         NMConnection
         NMSetting
             NMSetting8021x
-            NMSettingAdsl
+            NMSettingAdsl
             NMSettingBluetooth
             NMSettingBond
             NMSettingCdma
@@ -51,7 +51,7 @@
         NMSetting8021xCKFormat
         NMSetting8021xCKScheme
         NMSetting8021xError
-        NMSettingAdslError
+        NMSettingAdslError
         NMSettingBluetoothError
         NMSettingBondError
         NMSettingCdmaError
diff --git a/docs/libnm-util/libnm-util-docs.sgml b/docs/libnm-util/libnm-util-docs.sgml
index f389971b..66b402c3 100644
--- a/docs/libnm-util/libnm-util-docs.sgml
+++ b/docs/libnm-util/libnm-util-docs.sgml
@@ -3,15 +3,43 @@
                "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
 [
   
+  
 ]>
 
   
     libnm-util Reference Manual
     
-      for libnm-util 0.9
+      for libnm-util &version;
       The latest version of this documentation can be found on-line at
       http://projects.gnome.org/NetworkManager/developers/libnm-util/09/.
     
+
+    
+      2012
+      The NetworkManager Authors
+    
+
+    
+      
+	Permission is granted to copy, distribute and/or modify this
+	document under the terms of the GNU Free
+	Documentation License, Version 1.1 or any later
+	version published by the Free Software Foundation with no
+	Invariant Sections, no Front-Cover Texts, and no Back-Cover
+	Texts. You may obtain a copy of the GNU Free
+	Documentation License from the Free Software
+	Foundation by visiting their Web site or by writing
+	to:
+
+	

+	  The Free Software Foundation, Inc.,
+	  51 Franklin Street - Fifth Floor,
+	  Boston, MA 02110-1301,
+	  USA
+	

+      
+    
   
 
   
@@ -31,6 +59,7 @@
     
     
     
+    
     
     
     
diff --git a/docs/libnm-util/tmpl/nm-connection.sgml b/docs/libnm-util/tmpl/nm-connection.sgml
index 59799611..fa0b5d8b 100644
--- a/docs/libnm-util/tmpl/nm-connection.sgml
+++ b/docs/libnm-util/tmpl/nm-connection.sgml
@@ -9,11 +9,13 @@ NMConnection
 
 
 
+
 
 
 
 
 
+
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-8021x.sgml b/docs/libnm-util/tmpl/nm-setting-8021x.sgml
index 10775224..f8ab2c77 100644
--- a/docs/libnm-util/tmpl/nm-setting-8021x.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-8021x.sgml
@@ -9,11 +9,13 @@ NMSetting8021x
 
 
 
+
 
 
 
 
 
+
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-adsl.sgml b/docs/libnm-util/tmpl/nm-setting-adsl.sgml
index d81ae07f..0e209bc2 100644
--- a/docs/libnm-util/tmpl/nm-setting-adsl.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-adsl.sgml
@@ -9,11 +9,13 @@ NMSettingAdsl
 
 
 
+
 
 
 
 
 
+
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-bluetooth.sgml b/docs/libnm-util/tmpl/nm-setting-bluetooth.sgml
index 9ab1b4b2..cc64b574 100644
--- a/docs/libnm-util/tmpl/nm-setting-bluetooth.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-bluetooth.sgml
@@ -9,11 +9,13 @@ NMSettingBluetooth
 
 
 
+
 
 
 
 
 
+
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-bond.sgml b/docs/libnm-util/tmpl/nm-setting-bond.sgml
index 8f7dbfc1..caa8b37a 100644
--- a/docs/libnm-util/tmpl/nm-setting-bond.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-bond.sgml
@@ -9,11 +9,13 @@ NMSettingBond
 
 
 
+
 
 
 
 
 
+
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-cdma.sgml b/docs/libnm-util/tmpl/nm-setting-cdma.sgml
index 7837016d..5d065170 100644
--- a/docs/libnm-util/tmpl/nm-setting-cdma.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-cdma.sgml
@@ -9,11 +9,13 @@ NMSettingCdma
 
 
 
+
 
 
 
 
 
+
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-connection.sgml b/docs/libnm-util/tmpl/nm-setting-connection.sgml
index 751b1a19..d4f56800 100644
--- a/docs/libnm-util/tmpl/nm-setting-connection.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-connection.sgml
@@ -9,11 +9,13 @@ NMSettingConnection
 
 
 
+
 
 
 
 
 
+
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-gsm.sgml b/docs/libnm-util/tmpl/nm-setting-gsm.sgml
index 5a6a3c48..0c9bdeb0 100644
--- a/docs/libnm-util/tmpl/nm-setting-gsm.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-gsm.sgml
@@ -9,11 +9,13 @@ NMSettingGsm
 
 
 
+
 
 
 
 
 
+
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-infiniband.sgml b/docs/libnm-util/tmpl/nm-setting-infiniband.sgml
index ba7117c0..02a59881 100644
--- a/docs/libnm-util/tmpl/nm-setting-infiniband.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-infiniband.sgml
@@ -9,11 +9,13 @@ NMSettingInfiniband
 
 
 
+
 
 
 
 
 
+
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-ip4-config.sgml b/docs/libnm-util/tmpl/nm-setting-ip4-config.sgml
index fbc1b4cc..4b915f2b 100644
--- a/docs/libnm-util/tmpl/nm-setting-ip4-config.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-ip4-config.sgml
@@ -9,11 +9,13 @@ NMSettingIP4Config
 
 
 
+
 
 
 
 
 
+
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-ip6-config.sgml b/docs/libnm-util/tmpl/nm-setting-ip6-config.sgml
index 400bfced..ad9c1b63 100644
--- a/docs/libnm-util/tmpl/nm-setting-ip6-config.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-ip6-config.sgml
@@ -9,11 +9,13 @@ NMSettingIP6Config
 
 
 
+
 
 
 
 
 
+
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml b/docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml
index 744c87e3..9a1e720e 100644
--- a/docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml
@@ -9,11 +9,13 @@ NMSettingOlpcMesh
 
 
 
+
 
 
 
 
 
+
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-ppp.sgml b/docs/libnm-util/tmpl/nm-setting-ppp.sgml
index f26d56fa..90815380 100644
--- a/docs/libnm-util/tmpl/nm-setting-ppp.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-ppp.sgml
@@ -9,11 +9,13 @@ NMSettingPPP
 
 
 
+
 
 
 
 
 
+
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-pppoe.sgml b/docs/libnm-util/tmpl/nm-setting-pppoe.sgml
index 942b5a04..3c022169 100644
--- a/docs/libnm-util/tmpl/nm-setting-pppoe.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-pppoe.sgml
@@ -9,11 +9,13 @@ NMSettingPPPOE
 
 
 
+
 
 
 
 
 
+
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-private.sgml b/docs/libnm-util/tmpl/nm-setting-private.sgml
index b5cdc70e..b9740165 100644
--- a/docs/libnm-util/tmpl/nm-setting-private.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-private.sgml
@@ -9,11 +9,13 @@ nm-setting-private
 
 
 
+
 
 
 
 
 
+
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-serial.sgml b/docs/libnm-util/tmpl/nm-setting-serial.sgml
index 542b9fbc..f0313441 100644
--- a/docs/libnm-util/tmpl/nm-setting-serial.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-serial.sgml
@@ -9,11 +9,13 @@ NMSettingSerial
 
 
 
+
 
 
 
 
 
+
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-vlan.sgml b/docs/libnm-util/tmpl/nm-setting-vlan.sgml
index 79cb88db..49f40d1d 100644
--- a/docs/libnm-util/tmpl/nm-setting-vlan.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-vlan.sgml
@@ -9,11 +9,13 @@ NMSettingVlan
 
 
 
+
 
 
 
 
 
+
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-vpn.sgml b/docs/libnm-util/tmpl/nm-setting-vpn.sgml
index e29dfff9..567776c1 100644
--- a/docs/libnm-util/tmpl/nm-setting-vpn.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-vpn.sgml
@@ -9,11 +9,13 @@ NMSettingVPN
 
 
 
+
 
 
 
 
 
+
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-wimax.sgml b/docs/libnm-util/tmpl/nm-setting-wimax.sgml
index 9225504a..0b96fa9f 100644
--- a/docs/libnm-util/tmpl/nm-setting-wimax.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-wimax.sgml
@@ -9,11 +9,13 @@ NMSettingWimax
 
 
 
+
 
 
 
 
 
+
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-wired.sgml b/docs/libnm-util/tmpl/nm-setting-wired.sgml
index cff79594..09fb963a 100644
--- a/docs/libnm-util/tmpl/nm-setting-wired.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-wired.sgml
@@ -9,11 +9,13 @@ NMSettingWired
 
 
 
+
 
 
 
 
 
+
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-wireless-security.sgml b/docs/libnm-util/tmpl/nm-setting-wireless-security.sgml
index d653c682..01b16ce9 100644
--- a/docs/libnm-util/tmpl/nm-setting-wireless-security.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-wireless-security.sgml
@@ -9,11 +9,13 @@ NMSettingWirelessSecurity
 
 
 
+
 
 
 
 
 
+
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-wireless.sgml b/docs/libnm-util/tmpl/nm-setting-wireless.sgml
index 6a34f4c5..fdadf8b9 100644
--- a/docs/libnm-util/tmpl/nm-setting-wireless.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-wireless.sgml
@@ -9,11 +9,13 @@ NMSettingWireless
 
 
 
+
 
 
 
 
 
+
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting.sgml b/docs/libnm-util/tmpl/nm-setting.sgml
index a5198c10..2067408a 100644
--- a/docs/libnm-util/tmpl/nm-setting.sgml
+++ b/docs/libnm-util/tmpl/nm-setting.sgml
@@ -9,11 +9,13 @@ NMSetting
 
 
 
+
 
 
 
 
 
+
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-utils-enum-types.sgml b/docs/libnm-util/tmpl/nm-utils-enum-types.sgml
index 5171db34..82025822 100644
--- a/docs/libnm-util/tmpl/nm-utils-enum-types.sgml
+++ b/docs/libnm-util/tmpl/nm-utils-enum-types.sgml
@@ -9,11 +9,13 @@ nm-utils-enum-types
 
 
 
+
 
 
 
 
 
+
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-utils.sgml b/docs/libnm-util/tmpl/nm-utils.sgml
index f7ee74c1..8a822fcf 100644
--- a/docs/libnm-util/tmpl/nm-utils.sgml
+++ b/docs/libnm-util/tmpl/nm-utils.sgml
@@ -9,11 +9,13 @@ nm-utils
 
 
 
+
 
 
 
 
 
+
 
 
 
diff --git a/docs/libnm-util/version.xml b/docs/libnm-util/version.xml
new file mode 100644
index 00000000..c318497f
--- /dev/null
+++ b/docs/libnm-util/version.xml
@@ -0,0 +1 @@
+0.9.6.0
diff --git a/docs/libnm-util/version.xml.in b/docs/libnm-util/version.xml.in
new file mode 100644
index 00000000..d78bda93
--- /dev/null
+++ b/docs/libnm-util/version.xml.in
@@ -0,0 +1 @@
+@VERSION@
-- 
cgit 1.3.0-6-gf8a5