From de06e5715e780baade318f3490ac7a4c9ce84e32 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sat, 24 Mar 2012 01:37:02 +0100 Subject: Imported Upstream version 0.9.4.0 --- docs/Makefile.in | 9 + docs/api/Makefile.am | 2 +- docs/api/Makefile.in | 11 +- docs/api/generate-settings-spec.c | 6 + docs/api/html/NetworkManager.devhelp2 | 28 +- docs/api/html/index.html | 32 +- docs/api/html/ix01.html | 2 +- docs/api/html/ref-migrating.html | 72 +-- docs/api/html/ref-settings.html | 227 ++++++++- docs/api/html/spec.html | 111 ++++- docs/api/migrating-to-09.xml | 14 +- docs/api/settings-spec.xml | 173 ++++++- docs/api/spec.html | 111 ++++- docs/api/version.xml | 2 +- docs/libnm-glib/Makefile.am | 1 - docs/libnm-glib/Makefile.in | 10 +- docs/libnm-glib/html/NMAccessPoint.html | 38 ++ docs/libnm-glib/html/NMActiveConnection.html | 61 +++ docs/libnm-glib/html/NMClient.html | 93 +++- docs/libnm-glib/html/NMDHCP4Config.html | 8 + docs/libnm-glib/html/NMDHCP6Config.html | 8 + docs/libnm-glib/html/NMDevice.html | 73 ++- docs/libnm-glib/html/NMDeviceBt.html | 8 + docs/libnm-glib/html/NMDeviceEthernet.html | 8 + docs/libnm-glib/html/NMDeviceModem.html | 8 + docs/libnm-glib/html/NMDeviceWifi.html | 8 + docs/libnm-glib/html/NMDeviceWimax.html | 8 + docs/libnm-glib/html/NMIP4Config.html | 8 + docs/libnm-glib/html/NMIP6Config.html | 8 + docs/libnm-glib/html/NMObject.html | 8 + docs/libnm-glib/html/NMRemoteConnection.html | 17 +- docs/libnm-glib/html/NMRemoteSettings.html | 100 +++- docs/libnm-glib/html/NMSecretAgent.html | 171 ++++++- docs/libnm-glib/html/NMVPNConnection.html | 39 ++ docs/libnm-glib/html/NMWimaxNsp.html | 8 + docs/libnm-glib/html/api-index-full.html | 376 +++++++++++++- docs/libnm-glib/html/ch02.html | 2 +- docs/libnm-glib/html/index.html | 2 +- docs/libnm-glib/html/index.sgml | 33 +- docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html | 18 +- docs/libnm-glib/html/libnm-glib.devhelp2 | 15 +- docs/libnm-glib/html/object-tree.html | 4 + docs/libnm-glib/libnm-glib-sections.txt | 205 +++++++- docs/libnm-glib/libnm-glib.types | 8 + docs/libnm-glib/tmpl/libnm_glib.sgml | 2 - docs/libnm-glib/tmpl/nm-access-point.sgml | 2 - docs/libnm-glib/tmpl/nm-active-connection.sgml | 28 +- docs/libnm-glib/tmpl/nm-client.sgml | 24 +- docs/libnm-glib/tmpl/nm-device-bond.sgml | 93 ++++ docs/libnm-glib/tmpl/nm-device-bt.sgml | 2 - docs/libnm-glib/tmpl/nm-device-ethernet.sgml | 2 - .../tmpl/nm-device-infiniband-bindings.sgml | 29 ++ docs/libnm-glib/tmpl/nm-device-infiniband.sgml | 93 ++++ docs/libnm-glib/tmpl/nm-device-modem.sgml | 2 - docs/libnm-glib/tmpl/nm-device-olpc-mesh.sgml | 114 +++++ docs/libnm-glib/tmpl/nm-device-vlan.sgml | 114 +++++ docs/libnm-glib/tmpl/nm-device-wifi.sgml | 2 - docs/libnm-glib/tmpl/nm-device-wimax.sgml | 2 - docs/libnm-glib/tmpl/nm-device.sgml | 26 +- docs/libnm-glib/tmpl/nm-dhcp4-config.sgml | 2 - docs/libnm-glib/tmpl/nm-dhcp6-config.sgml | 2 - .../tmpl/nm-exported-connection-bindings.sgml | 213 ++++++++ .../tmpl/nm-exported-connection-glue.sgml | 247 ++++++++++ docs/libnm-glib/tmpl/nm-glib-enum-types.sgml | 22 + docs/libnm-glib/tmpl/nm-glib-marshal.sgml | 22 + docs/libnm-glib/tmpl/nm-ip4-config.sgml | 2 - docs/libnm-glib/tmpl/nm-ip6-config.sgml | 2 - docs/libnm-glib/tmpl/nm-object.sgml | 2 - docs/libnm-glib/tmpl/nm-remote-connection.sgml | 7 - docs/libnm-glib/tmpl/nm-remote-settings.sgml | 30 +- docs/libnm-glib/tmpl/nm-secret-agent-glue.sgml | 2 - docs/libnm-glib/tmpl/nm-secret-agent.sgml | 14 +- .../tmpl/nm-settings-system-bindings.sgml | 120 +++++ docs/libnm-glib/tmpl/nm-types.sgml | 2 - docs/libnm-glib/tmpl/nm-vpn-connection.sgml | 2 - docs/libnm-glib/tmpl/nm-vpn-enum-types.sgml | 22 + .../tmpl/nm-vpn-plugin-ui-interface.sgml | 2 - docs/libnm-glib/tmpl/nm-vpn-plugin-utils.sgml | 2 - docs/libnm-glib/tmpl/nm-vpn-plugin.sgml | 2 - docs/libnm-glib/tmpl/nm-wimax-nsp.sgml | 2 - docs/libnm-util/Makefile.in | 9 + docs/libnm-util/html/NMConnection.html | 157 +++++- docs/libnm-util/html/NMSetting.html | 124 +++-- docs/libnm-util/html/NMSetting8021x.html | 277 ++++++++--- docs/libnm-util/html/NMSettingBluetooth.html | 17 +- docs/libnm-util/html/NMSettingCdma.html | 23 +- docs/libnm-util/html/NMSettingConnection.html | 230 ++++++++- docs/libnm-util/html/NMSettingGsm.html | 55 ++- docs/libnm-util/html/NMSettingIP4Config.html | 19 +- docs/libnm-util/html/NMSettingIP6Config.html | 118 ++++- docs/libnm-util/html/NMSettingOlpcMesh.html | 15 +- docs/libnm-util/html/NMSettingPPP.html | 17 +- docs/libnm-util/html/NMSettingPPPOE.html | 23 +- docs/libnm-util/html/NMSettingSerial.html | 17 +- docs/libnm-util/html/NMSettingVPN.html | 70 ++- docs/libnm-util/html/NMSettingWimax.html | 15 +- docs/libnm-util/html/NMSettingWired.html | 15 +- docs/libnm-util/html/NMSettingWireless.html | 19 +- .../libnm-util/html/NMSettingWirelessSecurity.html | 59 ++- docs/libnm-util/html/api-index-full.html | 548 ++++++++++++++++++++- docs/libnm-util/html/ch01.html | 2 +- docs/libnm-util/html/index.sgml | 97 +++- docs/libnm-util/html/libnm-util-nm-utils.html | 178 ++++++- docs/libnm-util/html/libnm-util.devhelp2 | 85 +++- docs/libnm-util/html/object-tree.html | 19 + docs/libnm-util/libnm-util-sections.txt | 280 +++++++++-- docs/libnm-util/libnm-util.types | 19 + docs/libnm-util/tmpl/libnm-util-unused.sgml | 260 ++++++++++ docs/libnm-util/tmpl/nm-connection.sgml | 54 +- docs/libnm-util/tmpl/nm-setting-8021x.sgml | 72 ++- docs/libnm-util/tmpl/nm-setting-adsl.sgml | 262 ++++++++++ docs/libnm-util/tmpl/nm-setting-bluetooth.sgml | 9 +- docs/libnm-util/tmpl/nm-setting-bond.sgml | 228 +++++++++ docs/libnm-util/tmpl/nm-setting-cdma.sgml | 9 +- docs/libnm-util/tmpl/nm-setting-connection.sgml | 118 ++++- docs/libnm-util/tmpl/nm-setting-gsm.sgml | 9 +- docs/libnm-util/tmpl/nm-setting-infiniband.sgml | 143 ++++++ docs/libnm-util/tmpl/nm-setting-ip4-config.sgml | 9 +- docs/libnm-util/tmpl/nm-setting-ip6-config.sgml | 40 +- docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml | 9 +- docs/libnm-util/tmpl/nm-setting-ppp.sgml | 9 +- docs/libnm-util/tmpl/nm-setting-pppoe.sgml | 9 +- docs/libnm-util/tmpl/nm-setting-private.sgml | 2 - docs/libnm-util/tmpl/nm-setting-serial.sgml | 9 +- docs/libnm-util/tmpl/nm-setting-vlan.sgml | 270 ++++++++++ docs/libnm-util/tmpl/nm-setting-vpn.sgml | 27 +- docs/libnm-util/tmpl/nm-setting-wimax.sgml | 9 +- docs/libnm-util/tmpl/nm-setting-wired.sgml | 9 +- .../tmpl/nm-setting-wireless-security.sgml | 9 +- docs/libnm-util/tmpl/nm-setting-wireless.sgml | 9 +- docs/libnm-util/tmpl/nm-setting.sgml | 20 +- docs/libnm-util/tmpl/nm-utils-enum-types.sgml | 22 + docs/libnm-util/tmpl/nm-utils.sgml | 58 ++- 133 files changed, 7040 insertions(+), 561 deletions(-) create mode 100644 docs/libnm-glib/tmpl/nm-device-bond.sgml create mode 100644 docs/libnm-glib/tmpl/nm-device-infiniband-bindings.sgml create mode 100644 docs/libnm-glib/tmpl/nm-device-infiniband.sgml create mode 100644 docs/libnm-glib/tmpl/nm-device-olpc-mesh.sgml create mode 100644 docs/libnm-glib/tmpl/nm-device-vlan.sgml create mode 100644 docs/libnm-glib/tmpl/nm-exported-connection-bindings.sgml create mode 100644 docs/libnm-glib/tmpl/nm-exported-connection-glue.sgml create mode 100644 docs/libnm-glib/tmpl/nm-glib-enum-types.sgml create mode 100644 docs/libnm-glib/tmpl/nm-glib-marshal.sgml create mode 100644 docs/libnm-glib/tmpl/nm-settings-system-bindings.sgml create mode 100644 docs/libnm-glib/tmpl/nm-vpn-enum-types.sgml create mode 100644 docs/libnm-util/tmpl/nm-setting-adsl.sgml create mode 100644 docs/libnm-util/tmpl/nm-setting-bond.sgml create mode 100644 docs/libnm-util/tmpl/nm-setting-infiniband.sgml create mode 100644 docs/libnm-util/tmpl/nm-setting-vlan.sgml create mode 100644 docs/libnm-util/tmpl/nm-utils-enum-types.sgml (limited to 'docs') diff --git a/docs/Makefile.in b/docs/Makefile.in index 651d7609..ab5c8c88 100644 --- a/docs/Makefile.in +++ b/docs/Makefile.in @@ -147,6 +147,8 @@ GIO_LIBS = @GIO_LIBS@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ +GLIB_MAKEFILE = @GLIB_MAKEFILE@ +GLIB_MKENUMS = @GLIB_MKENUMS@ GMODULE_CFLAGS = @GMODULE_CFLAGS@ GMODULE_LIBS = @GMODULE_LIBS@ GMSGFMT = @GMSGFMT@ @@ -201,11 +203,15 @@ LIBNL2_LIBS = @LIBNL2_LIBS@ LIBNL3_CFLAGS = @LIBNL3_CFLAGS@ LIBNL3_LIBS = @LIBNL3_LIBS@ LIBNL_CFLAGS = @LIBNL_CFLAGS@ +LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@ +LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@ LIBNL_LIBS = @LIBNL_LIBS@ LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@ LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ +LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ +LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ @@ -216,6 +222,7 @@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ @@ -255,6 +262,8 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ +SYSTEMD_LIBS = @SYSTEMD_LIBS@ SYSTEM_CA_PATH = @SYSTEM_CA_PATH@ UDEV_BASE_DIR = @UDEV_BASE_DIR@ USE_NLS = @USE_NLS@ diff --git a/docs/api/Makefile.am b/docs/api/Makefile.am index 276b4aef..e061ec62 100644 --- a/docs/api/Makefile.am +++ b/docs/api/Makefile.am @@ -37,7 +37,7 @@ OTHER_FILES= \ GENERATED_FILES = spec.html settings-spec.xml spec.html: $(XMLS) $(OTHER_FILES) html-build.stamp - $(XSLTPROC) $(top_srcdir)/tools/doc-generator.xsl $(top_builddir)/introspection/all.xml > $@ + $(XSLTPROC) --path "$(top_builddir)/introspection:$(top_srcdir)/introspection" $(top_srcdir)/tools/doc-generator.xsl $(top_builddir)/introspection/all.xml > $@ mkdir -p $(builddir)/html/ cp $@ $(builddir)/html/ diff --git a/docs/api/Makefile.in b/docs/api/Makefile.in index cfb75153..40f1784f 100644 --- a/docs/api/Makefile.in +++ b/docs/api/Makefile.in @@ -151,6 +151,8 @@ GIO_LIBS = @GIO_LIBS@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ +GLIB_MAKEFILE = @GLIB_MAKEFILE@ +GLIB_MKENUMS = @GLIB_MKENUMS@ GMODULE_CFLAGS = @GMODULE_CFLAGS@ GMODULE_LIBS = @GMODULE_LIBS@ GMSGFMT = @GMSGFMT@ @@ -205,11 +207,15 @@ LIBNL2_LIBS = @LIBNL2_LIBS@ LIBNL3_CFLAGS = @LIBNL3_CFLAGS@ LIBNL3_LIBS = @LIBNL3_LIBS@ LIBNL_CFLAGS = @LIBNL_CFLAGS@ +LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@ +LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@ LIBNL_LIBS = @LIBNL_LIBS@ LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@ LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ +LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ +LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ @@ -220,6 +226,7 @@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ @@ -259,6 +266,8 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ +SYSTEMD_LIBS = @SYSTEMD_LIBS@ SYSTEM_CA_PATH = @SYSTEM_CA_PATH@ UDEV_BASE_DIR = @UDEV_BASE_DIR@ USE_NLS = @USE_NLS@ @@ -742,7 +751,7 @@ uninstall-am: uninstall-local @WITH_DOCS_TRUE@spec.html: $(XMLS) $(OTHER_FILES) html-build.stamp -@WITH_DOCS_TRUE@ $(XSLTPROC) $(top_srcdir)/tools/doc-generator.xsl $(top_builddir)/introspection/all.xml > $@ +@WITH_DOCS_TRUE@ $(XSLTPROC) --path "$(top_builddir)/introspection:$(top_srcdir)/introspection" $(top_srcdir)/tools/doc-generator.xsl $(top_builddir)/introspection/all.xml > $@ @WITH_DOCS_TRUE@ mkdir -p $(builddir)/html/ @WITH_DOCS_TRUE@ cp $@ $(builddir)/html/ diff --git a/docs/api/generate-settings-spec.c b/docs/api/generate-settings-spec.c index c37615b8..7a540e3b 100644 --- a/docs/api/generate-settings-spec.c +++ b/docs/api/generate-settings-spec.c @@ -46,6 +46,9 @@ #include #include #include +#include +#include +#include #include @@ -54,15 +57,18 @@ typedef NMSetting* (*SettingNewFunc) (void); static SettingNewFunc funcs[] = { nm_setting_802_1x_new, nm_setting_bluetooth_new, + nm_setting_bond_new, nm_setting_cdma_new, nm_setting_connection_new, nm_setting_gsm_new, + nm_setting_infiniband_new, nm_setting_ip4_config_new, nm_setting_ip6_config_new, nm_setting_olpc_mesh_new, nm_setting_ppp_new, nm_setting_pppoe_new, nm_setting_serial_new, + nm_setting_vlan_new, nm_setting_vpn_new, nm_setting_wimax_new, nm_setting_wired_new, diff --git a/docs/api/html/NetworkManager.devhelp2 b/docs/api/html/NetworkManager.devhelp2 index b611186d..ba5d51b3 100644 --- a/docs/api/html/NetworkManager.devhelp2 +++ b/docs/api/html/NetworkManager.devhelp2 @@ -4,23 +4,23 @@ - + - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/docs/api/html/index.html b/docs/api/html/index.html index d0f34722..2c9b8d1b 100644 --- a/docs/api/html/index.html +++ b/docs/api/html/index.html @@ -22,11 +22,11 @@     
  

-

Version 0.9.2.0 +

Version 0.9.4.0

Copyright © 2011 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 @@ -61,25 +61,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 1a38a76c..5affd5c8 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 abc58248..56c6f912 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 @@ -160,7 +160,8 @@ service names are no longer used. Instead NetworkManager provides the settings service using its own D-Bus service name, org.freedesktop.NetworkManager. The object path of - the settings service remains unchanged. + the settings service has also changed to + /org/freedesktop/NetworkManager/Settings.

Additionally, the D-Bus interface of the settings service has changed @@ -177,18 +178,19 @@ and CanModify properties.

- Action: change the service name that - your application uses to request system network settings to - org.freedesktop.NetworkManager, and update the D-Bus - interface that codes uses to talk to the settings service to - + Action: change the service name and + object path that your application uses to request system network settings + to org.freedesktop.NetworkManager and + /org/freedesktop/NetworkManager/Settings respectively, + and update the D-Bus interface that codes uses to talk to the settings + service to org.freedesktop.NetworkManager.Settings. Listen for hostname changes using the new interface name as well.

-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 @@ -222,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 @@ -254,7 +256,7 @@ are now string-based permissions. The mapping is as follows:

-

Table 17. 

+

Table 20. 

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

-AddConnection Returns Object Path of New Connection

+AddConnection Returns Object Path of New Connection

The org.freedesktop.NetworkManager.Settings.AddConnection @@ -323,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 @@ -346,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. @@ -361,7 +363,7 @@

-New Active Connection State

+New Active Connection State

Along with the new device states, an additional @@ -377,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 @@ -413,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 @@ -422,7 +424,7 @@ following values:

-

Table 18. 

+

Table 21. 

@@ -484,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 @@ -494,7 +496,7 @@ their replacements:

-

Table 19. 

+

Table 22. 

diff --git a/docs/api/html/ref-settings.html b/docs/api/html/ref-settings.html index b1737585..7278b958 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

@@ -79,6 +79,12 @@ + + + + + + @@ -181,6 +187,18 @@ + + + + + + + + + + + + @@ -228,7 +246,7 @@


-

Table 2. bluetooth setting

+

Table 2. bluetooth setting

Anonymous identity string for EAP authentication methods. Used as the unencrypted identity with EAP types that support different tunneled identity like EAP-TTLS. 
pac-file
string
UTF-8 encoded file path containing PAC for EAP-FAST.

 
ca-cert

 
byte array

 
[]
Flags indicating how to handle the 802.1x password. (see the section called “Secret flag types” for flag values)
 

 
password-raw
byte array
[]
Password used for EAP authentication methods as a byte array
password-raw-flags
uint32
0
Flags indicating how to handle the 802.1x password byte array. (see the section called “Secret flag types” for flag values)

 
private-key

 
byte array

 
[]

 
@@ -267,7 +285,46 @@
 


 

-
Table 3. cdma setting

+
Table 3. bond setting

+

 
 

 

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






Key NameValue TypeDefault ValueValue Description
name
string
bond
The setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
interface-name
string
The name of the virtual in-kernel bonding network interface
options
dict of (string::string)
[ ]
Dictionary of key/value pairs of bonding options.  Both keys and values must be strings.  Option names must contain only alphanumeric characters (ie, [a-zA-Z0-9]).

+

+


+

+

+
Table 4. cdma setting

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


 

-
Table 4. connection setting

+
Table 5. connection setting

 

 
 

 
@@ -381,13 +438,31 @@
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

 
 

FALSE

 If TRUE, the connection is read-only and cannot be changed by the user or any other mechanism.  This is normally set for system connections whose plugin cannot yet write updated connections back out.
 
zone
string
The trust level of a the connection.Free form case-insensitive string (for example "Home", "Work", "Public").  NULL or unspecified zone means the connection will be placed in the default zone as defined by the firewall.
master
string
Interface name of the master device or UUID of the master connection
slave-type
string
Setting name describing the type of slave this connection is (ie, 'bond') or NULL if this connection is not a slave.

 
 

 

 


 

 

-
Table 5. gsm setting

+
Table 6. gsm setting

 
@@ -480,7 +555,52 @@
 


 

-
Table 6. ipv4 setting

+
Table 7. infiniband setting

+

 
 

 

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






Key NameValue TypeDefault ValueValue Description
name
string
infiniband
The setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
mac-address
byte array
[]
If specified, this connection will only apply to the IPoIB device whose permanent MAC address matches.  This property does not change the MAC address of the device (i.e. MAC spoofing).
mtu
uint32
0
If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple frames.
transport-mode
string
The IPoIB transport mode. Either 'datagram' or 'connected'.

+

+


+

+

+
Table 8. ipv4 setting

 
@@ -570,7 +690,7 @@
 
-
+
@@ -579,7 +699,7 @@
 


 

-
Table 7. ipv6 setting

+
Table 9. ipv6 setting

 

 
 


 
may-fail

 
boolean
FALSE
TRUE

 If TRUE, allow overall network configuration to proceed even if IPv4 configuration times out. Note that at least one IP configuration must succeed or overall network configuration will still fail.  For example, in IPv6-only networks, setting this property to TRUE allows the overall network configuration to succeed if IPv4 configuration fails but IPv6 configuration completes successfully.
 

 
 
@@ -654,13 +774,19 @@
 
+
+
+
+
+
+

 
 

TRUE

 If TRUE, allow overall network configuration to proceed even if IPv6 configuration times out. Note that at least one IP configuration must succeed or overall network configuration will still fail.  For example, in IPv4-only networks, setting this property to TRUE allows the overall network configuration to succeed if IPv6 configuration fails but IPv4 configuration completes successfully.
 
ip6-privacy
int32
-1
Configure IPv6 Privacy Extensions for SLAAC, described in RFC4941.  If enabled, it makes the kernel generate a temporary IPv6 address in addition to the public one generated from MAC address via modified EUI-64.  This enhances privacy, but could cause problems in some applications, on the other hand.  The permitted values are: 0: disabled, 1: enabled (prefer public address), 2: enabled (prefer temporary addresses).

 
 

 

 


 

 

-
Table 8. 802-11-olpc-mesh setting

+
Table 10. 802-11-olpc-mesh setting

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


 

-
Table 9. ppp setting

+
Table 11. ppp setting

 

 
 

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


 

-
Table 10. pppoe setting

+
Table 12. pppoe setting

 

 
 

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


 

-
Table 11. serial setting

+
Table 13. serial setting

 

 
 

 
@@ -948,7 +1074,70 @@
 


 

-
Table 12. vpn setting

+
Table 14. vlan setting

+

 
 

 

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






Key NameValue TypeDefault ValueValue Description
name
string
vlan
The setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
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.
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.
id
uint32
0
The VLAN indentifier the interface created by this connection should be assigned.
flags
uint32
0
One or more flags which control the behavior and features of the VLAN interface.  Flags include reordering of output packet headers (0x01), use of the GVRP protocol (0x02), and loose binding of the interface to its master device's operating state (0x04).
ingress-priority-map
array of string
[]
For incoming packets, a list of mappings from 802.1p priorities to Linux SKB priorities.  The mapping is given in the format 'from:to' where both 'from' and 'to' are unsigned integers, ie '7:3'.
egress-priority-map
array of string
[]
For outgoing packets, a list of mappings from Linux SKB priorities to 802.1p priorities.  The mapping is given in the format 'from:to' where both 'from' and 'to' are unsigned integers, ie '7:3'.

+

+


+

+

+
Table 15. vpn setting

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


 

-
Table 13. wimax setting

+
Table 16. wimax setting

 

 
 

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


 

-
Table 14. 802-3-ethernet setting

+
Table 17. 802-3-ethernet setting

 

 
 

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


 

-
Table 15. 802-11-wireless setting

+
Table 18. 802-11-wireless setting

 

 
 

 
@@ -1236,7 +1425,7 @@
 


 

-
Table 16. 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 eb0a828b..a75799e7 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.2.0
NetworkManager D-Bus Interface Specification
Version 0.9.2.0
Copyright (C) 2008 - 2011 Red Hat, Inc.
Copyright (C) 2008 - 2009 Novell, Inc.

+        
NetworkManager D-Bus Interface Specification
Version 0.9.4.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
@@ -112,7 +112,7 @@ General Public License for more details.

 
You should have received a copy of the GNU Lesser General Public
 License along with this library; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

-
Interfaces

+
Interfaces
org.freedesktop.NetworkManager
Methods:
GetDevices (
         
         ) →
@@ -477,6 +477,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.NM_DEVICE_STATE)
     

         The current state of the device.
+      
StateReason -
+      (uu) -
+      (read)
+      (NM_DEVICE_STATE_REASON_STRUCT)
+    

+        The current state and reason for changing to that state.
       
ActiveConnection -
       o -
       (read)

@@ -559,6 +565,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
NM_DEVICE_TYPE_INFINIBAND = 9

+          The device is an IP-capable InfiniBand interface.
+        
NM_DEVICE_TYPE_BOND = 10

+          The device is a bond master interface.
+        
NM_DEVICE_TYPE_VLAN = 11

+          The device is a VLAN interface.
         
NM_DEVICE_STATE_REASON
NM_DEVICE_STATE_REASON_UNKNOWN = 0

           The reason for the device state change is unknown.
         
NM_DEVICE_STATE_REASON_NONE = 1

@@ -649,7 +661,33 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
NM_DEVICE_STATE_REASON_BT_FAILED = 44

           The Bluetooth connection timed out or failed.
-        
Sets of flags:
NM_DEVICE_CAP
NM_DEVICE_CAP_NONE = 0x0
Null capability.
NM_DEVICE_CAP_NM_SUPPORTED = 0x1
The device is supported by NetworkManager.
NM_DEVICE_CAP_CARRIER_DETECT = 0x2
The device supports carrier detection.

+        
NM_DEVICE_STATE_REASON_GSM_SIM_NOT_INSERTED = 45

+          GSM Modem's SIM Card not inserted.
+        
NM_DEVICE_STATE_REASON_GSM_SIM_PIN_REQUIRED = 46

+          GSM Modem's SIM Pin required.
+        
NM_DEVICE_STATE_REASON_GSM_SIM_PUK_REQUIRED = 47

+          GSM Modem's SIM Puk required.
+        
NM_DEVICE_STATE_REASON_GSM_SIM_WRONG = 48

+          GSM Modem's SIM wrong
+        
NM_DEVICE_STATE_REASON_INFINIBAND_MODE = 49

+          InfiniBand device does not support connected mode.
+        
NM_DEVICE_STATE_REASON_DEPENDENCY_FAILED = 50

+          A dependency of the connection failed.
+        
Sets of flags:
NM_DEVICE_CAP
NM_DEVICE_CAP_NONE = 0x0
Null capability.
NM_DEVICE_CAP_NM_SUPPORTED = 0x1
The device is supported by NetworkManager.
NM_DEVICE_CAP_CARRIER_DETECT = 0x2
The device supports carrier detection.
Structure types:
NM_DEVICE_STATE_REASON_STRUCT - (
+        u: state, u: reason
+        )
+      
Arrays of NM_DEVICE_STATE_REASON_STRUCT don't generally
+            make sense.
Members
state -
+      u
+      (NM_DEVICE_STATE)
+    

+          The device state.
+        
reason -
+      u
+      (NM_DEVICE_STATE_REASON)
+    

+          The reason for originally changing to the device state.
+        

 
   
org.freedesktop.NetworkManager.Device.Wired
Interface has no methods.
Signals:
PropertiesChanged (
         a{sv}: properties
@@ -897,6 +935,61 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
+  
org.freedesktop.NetworkManager.Device.Infiniband
Interface has no methods.
Signals:
PropertiesChanged (
+        a{sv}: properties
+        )
Parameters
properties -
+      a{sv}
+      (String_Variant_Map)
+    

+                A dictionary mapping property names to variant boxed values
+            
Properties:
HwAddress -
+      s -
+      (read)

+        Hardware address of the device.
+      
Carrier -
+      b -
+      (read)

+        Indicates whether the physical carrier is found (e.g. whether a cable is plugged in or not).
+      

+
+  
org.freedesktop.NetworkManager.Device.Bond
Interface has no methods.
Signals:
PropertiesChanged (
+        a{sv}: properties
+        )
Parameters
properties -
+      a{sv}
+      (String_Variant_Map)
+    

+                A dictionary mapping property names to variant boxed values
+            
Properties:
HwAddress -
+      s -
+      (read)

+        Hardware address of the device.
+      
Carrier -
+      b -
+      (read)

+        Indicates whether the physical carrier is found (e.g. whether a cable is plugged in or not).
+      

+
+  
org.freedesktop.NetworkManager.Device.Vlan
Interface has no methods.
Signals:
PropertiesChanged (
+        a{sv}: properties
+        )
Parameters
properties -
+      a{sv}
+      (String_Variant_Map)
+    

+                A dictionary mapping property names to variant boxed values
+            
Properties:
HwAddress -
+      s -
+      (read)

+        Hardware address of the device.
+      
Carrier -
+      b -
+      (read)

+        Indicates whether the physical carrier is found (e.g. whether a cable is plugged in or not).
+      
VlanId -
+      u -
+      (read)

+        The VLAN ID of this VLAN interface.
+      

+
   
org.freedesktop.NetworkManager.WiMax.Nsp
Interface has no methods.
Signals:
PropertiesChanged (
         a{sv}: properties
         )
Parameters
properties -
@@ -1135,7 +1228,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.b -
       (read)
Whether this active connection is the default IPv6 connection, i.e. whether it currently owns the default IPv6 route.
Vpn -
       b -
-      (read)
Whether this active connection is also a VPN connection.
Enumerated types:
NM_ACTIVE_CONNECTION_STATE
NM_ACTIVE_CONNECTION_STATE_UNKNOWN = 0

+      (read)
Whether this active connection is also a VPN connection.
Master -
+      o -
+      (read)
The path to the master device if the connection is a slave.
Enumerated types:
NM_ACTIVE_CONNECTION_STATE
NM_ACTIVE_CONNECTION_STATE_UNKNOWN = 0

           The active connection is in an unknown state.
         
NM_ACTIVE_CONNECTION_STATE_ACTIVATING = 1

           The connection is activating.
@@ -1502,7 +1597,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.org.freedesktop.NetworkManager.VPN.Error.BadArgumentsInvalid arguments were passed with the request.  FIXME: too general.
   
org.freedesktop.NetworkManager.VPN.Error.LaunchFailed
A binary providing the service failed to launch.
   
org.freedesktop.NetworkManager.VPN.Error.ConnectionInvalid
The request could not be processed because the VPN connection settings were invalid.
-
Index
Index of interfaces
Index of types

 
 

   

+
+  bond setting
+  
+    
+      
+        Key Name
+        Value Type
+        Default Value
+        Value Description
+      
+    
+    
+      
+        name
+        string
+        bond
+        The setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
+      
+      
+        interface-name
+        string
+        
+        The name of the virtual in-kernel bonding network interface
+      
+      
+        options
+        dict of (string::string)
+        [ ]
+        Dictionary of key/value pairs of bonding options.  Both keys and values must be strings.  Option names must contain only alphanumeric characters (ie, [a-zA-Z0-9]).
+      
+    
+  
+

 cdma setting
@@ -325,6 +376,24 @@
         FALSE
         If TRUE, the connection is read-only and cannot be changed by the user or any other mechanism.  This is normally set for system connections whose plugin cannot yet write updated connections back out.
       
+      
+        zone
+        string
+        
+        The trust level of a the connection.Free form case-insensitive string (for example "Home", "Work", "Public").  NULL or unspecified zone means the connection will be placed in the default zone as defined by the firewall.
+      
+      
+        master
+        string
+        
+        Interface name of the master device or UUID of the master connection
+      
+      
+        slave-type
+        string
+        
+        Setting name describing the type of slave this connection is (ie, 'bond') or NULL if this connection is not a slave.
+      
     
   

   
   
 

@@ -415,6 +484,45 @@
     
   
 
+
+  infiniband setting
+  
+    
+      
+        Key Name
+        Value Type
+        Default Value
+        Value Description
+      
+    
+    
+      
+        name
+        string
+        infiniband
+        The setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
+      
+      
+        mac-address
+        byte array
+        []
+        If specified, this connection will only apply to the IPoIB device whose permanent MAC address matches.  This property does not change the MAC address of the device (i.e. MAC spoofing).
+      
+      
+        mtu
+        uint32
+        0
+        If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple frames.
+      
+      
+        transport-mode
+        string
+        
+        The IPoIB transport mode. Either 'datagram' or 'connected'.
+      
+    
+  
+

 ipv4 setting
@@ -502,7 +610,7 @@
       
         may-fail
         boolean
-        FALSE
+        TRUE
         If TRUE, allow overall network configuration to proceed even if IPv4 configuration times out. Note that at least one IP configuration must succeed or overall network configuration will still fail.  For example, in IPv6-only networks, setting this property to TRUE allows the overall network configuration to succeed if IPv4 configuration fails but IPv6 configuration completes successfully.
       
     
@@ -580,6 +688,12 @@
         TRUE
         If TRUE, allow overall network configuration to proceed even if IPv6 configuration times out. Note that at least one IP configuration must succeed or overall network configuration will still fail.  For example, in IPv4-only networks, setting this property to TRUE allows the overall network configuration to succeed if IPv6 configuration fails but IPv4 configuration completes successfully.
       
+      
+        ip6-privacy
+        int32
+        -1
+        Configure IPv6 Privacy Extensions for SLAAC, described in RFC4941.  If enabled, it makes the kernel generate a temporary IPv6 address in addition to the public one generated from MAC address via modified EUI-64.  This enhances privacy, but could cause problems in some applications, on the other hand.  The permitted values are: 0: disabled, 1: enabled (prefer public address), 2: enabled (prefer temporary addresses).
+      
     
   

   
   
 

@@ -847,6 +961,63 @@
     
   
 
+
+  vlan setting
+  
+    
+      
+        Key Name
+        Value Type
+        Default Value
+        Value Description
+      
+    
+    
+      
+        name
+        string
+        vlan
+        The setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
+      
+      
+        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.
+      
+      
+        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.
+      
+      
+        id
+        uint32
+        0
+        The VLAN indentifier the interface created by this connection should be assigned.
+      
+      
+        flags
+        uint32
+        0
+        One or more flags which control the behavior and features of the VLAN interface.  Flags include reordering of output packet headers (0x01), use of the GVRP protocol (0x02), and loose binding of the interface to its master device's operating state (0x04).
+      
+      
+        ingress-priority-map
+        array of string
+        []
+        For incoming packets, a list of mappings from 802.1p priorities to Linux SKB priorities.  The mapping is given in the format 'from:to' where both 'from' and 'to' are unsigned integers, ie '7:3'.
+      
+      
+        egress-priority-map
+        array of string
+        []
+        For outgoing packets, a list of mappings from Linux SKB priorities to 802.1p priorities.  The mapping is given in the format 'from:to' where both 'from' and 'to' are unsigned integers, ie '7:3'.
+      
+    
+  
+

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

+        
NetworkManager D-Bus Interface Specification
Version 0.9.4.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
@@ -112,7 +112,7 @@ General Public License for more details.

 
You should have received a copy of the GNU Lesser General Public
 License along with this library; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

-
Interfaces

+
Interfaces

   
org.freedesktop.NetworkManager
Methods:
GetDevices (
         
         ) →
@@ -477,6 +477,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.NM_DEVICE_STATE)
     

         The current state of the device.
+      
StateReason -
+      (uu) -
+      (read)
+      (NM_DEVICE_STATE_REASON_STRUCT)
+    

+        The current state and reason for changing to that state.
       
ActiveConnection -
       o -
       (read)

@@ -559,6 +565,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
NM_DEVICE_TYPE_INFINIBAND = 9

+          The device is an IP-capable InfiniBand interface.
+        
NM_DEVICE_TYPE_BOND = 10

+          The device is a bond master interface.
+        
NM_DEVICE_TYPE_VLAN = 11

+          The device is a VLAN interface.
         
NM_DEVICE_STATE_REASON
NM_DEVICE_STATE_REASON_UNKNOWN = 0

           The reason for the device state change is unknown.
         
NM_DEVICE_STATE_REASON_NONE = 1

@@ -649,7 +661,33 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
NM_DEVICE_STATE_REASON_BT_FAILED = 44

           The Bluetooth connection timed out or failed.
-        
Sets of flags:
NM_DEVICE_CAP
NM_DEVICE_CAP_NONE = 0x0
Null capability.
NM_DEVICE_CAP_NM_SUPPORTED = 0x1
The device is supported by NetworkManager.
NM_DEVICE_CAP_CARRIER_DETECT = 0x2
The device supports carrier detection.

+        
NM_DEVICE_STATE_REASON_GSM_SIM_NOT_INSERTED = 45

+          GSM Modem's SIM Card not inserted.
+        
NM_DEVICE_STATE_REASON_GSM_SIM_PIN_REQUIRED = 46

+          GSM Modem's SIM Pin required.
+        
NM_DEVICE_STATE_REASON_GSM_SIM_PUK_REQUIRED = 47

+          GSM Modem's SIM Puk required.
+        
NM_DEVICE_STATE_REASON_GSM_SIM_WRONG = 48

+          GSM Modem's SIM wrong
+        
NM_DEVICE_STATE_REASON_INFINIBAND_MODE = 49

+          InfiniBand device does not support connected mode.
+        
NM_DEVICE_STATE_REASON_DEPENDENCY_FAILED = 50

+          A dependency of the connection failed.
+        
Sets of flags:
NM_DEVICE_CAP
NM_DEVICE_CAP_NONE = 0x0
Null capability.
NM_DEVICE_CAP_NM_SUPPORTED = 0x1
The device is supported by NetworkManager.
NM_DEVICE_CAP_CARRIER_DETECT = 0x2
The device supports carrier detection.
Structure types:
NM_DEVICE_STATE_REASON_STRUCT - (
+        u: state, u: reason
+        )
+      
Arrays of NM_DEVICE_STATE_REASON_STRUCT don't generally
+            make sense.
Members
state -
+      u
+      (NM_DEVICE_STATE)
+    

+          The device state.
+        
reason -
+      u
+      (NM_DEVICE_STATE_REASON)
+    

+          The reason for originally changing to the device state.
+        

 
   
org.freedesktop.NetworkManager.Device.Wired
Interface has no methods.
Signals:
PropertiesChanged (
         a{sv}: properties
@@ -897,6 +935,61 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
+  
org.freedesktop.NetworkManager.Device.Infiniband
Interface has no methods.
Signals:
PropertiesChanged (
+        a{sv}: properties
+        )
Parameters
properties -
+      a{sv}
+      (String_Variant_Map)
+    

+                A dictionary mapping property names to variant boxed values
+            
Properties:
HwAddress -
+      s -
+      (read)

+        Hardware address of the device.
+      
Carrier -
+      b -
+      (read)

+        Indicates whether the physical carrier is found (e.g. whether a cable is plugged in or not).
+      

+
+  
org.freedesktop.NetworkManager.Device.Bond
Interface has no methods.
Signals:
PropertiesChanged (
+        a{sv}: properties
+        )
Parameters
properties -
+      a{sv}
+      (String_Variant_Map)
+    

+                A dictionary mapping property names to variant boxed values
+            
Properties:
HwAddress -
+      s -
+      (read)

+        Hardware address of the device.
+      
Carrier -
+      b -
+      (read)

+        Indicates whether the physical carrier is found (e.g. whether a cable is plugged in or not).
+      

+
+  
org.freedesktop.NetworkManager.Device.Vlan
Interface has no methods.
Signals:
PropertiesChanged (
+        a{sv}: properties
+        )
Parameters
properties -
+      a{sv}
+      (String_Variant_Map)
+    

+                A dictionary mapping property names to variant boxed values
+            
Properties:
HwAddress -
+      s -
+      (read)

+        Hardware address of the device.
+      
Carrier -
+      b -
+      (read)

+        Indicates whether the physical carrier is found (e.g. whether a cable is plugged in or not).
+      
VlanId -
+      u -
+      (read)

+        The VLAN ID of this VLAN interface.
+      

+
   
org.freedesktop.NetworkManager.WiMax.Nsp
Interface has no methods.
Signals:
PropertiesChanged (
         a{sv}: properties
         )
Parameters
properties -
@@ -1135,7 +1228,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.b -
       (read)
Whether this active connection is the default IPv6 connection, i.e. whether it currently owns the default IPv6 route.
Vpn -
       b -
-      (read)
Whether this active connection is also a VPN connection.
Enumerated types:
NM_ACTIVE_CONNECTION_STATE
NM_ACTIVE_CONNECTION_STATE_UNKNOWN = 0

+      (read)
Whether this active connection is also a VPN connection.
Master -
+      o -
+      (read)
The path to the master device if the connection is a slave.
Enumerated types:
NM_ACTIVE_CONNECTION_STATE
NM_ACTIVE_CONNECTION_STATE_UNKNOWN = 0

           The active connection is in an unknown state.
         
NM_ACTIVE_CONNECTION_STATE_ACTIVATING = 1

           The connection is activating.
@@ -1502,7 +1597,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.org.freedesktop.NetworkManager.VPN.Error.BadArgumentsInvalid arguments were passed with the request.  FIXME: too general.
   
org.freedesktop.NetworkManager.VPN.Error.LaunchFailed
A binary providing the service failed to launch.
   
org.freedesktop.NetworkManager.VPN.Error.ConnectionInvalid
The request could not be processed because the VPN connection settings were invalid.
-
Index
Index of interfaces
Index of types

   
   

@@ -80,6 +82,12 @@ const 
+
Implemented Interfaces

+

+NMAccessPoint implements
+ GInitable and  GAsyncInitable.

+

+

 
Properties

 
   "bssid"                    gchar*                : Read
@@ -211,7 +219,31 @@ const gboolean            nm_access_point_connection_valid    (NMAccessPoint *ap,
                                                          NMConnection *connection);

 

+Validates a given connection against a given WiFi access point to ensure that
+the connection may be activated with that AP.  The connection must match the
+ap's SSID, (if given) BSSID, and other attributes like security settings,
+channel, band, etc.
 

+

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


ap :
an NMAccessPoint to validate connection against
connection :
an NMConnection to validate against ap
+
Returns :

+TRUE if the connection may be activated with this WiFi AP,
+FALSE if it cannot be.

 

 

 

@@ -224,6 +256,12 @@ return connections which may be activated with the access point.  Any
 returned connections will match the ap's SSID and (if given) BSSID and
 other attributes like security settings, channel, etc.
 

+

+To obtain the list of connections that are compatible with this access point,
+use nm_remote_settings_list_connections() and then filter the returned list
+for a given NMDevice using nm_device_filter_connections() and finally
+filter that list with this function.
+

 

diff --git a/docs/libnm-glib/html/NMActiveConnection.html b/docs/libnm-glib/html/NMActiveConnection.html
index 15d628d7..17ebafd4 100644
--- a/docs/libnm-glib/html/NMActiveConnection.html
+++ b/docs/libnm-glib/html/NMActiveConnection.html
@@ -27,6 +27,8 @@
                    | 
                   Object Hierarchy
                    | 
+                  Implemented Interfaces
+                   | 
                   Properties

 
 
 
 

@@ -47,6 +49,7 @@
 #define             NM_ACTIVE_CONNECTION_DEFAULT
 #define             NM_ACTIVE_CONNECTION_DEFAULT6
 #define             NM_ACTIVE_CONNECTION_DEVICES
+#define             NM_ACTIVE_CONNECTION_MASTER
 #define             NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT
 #define             NM_ACTIVE_CONNECTION_STATE
 #define             NM_ACTIVE_CONNECTION_UUID
@@ -54,6 +57,7 @@ const char *        gboolean            nm_active_connection_get_default    (NMActiveConnection *connection);
 gboolean            nm_active_connection_get_default6   (NMActiveConnection *connection);
 const GPtrArray *   nm_active_connection_get_devices    (NMActiveConnection *connection);
+const char *        nm_active_connection_get_master     (NMActiveConnection *connection);
 const char *        nm_active_connection_get_specific_object
                                                         (NMActiveConnection *connection);
 NMActiveConnectionState nm_active_connection_get_state  (NMActiveConnection *connection);
@@ -72,14 +76,22 @@ const char *        
+
Implemented Interfaces

+

+NMActiveConnection implements
+ GInitable and  GAsyncInitable.

+

+

 
Properties

 
   "connection"               gchar*                : Read
   "default"                  gboolean              : Read
   "default6"                 gboolean              : Read
   "devices"                  NMObjectArray*        : Read
+  "master"                   gchar*                : Read
   "specific-object"          gchar*                : Read
   "state"                    guint                 : Read
+  "uuid"                     gchar*                : Read
 

 

 

@@ -147,6 +159,14 @@ const char *        
+
NM_ACTIVE_CONNECTION_MASTER

+
#define NM_ACTIVE_CONNECTION_MASTER              "master"
+

+

+

+

+

+

 
NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT

 
#define NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT     "specific-object"
 

@@ -266,6 +286,29 @@ This is the internal copy used by the connection, and must not be modified. 
 

 

+
nm_active_connection_get_master ()

+
const char *        nm_active_connection_get_master     (NMActiveConnection *connection);

+

+Gets the path to the master NMDevice of the connection.
+

+

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


connection :
a NMActiveConnection
+
Returns :
the path of the master NMDevice of the NMActiveConnection.
+This is the internal string used by the connection, and must not be modified.

+

+

+

 
nm_active_connection_get_specific_object ()

 
const char *        nm_active_connection_get_specific_object
                                                         (NMActiveConnection *connection);

@@ -398,6 +441,15 @@ Whether the active connection is the default IPv6 one.
 

 

 

+
The "master" property

+
  "master"                   gchar*                : Read

+

+The path of the master device if one exists.
+

+
Default value: NULL

+

+

+

 
The "specific-object" property

 
  "specific-object"          gchar*                : Read

 

@@ -415,6 +467,15 @@ The state of the active connection.
 
Allowed values: <= 3

 
Default value: 0

 

+

+

+
The "uuid" property

+
  "uuid"                     gchar*                : Read

+

+The active connection's UUID
+

+
Default value: NULL

+

 

 

 

diff --git a/docs/libnm-glib/html/NMClient.html b/docs/libnm-glib/html/NMClient.html
index 81015347..7133c489 100644
--- a/docs/libnm-glib/html/NMClient.html
+++ b/docs/libnm-glib/html/NMClient.html
@@ -27,6 +27,8 @@
                    | 
                   Object Hierarchy
                    | 
+                  Implemented Interfaces
+                   | 
                   Properties
                    | 
                   Signals
@@ -98,8 +100,13 @@ const char *        void                nm_client_networking_set_enabled    (NMClient *client,
                                                          gboolean enabled);
 NMClient *          nm_client_new                       (void);
+void                nm_client_new_async                 (GCancellable *cancellable,
+                                                         GAsyncReadyCallback callback,
+                                                         gpointer user_data);
+NMClient *          nm_client_new_finish                (GAsyncResult *result,
+                                                         GError **error);
 void                nm_client_sleep                     (NMClient *client,
-                                                         gboolean sleep);
+                                                         gboolean sleep_);
 gboolean            nm_client_wimax_get_enabled         (NMClient *client);
 gboolean            nm_client_wimax_hardware_get_enabled
                                                         (NMClient *client);
@@ -125,6 +132,12 @@ const char *        
+
Implemented Interfaces

+

+NMClient implements
+ GInitable and  GAsyncInitable.

+

+

 
Properties

 
   "active-connections"       NMObjectArray*        : Read
@@ -734,6 +747,16 @@ all controlled interfaces are available for activation.
 

 Creates a new NMClient.
 

+

+Note that this will do blocking D-Bus calls to initialize the
+client. You can use nm_client_new_async() if you want to avoid
+that.
+

+

+NOTE: NMClient provides information about devices and a mechanism to
+control them.  To access and modify network configuration data, use the
+NMRemoteSettings object.
+

 

@@ -745,9 +768,73 @@ Creates a new 
 

 

+
nm_client_new_async ()

+
void                nm_client_new_async                 (GCancellable *cancellable,
+                                                         GAsyncReadyCallback callback,
+                                                         gpointer user_data);

+

+Creates a new NMClient and begins asynchronously initializing it.
+callback will be called when it is done; use
+nm_client_new_finish() to get the result.
+

+

+NOTE: NMClient provides information about devices and a mechanism to
+control them.  To access and modify network configuration data, use the
+NMRemoteSettings object.
+

+

 
 

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


cancellable :
a GCancellable, or NULL
+
callback :
callback to call when the client is created
user_data :
data for callback
+

+

+

+

+
nm_client_new_finish ()

+
NMClient *          nm_client_new_finish                (GAsyncResult *result,
+                                                         GError **error);

+

+Gets the result of an nm_client_new_async() call.
+

+

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


result :
a GAsyncResult
+
error :
location for a GError, or NULL
+
Returns :
a new NMClient, or NULL on error

+

+

+

 
nm_client_sleep ()

 
void                nm_client_sleep                     (NMClient *client,
-                                                         gboolean sleep);

+                                                         gboolean sleep_);
 

 Deprecated; use nm_client_networking_set_enabled() instead.
 

@@ -760,7 +847,7 @@ Deprecated; use sleep :

+
sleep_ :

 
 TRUE to put the daemon to sleep
 
diff --git a/docs/libnm-glib/html/NMDHCP4Config.html b/docs/libnm-glib/html/NMDHCP4Config.html
index 902e6f06..597e818d 100644
--- a/docs/libnm-glib/html/NMDHCP4Config.html
+++ b/docs/libnm-glib/html/NMDHCP4Config.html
@@ -27,6 +27,8 @@
                    | 
                   Object Hierarchy
                    | 
+                  Implemented Interfaces
+                   | 
                   Properties
 
 
@@ -60,6 +62,12 @@ const char *        
+
Implemented Interfaces

+

+NMDHCP4Config implements
+ GInitable and  GAsyncInitable.

+

+

 
Properties

 
   "options"                  GHashTable*           : Read
diff --git a/docs/libnm-glib/html/NMDHCP6Config.html b/docs/libnm-glib/html/NMDHCP6Config.html
index 757e6cdf..a6be2c66 100644
--- a/docs/libnm-glib/html/NMDHCP6Config.html
+++ b/docs/libnm-glib/html/NMDHCP6Config.html
@@ -27,6 +27,8 @@
                    | 
                   Object Hierarchy
                    | 
+                  Implemented Interfaces
+                   | 
                   Properties
 
 
@@ -60,6 +62,12 @@ const char *        
+
Implemented Interfaces

+

+NMDHCP6Config implements
+ GInitable and  GAsyncInitable.

+

+

 
Properties

 
   "options"                  GHashTable*           : Read
diff --git a/docs/libnm-glib/html/NMDevice.html b/docs/libnm-glib/html/NMDevice.html
index 0ffed799..e507f9e0 100644
--- a/docs/libnm-glib/html/NMDevice.html
+++ b/docs/libnm-glib/html/NMDevice.html
@@ -27,6 +27,8 @@
                    | 
                   Object Hierarchy
                    | 
+                  Implemented Interfaces
+                   | 
                   Properties
                    | 
                   Signals
@@ -62,6 +64,7 @@
 #define             NM_DEVICE_MANAGED
 #define             NM_DEVICE_PRODUCT
 #define             NM_DEVICE_STATE
+#define             NM_DEVICE_STATE_REASON
 #define             NM_DEVICE_UDI
 #define             NM_DEVICE_VENDOR
 gboolean            nm_device_connection_valid          (NMDevice *device,
@@ -85,6 +88,8 @@ const char *        gboolean            nm_device_get_managed               (NMDevice *device);
 const char *        nm_device_get_product               (NMDevice *device);
 NMDeviceState       nm_device_get_state                 (NMDevice *device);
+NMDeviceState       nm_device_get_state_reason          (NMDevice *device,
+                                                         NMDeviceStateReason *reason);
 const char *        nm_device_get_udi                   (NMDevice *device);
 const char *        nm_device_get_vendor                (NMDevice *device);
 GObject *           nm_device_new                       (DBusGConnection *connection,
@@ -102,14 +107,24 @@ const char *        NMDeviceModem
                +----NMDeviceBt
                +----NMDeviceWimax
+               +----NMDeviceOlpcMesh
+               +----NMDeviceInfiniband
+               +----NMDeviceBond
+               +----NMDeviceVlan
 

 

 

+
Implemented Interfaces

+

+NMDevice implements
+ GInitable and  GAsyncInitable.

+

+

 
Properties

 
   "active-connection"        NMActiveConnection*   : Read
   "capabilities"             guint                 : Read
-  "device-type"              guint                 : Read / Write / Construct Only
+  "device-type"              guint                 : Read
   "dhcp4-config"             NMDHCP4Config*        : Read
   "dhcp6-config"             NMDHCP6Config*        : Read
   "driver"                   gchar*                : Read
@@ -121,6 +136,7 @@ const char *        managed"                  gboolean              : Read
   "product"                  gchar*                : Read
   "state"                    guint                 : Read
+  "state-reason"             GValueArray_guint+guint_*  : Read
   "udi"                      gchar*                : Read
   "vendor"                   gchar*                : Read
 

@@ -156,8 +172,9 @@ const char *        char *        
+
NM_DEVICE_STATE_REASON

+
#define NM_DEVICE_STATE_REASON "state-reason"
+

+

+

+

+

+

 
NM_DEVICE_UDI

 
#define NM_DEVICE_UDI "udi"
 

@@ -388,7 +413,8 @@ is a WiFi device that supports only WEP encryption, the returned list will
 contain any WiFi connections in connections that allow connection to
 unencrypted or WEP-enabled SSIDs.  The returned list will not contain
 Ethernet, Bluetooth, WiFi WPA connections, or any other connection that is
-incompatible with the device.
+incompatible with the device. To get the full list of connections see
+nm_remote_settings_list_connections().
 

 
@@ -741,6 +767,35 @@ Gets the current 
 

 

+
nm_device_get_state_reason ()

+
NMDeviceState       nm_device_get_state_reason          (NMDevice *device,
+                                                         NMDeviceStateReason *reason);

+

+Gets the current NMDevice state (return value) and the reason for entering
+the state (reason argument).
+

+

 


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


device :
a NMDevice
+
reason :
location to store reason (NMDeviceStateReason), or NULL. [out][allow-none]
+
Returns :
the current device state

+

+

+

 
nm_device_get_udi ()

 
const char *        nm_device_get_udi                   (NMDevice *device);

 

@@ -836,7 +891,7 @@ The capabilities of the device.
 

 

 
The "device-type" property

-
  "device-type"              guint                 : Read / Write / Construct Only

+
  "device-type"              guint                 : Read

 

 The numeric type of the device.
 

@@ -941,6 +996,14 @@ The state of the device.
 

 

 

+
The "state-reason" property

+
  "state-reason"             GValueArray_guint+guint_*  : Read

+

+The state and reason of the device.
+

+

+

+

 
The "udi" property

 
  "udi"                      gchar*                : Read

 

diff --git a/docs/libnm-glib/html/NMDeviceBt.html b/docs/libnm-glib/html/NMDeviceBt.html
index f69db886..b41291a5 100644
--- a/docs/libnm-glib/html/NMDeviceBt.html
+++ b/docs/libnm-glib/html/NMDeviceBt.html
@@ -27,6 +27,8 @@
                    | 
                   Object Hierarchy
                    | 
+                  Implemented Interfaces
+                   | 
                   Properties
 
 
@@ -63,6 +65,12 @@ const char *        
+
Implemented Interfaces

+

+NMDeviceBt implements
+ GInitable and  GAsyncInitable.

+

+

 
Properties

 
   "bt-capabilities"          guint                 : Read
diff --git a/docs/libnm-glib/html/NMDeviceEthernet.html b/docs/libnm-glib/html/NMDeviceEthernet.html
index cdadb509..786a5842 100644
--- a/docs/libnm-glib/html/NMDeviceEthernet.html
+++ b/docs/libnm-glib/html/NMDeviceEthernet.html
@@ -27,6 +27,8 @@
                    | 
                   Object Hierarchy
                    | 
+                  Implemented Interfaces
+                   | 
                   Properties
 
 
@@ -66,6 +68,12 @@ const char *        
+
Implemented Interfaces

+

+NMDeviceEthernet implements
+ GInitable and  GAsyncInitable.

+

+

 
Properties

 
   "carrier"                  gboolean              : Read
diff --git a/docs/libnm-glib/html/NMDeviceModem.html b/docs/libnm-glib/html/NMDeviceModem.html
index 0ab7408d..751da6e3 100644
--- a/docs/libnm-glib/html/NMDeviceModem.html
+++ b/docs/libnm-glib/html/NMDeviceModem.html
@@ -27,6 +27,8 @@
                    | 
                   Object Hierarchy
                    | 
+                  Implemented Interfaces
+                   | 
                   Properties
 
 
@@ -61,6 +63,12 @@
 

 

 

+
Implemented Interfaces

+

+NMDeviceModem implements
+ GInitable and  GAsyncInitable.

+

+

 
Properties

 
   "current-capabilities"     guint                 : Read
diff --git a/docs/libnm-glib/html/NMDeviceWifi.html b/docs/libnm-glib/html/NMDeviceWifi.html
index fe9c3021..f08d0b79 100644
--- a/docs/libnm-glib/html/NMDeviceWifi.html
+++ b/docs/libnm-glib/html/NMDeviceWifi.html
@@ -27,6 +27,8 @@
                    | 
                   Object Hierarchy
                    | 
+                  Implemented Interfaces
+                   | 
                   Properties
                    | 
                   Signals
@@ -78,6 +80,12 @@ const char *        
+
Implemented Interfaces

+

+NMDeviceWifi implements
+ GInitable and  GAsyncInitable.

+

+

 
Properties

 
   "active-access-point"      NMAccessPoint*        : Read
diff --git a/docs/libnm-glib/html/NMDeviceWimax.html b/docs/libnm-glib/html/NMDeviceWimax.html
index 33bd2509..6daa921a 100644
--- a/docs/libnm-glib/html/NMDeviceWimax.html
+++ b/docs/libnm-glib/html/NMDeviceWimax.html
@@ -27,6 +27,8 @@
                    | 
                   Object Hierarchy
                    | 
+                  Implemented Interfaces
+                   | 
                   Properties
                    | 
                   Signals
@@ -77,6 +79,12 @@ const 
+
Implemented Interfaces

+

+NMDeviceWimax implements
+ GInitable and  GAsyncInitable.

+

+

 
Properties

 
   "active-nsp"               NMWimaxNsp*           : Read
diff --git a/docs/libnm-glib/html/NMIP4Config.html b/docs/libnm-glib/html/NMIP4Config.html
index 67a8f4fd..b828b574 100644
--- a/docs/libnm-glib/html/NMIP4Config.html
+++ b/docs/libnm-glib/html/NMIP4Config.html
@@ -27,6 +27,8 @@
                    | 
                   Object Hierarchy
                    | 
+                  Implemented Interfaces
+                   | 
                   Properties
 
 
@@ -66,6 +68,12 @@ const 
+
Implemented Interfaces

+

+NMIP4Config implements
+ GInitable and  GAsyncInitable.

+

+

 
Properties

 
   "addresses"                gpointer              : Read
diff --git a/docs/libnm-glib/html/NMIP6Config.html b/docs/libnm-glib/html/NMIP6Config.html
index 36385aad..bc6c9d53 100644
--- a/docs/libnm-glib/html/NMIP6Config.html
+++ b/docs/libnm-glib/html/NMIP6Config.html
@@ -27,6 +27,8 @@
                    | 
                   Object Hierarchy
                    | 
+                  Implemented Interfaces
+                   | 
                   Properties
 
 
@@ -64,6 +66,12 @@ const 
+
Implemented Interfaces

+

+NMIP6Config implements
+ GInitable and  GAsyncInitable.

+

+

 
Properties

 
   "addresses"                NMIP6AddressObjectArray*  : Read
diff --git a/docs/libnm-glib/html/NMObject.html b/docs/libnm-glib/html/NMObject.html
index c336d432..24bb4276 100644
--- a/docs/libnm-glib/html/NMObject.html
+++ b/docs/libnm-glib/html/NMObject.html
@@ -27,6 +27,8 @@
                    | 
                   Object Hierarchy
                    | 
+                  Implemented Interfaces
+                   | 
                   Properties
 
 
@@ -66,6 +68,12 @@ const char *        
+
Implemented Interfaces

+

+NMObject implements
+ GInitable and  GAsyncInitable.

+

+

 
Properties

 
   "dbus-connection"          DBusGConnection*      : Read / Write / Construct Only
diff --git a/docs/libnm-glib/html/NMRemoteConnection.html b/docs/libnm-glib/html/NMRemoteConnection.html
index a674fe2f..531ab09d 100644
--- a/docs/libnm-glib/html/NMRemoteConnection.html
+++ b/docs/libnm-glib/html/NMRemoteConnection.html
@@ -27,6 +27,8 @@
                    | 
                   Object Hierarchy
                    | 
+                  Implemented Interfaces
+                   | 
                   Properties
                    | 
                   Signals
@@ -80,10 +82,15 @@
 

 

 

+
Implemented Interfaces

+

+NMRemoteConnection implements
+ GInitable and  GAsyncInitable.

+

+

 
Properties

 
   "bus"                      DBusGConnection*      : Write / Construct Only
-  "init-result"              guint                 : Read
 

 

 

@@ -307,14 +314,6 @@ Creates a new object representing the remote connection.
 
  "bus"                      DBusGConnection*      : Write / Construct Only

 
DBusGConnection.

 

-

-

-
The "init-result" property

-
  "init-result"              guint                 : Read

-
Initialization result (PRIVATE).

-
Allowed values: <= 2

-
Default value: 0

-

 

 

 
Signal Details

diff --git a/docs/libnm-glib/html/NMRemoteSettings.html b/docs/libnm-glib/html/NMRemoteSettings.html
index 558cec46..4ed57b08 100644
--- a/docs/libnm-glib/html/NMRemoteSettings.html
+++ b/docs/libnm-glib/html/NMRemoteSettings.html
@@ -27,6 +27,8 @@
                    | 
                   Object Hierarchy
                    | 
+                  Implemented Interfaces
+                   | 
                   Properties
                    | 
                   Signals
@@ -57,6 +59,7 @@ enum                NM_REMOTE_SETTINGS_BUS
 #define             NM_REMOTE_SETTINGS_CAN_MODIFY
 #define             NM_REMOTE_SETTINGS_CONNECTIONS_READ
+#define             NM_REMOTE_SETTINGS_ERROR
 #define             NM_REMOTE_SETTINGS_HOSTNAME
 #define             NM_REMOTE_SETTINGS_NEW_CONNECTION
 #define             NM_REMOTE_SETTINGS_SERVICE_RUNNING
@@ -73,6 +76,12 @@ enum                const char *uuid);
 GSList *            nm_remote_settings_list_connections (NMRemoteSettings *settings);
 NMRemoteSettings *  nm_remote_settings_new              (DBusGConnection *bus);
+void                nm_remote_settings_new_async        (DBusGConnection *bus,
+                                                         GCancellable *cancellable,
+                                                         GAsyncReadyCallback callback,
+                                                         gpointer user_data);
+NMRemoteSettings *  nm_remote_settings_new_finish       (GAsyncResult *result,
+                                                         GError **error);
 gboolean            nm_remote_settings_save_hostname    (NMRemoteSettings *settings,
                                                          const char *hostname,
                                                          NMRemoteSettingsSaveHostnameFunc callback,
@@ -87,6 +96,12 @@ enum                
+
Implemented Interfaces

+

+NMRemoteSettings implements
+ GInitable and  GAsyncInitable.

+

+

 
Properties

 
   "bus"                      DBusGConnection*      : Read / Write / Construct Only
@@ -154,9 +169,9 @@ enum                
 
enum NMRemoteSettingsError

 
typedef enum {
-	NM_REMOTE_SETTINGS_ERROR_UNKNOWN = 0,
-	NM_REMOTE_SETTINGS_ERROR_CONNECTION_REMOVED,
-	NM_REMOTE_SETTINGS_ERROR_CONNECTION_UNAVAILABLE,
+	NM_REMOTE_SETTINGS_ERROR_UNKNOWN = 0,            /*< nick=UnknownError >*/
+	NM_REMOTE_SETTINGS_ERROR_CONNECTION_REMOVED,     /*< nick=ConnectionRemoved >*/
+	NM_REMOTE_SETTINGS_ERROR_CONNECTION_UNAVAILABLE, /*< nick=ConnectionUnavailable >*/
 } NMRemoteSettingsError;
 

 

@@ -220,6 +235,14 @@ Describes errors that may result from operations involving a 
 

 

+
NM_REMOTE_SETTINGS_ERROR

+
#define NM_REMOTE_SETTINGS_ERROR nm_remote_settings_error_quark ()
+

+

+

+

+

+

 
NM_REMOTE_SETTINGS_HOSTNAME

 
#define NM_REMOTE_SETTINGS_HOSTNAME        "hostname"
 

@@ -390,6 +413,11 @@ using nm_remote_settings_new_async() if you
+want to avoid that.
+

 

@@ -407,6 +435,72 @@ Creates a new object representing the remote settings service.
 

+
nm_remote_settings_new_async ()

+
void                nm_remote_settings_new_async        (DBusGConnection *bus,
+                                                         GCancellable *cancellable,
+                                                         GAsyncReadyCallback callback,
+                                                         gpointer user_data);

+

+Creates a new object representing the remote settings service and
+begins asynchronously initializing it. callback will be called
+when it is done; use nm_remote_settings_new_finish() to get the
+result.
+

+

 
 
 
 

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


bus :
a valid and connected D-Bus connection. [allow-none]
+
cancellable :
a GCancellable, or NULL
+
callback :
callback to call when the settings object is created
user_data :
data for callback
+

+

+

+

+
nm_remote_settings_new_finish ()

+
NMRemoteSettings *  nm_remote_settings_new_finish       (GAsyncResult *result,
+                                                         GError **error);

+

+Gets the result of an nm_remote_settings_new_async() call.
+

+

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


result :
a GAsyncResult
+
error :
location for a GError, or NULL
+
Returns :
a new NMRemoteSettings object, or NULL on error

+

+

+

 
nm_remote_settings_save_hostname ()

 
gboolean            nm_remote_settings_save_hostname    (NMRemoteSettings *settings,
                                                          const char *hostname,
diff --git a/docs/libnm-glib/html/NMSecretAgent.html b/docs/libnm-glib/html/NMSecretAgent.html
index c080405b..f7254c2a 100644
--- a/docs/libnm-glib/html/NMSecretAgent.html
+++ b/docs/libnm-glib/html/NMSecretAgent.html
@@ -61,6 +61,7 @@ enum                GError *error,
                                                          gpointer user_data);
 #define             NM_SECRET_AGENT_AUTO_REGISTER
+#define             NM_SECRET_AGENT_ERROR
 #define             NM_SECRET_AGENT_IDENTIFIER
 #define             NM_SECRET_AGENT_REGISTRATION_RESULT
 void                nm_secret_agent_delete_secrets      (NMSecretAgent *self,
@@ -95,6 +96,7 @@ enum                
   "auto-register"            gboolean              : Read / Write / Construct
   "identifier"               gchar*                : Read / Write / Construct Only
+  "registered"               gboolean              : Read
 

 

 

@@ -197,18 +199,42 @@ enum                GError *error,
                                                          gpointer user_data);

 

+Called as a result of a request by NM to delete secrets.  When the
+NMSecretAgent subclass has finished deleting the secrets, this function
+should be called.
 

+

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


agent :
the secret agent object
connection :
the connection for which secrets were to be deleted
error :
if the deleting secrets failed, give a descriptive error here
user_data :
caller-specific data to be passed to the function

 

 

 

 
enum NMSecretAgentError

 
typedef enum {
-	NM_SECRET_AGENT_ERROR_NOT_AUTHORIZED = 0,
-	NM_SECRET_AGENT_ERROR_INVALID_CONNECTION,
-	NM_SECRET_AGENT_ERROR_USER_CANCELED,
-	NM_SECRET_AGENT_ERROR_AGENT_CANCELED,
-	NM_SECRET_AGENT_ERROR_INTERNAL_ERROR,
-	NM_SECRET_AGENT_ERROR_NO_SECRETS,
+	NM_SECRET_AGENT_ERROR_NOT_AUTHORIZED = 0, /*< nick=NotAuthorized >*/
+	NM_SECRET_AGENT_ERROR_INVALID_CONNECTION, /*< nick=InvalidConnection >*/
+	NM_SECRET_AGENT_ERROR_USER_CANCELED,      /*< nick=UserCanceled >*/
+	NM_SECRET_AGENT_ERROR_AGENT_CANCELED,     /*< nick=AgentCanceled >*/
+	NM_SECRET_AGENT_ERROR_INTERNAL_ERROR,     /*< nick=InternalError >*/
+	NM_SECRET_AGENT_ERROR_NO_SECRETS,         /*< nick=NoSecrets >*/
 } NMSecretAgentError;
 

 

@@ -263,7 +289,93 @@ is allowed.
                                                          GError *error,
                                                          gpointer user_data);
 

+Called as a result of a request by NM to retrieve secrets.  When the
+NMSecretAgent subclass has finished retrieving secrets and is ready to
+return them, or to return an error, this function should be called with
+those secrets or the error.
+

+

+To easily create the hash table to return the WiFi PSK, you could do
+something like this:
 

+

+
Example 1. Creating a secrets hash

+

+  
+    
+      
+        
+        
+      
+    
+  
1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
NMConnection *secrets;
+NMSettingWirelessSecurity *s_wsec;
+GHashTable *secrets_hash;
+
+secrets = nm_connection_new ();
+s_wsec = (NMSettingWirelessSecurity *) nm_setting_wireless_security_new ();
+g_object_set (G_OBJECT (s_wsec),
+              NM_SETTING_WIRELESS_SECURITY_PSK, "my really cool PSK",
+              NULL);
+nm_connection_add_setting (secrets, NM_SETTING (s_wsec));
+secrets_hash = nm_connection_to_hash (secrets);
+
+(call the NMSecretAgentGetSecretsFunc with secrets_hash)
+
+g_object_unref (secrets);
+g_hash_table_unref (secrets_hash);

+

+
+

+


+

+

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


agent :
the secret agent object
connection :
the connection for which secrets were requested
secrets :
the GHashTable containing
+the requested secrets in the same format as an NMConnection hash (as
+created by nm_connection_to_hash() for example).  Each key in secrets
+should be the name of a NMSetting object (like "802-11-wireless-security")
+and each value should be a GHashTable.  The sub-hashes map string:GValue
+where the string is the setting property name (like "psk") and the value
+is the secret. [element-type utf8 GLib.HashTable]
+
error :
if the secrets request failed, give a descriptive error here
user_data :
caller-specific data to be passed to the function

 

 

 

@@ -273,7 +385,31 @@ is allowed.
                                                          GError *error,
                                                          gpointer user_data);
 

+Called as a result of a request by NM to save secrets.  When the
+NMSecretAgent subclass has finished saving the secrets, this function
+should be called.
 

+

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


agent :
the secret agent object
connection :
the connection for which secrets were to be saved
error :
if the saving secrets failed, give a descriptive error here
user_data :
caller-specific data to be passed to the function

 

 

 

@@ -285,6 +421,14 @@ is allowed.
 

 

 

+
NM_SECRET_AGENT_ERROR

+
#define NM_SECRET_AGENT_ERROR         (nm_secret_agent_error_quark ())
+

+

+

+

+

+

 
NM_SECRET_AGENT_IDENTIFIER

 
#define NM_SECRET_AGENT_IDENTIFIER          "identifier"
 

@@ -328,7 +472,7 @@ VFunc: delete_secrets
 
 
 
callback :

-a callback, invoked when the operation is done. [scope async]
+a callback, to be invoked when the operation is done. [scope async]
 
 
 
@@ -393,7 +537,7 @@ VFunc: get_secrets
 
 
 
callback :

-a callback, invoked when the operation is done. [scope async]
+a callback, to be invoked when the operation is done. [scope async]
 
 
 
@@ -461,7 +605,7 @@ VFunc: save_secrets
 
 
 
callback :

-a callback, invoked when the operation is done. [scope async]
+a callback, to be invoked when the operation is done. [scope async]
 
 
 
@@ -528,6 +672,15 @@ of 3 characters.  An example valid identifier is 'org.gnome.nm-applet'
 

 
Default value: NULL

 

+

+

+
The "registered" property

+
  "registered"               gboolean              : Read

+

+TRUE if the agent is registered with NetworkManager, FALSE if not.
+

+
Default value: FALSE

+

 

 

 
Signal Details

diff --git a/docs/libnm-glib/html/NMVPNConnection.html b/docs/libnm-glib/html/NMVPNConnection.html
index 852ec461..cd6d107e 100644
--- a/docs/libnm-glib/html/NMVPNConnection.html
+++ b/docs/libnm-glib/html/NMVPNConnection.html
@@ -27,6 +27,8 @@
                    | 
                   Object Hierarchy
                    | 
+                  Implemented Interfaces
+                   | 
                   Properties
                    | 
                   Signals
@@ -63,6 +65,12 @@ const char *        
+
Implemented Interfaces

+

+NMVPNConnection implements
+ GInitable and  GAsyncInitable.

+

+

 
Properties

 
   "banner"                   gchar*                : Read
@@ -132,14 +140,45 @@ const char *        
nm_vpn_connection_get_banner ()

 
const char *        nm_vpn_connection_get_banner        (NMVPNConnection *vpn);

 

+Gets the VPN login banner of the active NMVPNConnection.
 

+

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


vpn :
a NMVPNConnection
+
Returns :
the VPN login banner of the VPN connection. This is the internal
+string used by the connection, and must not be modified.

 

 

 

 
nm_vpn_connection_get_vpn_state ()

 
NMVPNConnectionState nm_vpn_connection_get_vpn_state    (NMVPNConnection *vpn);

 

+Gets the current NMVPNConnection state.
 

+

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


vpn :
a NMVPNConnection
+
Returns :
the VPN state of the active VPN connection.

 

 

 

diff --git a/docs/libnm-glib/html/NMWimaxNsp.html b/docs/libnm-glib/html/NMWimaxNsp.html
index aa69342a..68a80693 100644
--- a/docs/libnm-glib/html/NMWimaxNsp.html
+++ b/docs/libnm-glib/html/NMWimaxNsp.html
@@ -27,6 +27,8 @@
                    | 
                   Object Hierarchy
                    | 
+                  Implemented Interfaces
+                   | 
                   Properties
 
 
@@ -67,6 +69,12 @@ const char *        
+
Implemented Interfaces

+

+NMWimaxNsp implements
+ GInitable and  GAsyncInitable.

+

+

 
Properties

 
   "name"                     gchar*                : Read
diff --git a/docs/libnm-glib/html/api-index-full.html b/docs/libnm-glib/html/api-index-full.html
index 28ab9214..e07f804b 100644
--- a/docs/libnm-glib/html/api-index-full.html
+++ b/docs/libnm-glib/html/api-index-full.html
@@ -207,6 +207,10 @@
 
 

 

+NMActiveConnection:master, object property in NMActiveConnection
+

+

+

 NMActiveConnection:specific-object, object property in NMActiveConnection
 

 

@@ -215,6 +219,10 @@
 
 

 

+NMActiveConnection:uuid, object property in NMActiveConnection
+

+

+

 NMActiveConnectionClass, struct in NMActiveConnection
 

 

@@ -251,6 +259,10 @@
 
 

 

+nm_active_connection_get_master, function in NMActiveConnection
+

+

+

 nm_active_connection_get_specific_object, function in NMActiveConnection
 

 

@@ -263,6 +275,10 @@
 
 

 

+NM_ACTIVE_CONNECTION_MASTER, macro in NMActiveConnection
+

+

+

 nm_active_connection_new, function in NMActiveConnection
 

 

@@ -428,6 +444,14 @@
 
 

 

+nm_client_new_async, function in NMClient
+

+

+

+nm_client_new_finish, function in NMClient
+

+

+

 nm_client_sleep, function in NMClient
 

 

@@ -501,6 +525,50 @@
 

 
D

 

+DBUS_GLIB_CLIENT_WRAPPERS_org_freedesktop_NetworkManagerSettings_Connection, macro in nm-exported-connection-bindings
+

+

+

+DBUS_GLIB_CLIENT_WRAPPERS_org_freedesktop_NetworkManagerSettings_Connection_Secrets, macro in nm-exported-connection-bindings
+

+

+

+DBUS_GLIB_CLIENT_WRAPPERS_org_freedesktop_NetworkManagerSettings_System, macro in nm-settings-system-bindings
+

+

+

+DBUS_GLIB_CLIENT_WRAPPERS_org_freedesktop_NetworkManager_Device_Infiniband, macro in nm-device-infiniband-bindings
+

+

+

+dbus_glib_marshal_nm_exported_connection_BOOLEAN__POINTER_POINTER, function in nm-exported-connection-glue
+

+

+

+dbus_glib_marshal_nm_exported_connection_NONE__BOXED_POINTER, macro in nm-exported-connection-glue
+

+

+

+dbus_glib_marshal_nm_exported_connection_NONE__POINTER, macro in nm-exported-connection-glue
+

+

+

+dbus_glib_marshal_nm_exported_connection_NONE__STRING_BOXED_BOOLEAN_POINTER, macro in nm-exported-connection-glue
+

+

+

+dbus_glib_marshal_nm_exported_connection_VOID__BOXED_POINTER, function in nm-exported-connection-glue
+

+

+

+dbus_glib_marshal_nm_exported_connection_VOID__POINTER, macro in nm-exported-connection-glue
+

+

+

+dbus_glib_marshal_nm_exported_connection_VOID__STRING_BOXED_BOOLEAN_POINTER, function in nm-exported-connection-glue
+

+

+

 dbus_glib_marshal_nm_secret_agent_NONE__BOXED_BOXED_POINTER, macro in nm-secret-agent-glue
 

 

@@ -525,10 +593,18 @@ dbus_glib_marshal_nm_secret_agent_VOID__BOXED_STRING_POINTER, function in nm-sec
 
 

 

+dbus_glib_nm_exported_connection_object_info, variable in nm-exported-connection-glue
+

+

+

 dbus_glib_nm_secret_agent_object_info, variable in nm-secret-agent-glue
 

 

 

+dbus_g_proxy_begin_call, function in nm-settings-system-bindings
+

+

+

 NMDevice, struct in NMDevice
 

 

@@ -593,6 +669,10 @@ dbus_glib_nm_secret_agent_object_info, variable in nm-secret-agent-glue
 
 

 

+NMDevice:state-reason, object property in NMDevice
+

+

+

 NMDevice:udi, object property in NMDevice
 

 

@@ -601,6 +681,22 @@ dbus_glib_nm_secret_agent_object_info, variable in nm-secret-agent-glue
 
 

 

+NMDeviceBond, struct in NMDeviceBond
+

+

+

+NMDeviceBond:carrier, object property in NMDeviceBond
+

+

+

+NMDeviceBond:hw-address, object property in NMDeviceBond
+

+

+

+NMDeviceBondClass, struct in NMDeviceBond
+

+

+

 NMDeviceBt, struct in NMDeviceBt
 

 

@@ -653,6 +749,22 @@ dbus_glib_nm_secret_agent_object_info, variable in nm-secret-agent-glue
 
 

 

+NMDeviceInfiniband, struct in NMDeviceInfiniband
+

+

+

+NMDeviceInfiniband:carrier, object property in NMDeviceInfiniband
+

+

+

+NMDeviceInfiniband:hw-address, object property in NMDeviceInfiniband
+

+

+

+NMDeviceInfinibandClass, struct in NMDeviceInfiniband
+

+

+

 NMDeviceModem, struct in NMDeviceModem
 

 

@@ -669,6 +781,46 @@ dbus_glib_nm_secret_agent_object_info, variable in nm-secret-agent-glue
 
 

 

+NMDeviceOlpcMesh, struct in NMDeviceOlpcMesh
+

+

+

+NMDeviceOlpcMesh:active-channel, object property in NMDeviceOlpcMesh
+

+

+

+NMDeviceOlpcMesh:companion, object property in NMDeviceOlpcMesh
+

+

+

+NMDeviceOlpcMesh:hw-address, object property in NMDeviceOlpcMesh
+

+

+

+NMDeviceOlpcMeshClass, struct in NMDeviceOlpcMesh
+

+

+

+NMDeviceVlan, struct in NMDeviceVlan
+

+

+

+NMDeviceVlan:carrier, object property in NMDeviceVlan
+

+

+

+NMDeviceVlan:hw-address, object property in NMDeviceVlan
+

+

+

+NMDeviceVlan:vlan-id, object property in NMDeviceVlan
+

+

+

+NMDeviceVlanClass, struct in NMDeviceVlan
+

+

+

 NMDeviceWifi, struct in NMDeviceWifi
 

 

@@ -757,6 +909,26 @@ dbus_glib_nm_secret_agent_object_info, variable in nm-secret-agent-glue
 
 

 

+NM_DEVICE_BOND_CARRIER, macro in NMDeviceBond
+

+

+

+nm_device_bond_get_carrier, function in NMDeviceBond
+

+

+

+nm_device_bond_get_hw_address, function in NMDeviceBond
+

+

+

+NM_DEVICE_BOND_HW_ADDRESS, macro in NMDeviceBond
+

+

+

+nm_device_bond_new, function in NMDeviceBond
+

+

+

 NM_DEVICE_BT_CAPABILITIES, macro in NMDeviceBt
 

 

@@ -913,6 +1085,10 @@ dbus_glib_nm_secret_agent_object_info, variable in nm-secret-agent-glue
 
 

 

+nm_device_get_state_reason, function in NMDevice
+

+

+

 nm_device_get_udi, function in NMDevice
 

 

@@ -921,6 +1097,26 @@ dbus_glib_nm_secret_agent_object_info, variable in nm-secret-agent-glue
 
 

 

+NM_DEVICE_INFINIBAND_CARRIER, macro in NMDeviceInfiniband
+

+

+

+nm_device_infiniband_get_carrier, function in NMDeviceInfiniband
+

+

+

+nm_device_infiniband_get_hw_address, function in NMDeviceInfiniband
+

+

+

+NM_DEVICE_INFINIBAND_HW_ADDRESS, macro in NMDeviceInfiniband
+

+

+

+nm_device_infiniband_new, function in NMDeviceInfiniband
+

+

+

 NM_DEVICE_INTERFACE, macro in NMDevice
 

 

@@ -961,6 +1157,34 @@ dbus_glib_nm_secret_agent_object_info, variable in nm-secret-agent-glue
 
 

 

+NM_DEVICE_OLPC_MESH_ACTIVE_CHANNEL, macro in NMDeviceOlpcMesh
+

+

+

+NM_DEVICE_OLPC_MESH_COMPANION, macro in NMDeviceOlpcMesh
+

+

+

+nm_device_olpc_mesh_get_active_channel, function in NMDeviceOlpcMesh
+

+

+

+nm_device_olpc_mesh_get_companion, function in NMDeviceOlpcMesh
+

+

+

+nm_device_olpc_mesh_get_hw_address, function in NMDeviceOlpcMesh
+

+

+

+NM_DEVICE_OLPC_MESH_HW_ADDRESS, macro in NMDeviceOlpcMesh
+

+

+

+nm_device_olpc_mesh_new, function in NMDeviceOlpcMesh
+

+

+

 NM_DEVICE_PRODUCT, macro in NMDevice
 

 

@@ -969,6 +1193,10 @@ dbus_glib_nm_secret_agent_object_info, variable in nm-secret-agent-glue
 
 

 

+NM_DEVICE_STATE_REASON, macro in NMDevice
+

+

+

 NM_DEVICE_UDI, macro in NMDevice
 

 

@@ -977,6 +1205,34 @@ dbus_glib_nm_secret_agent_object_info, variable in nm-secret-agent-glue
 
 

 

+NM_DEVICE_VLAN_CARRIER, macro in NMDeviceVlan
+

+

+

+nm_device_vlan_get_carrier, function in NMDeviceVlan
+

+

+

+nm_device_vlan_get_hw_address, function in NMDeviceVlan
+

+

+

+nm_device_vlan_get_vlan_id, function in NMDeviceVlan
+

+

+

+NM_DEVICE_VLAN_HW_ADDRESS, macro in NMDeviceVlan
+

+

+

+nm_device_vlan_new, function in NMDeviceVlan
+

+

+

+NM_DEVICE_VLAN_VLAN_ID, macro in NMDeviceVlan
+

+

+

 NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT, macro in NMDeviceWifi
 

 

@@ -1403,6 +1659,102 @@ g_marshal_value_peek_variant, macro in nm-secret-agent-glue
 nm_object_get_path, function in NMObject
 
 

+

+org_freedesktop_NetworkManagerSettings_Connection_delete, function in nm-exported-connection-bindings
+

+

+

+org_freedesktop_NetworkManagerSettings_Connection_delete_async, function in nm-exported-connection-bindings
+

+

+

+org_freedesktop_NetworkManagerSettings_Connection_delete_async_callback, function in nm-exported-connection-bindings
+

+

+

+org_freedesktop_NetworkManagerSettings_Connection_delete_reply, user_function in nm-exported-connection-bindings
+

+

+

+org_freedesktop_NetworkManagerSettings_Connection_get_settings, function in nm-exported-connection-bindings
+

+

+

+org_freedesktop_NetworkManagerSettings_Connection_get_settings_async, function in nm-exported-connection-bindings
+

+

+

+org_freedesktop_NetworkManagerSettings_Connection_get_settings_async_callback, function in nm-exported-connection-bindings
+

+

+

+org_freedesktop_NetworkManagerSettings_Connection_get_settings_reply, user_function in nm-exported-connection-bindings
+

+

+

+org_freedesktop_NetworkManagerSettings_Connection_Secrets_get_secrets, function in nm-exported-connection-bindings
+

+

+

+org_freedesktop_NetworkManagerSettings_Connection_Secrets_get_secrets_async, function in nm-exported-connection-bindings
+

+

+

+org_freedesktop_NetworkManagerSettings_Connection_Secrets_get_secrets_async_callback, function in nm-exported-connection-bindings
+

+

+

+org_freedesktop_NetworkManagerSettings_Connection_Secrets_get_secrets_reply, user_function in nm-exported-connection-bindings
+

+

+

+org_freedesktop_NetworkManagerSettings_Connection_update, function in nm-exported-connection-bindings
+

+

+

+org_freedesktop_NetworkManagerSettings_Connection_update_async, function in nm-exported-connection-bindings
+

+

+

+org_freedesktop_NetworkManagerSettings_Connection_update_async_callback, function in nm-exported-connection-bindings
+

+

+

+org_freedesktop_NetworkManagerSettings_Connection_update_reply, user_function in nm-exported-connection-bindings
+

+

+

+org_freedesktop_NetworkManagerSettings_System_get_permissions, function in nm-settings-system-bindings
+

+

+

+org_freedesktop_NetworkManagerSettings_System_get_permissions_async, function in nm-settings-system-bindings
+

+

+

+org_freedesktop_NetworkManagerSettings_System_get_permissions_async_callback, function in nm-settings-system-bindings
+

+

+

+org_freedesktop_NetworkManagerSettings_System_get_permissions_reply, user_function in nm-settings-system-bindings
+

+

+

+org_freedesktop_NetworkManagerSettings_System_save_hostname, function in nm-settings-system-bindings
+

+

+

+org_freedesktop_NetworkManagerSettings_System_save_hostname_async, function in nm-settings-system-bindings
+

+

+

+org_freedesktop_NetworkManagerSettings_System_save_hostname_async_callback, function in nm-settings-system-bindings
+

+

+

+org_freedesktop_NetworkManagerSettings_System_save_hostname_reply, user_function in nm-settings-system-bindings
+

+

 
R

 

 NMRemoteConnection, struct in NMRemoteConnection
@@ -1425,10 +1777,6 @@ g_marshal_value_peek_variant, macro in nm-secret-agent-glue
 

 

 

-NMRemoteConnection:init-result, object property in NMRemoteConnection
-

-

-

 NMRemoteConnectionClass, struct in NMRemoteConnection
 

 

@@ -1529,6 +1877,10 @@ g_marshal_value_peek_variant, macro in nm-secret-agent-glue
 
 

 

+NM_REMOTE_SETTINGS_ERROR, macro in NMRemoteSettings
+

+

+

 nm_remote_settings_error_quark, function in NMRemoteSettings
 

 

@@ -1553,10 +1905,18 @@ g_marshal_value_peek_variant, macro in nm-secret-agent-glue
 
 

 

+nm_remote_settings_new_async, function in NMRemoteSettings
+

+

+

 NM_REMOTE_SETTINGS_NEW_CONNECTION, macro in NMRemoteSettings
 

 

 

+nm_remote_settings_new_finish, function in NMRemoteSettings
+

+

+

 nm_remote_settings_save_hostname, function in NMRemoteSettings
 

 

@@ -1582,6 +1942,10 @@ g_marshal_value_peek_variant, macro in nm-secret-agent-glue
 
 

 

+NMSecretAgent:registered, object property in NMSecretAgent
+

+

+

 NMSecretAgentClass, struct in NMSecretAgent
 

 

@@ -1614,6 +1978,10 @@ g_marshal_value_peek_variant, macro in nm-secret-agent-glue
 
 

 

+NM_SECRET_AGENT_ERROR, macro in NMSecretAgent
+

+

+

 nm_secret_agent_error_quark, function in NMSecretAgent
 

 

diff --git a/docs/libnm-glib/html/ch02.html b/docs/libnm-glib/html/ch02.html
index ed4607b2..72bb7148 100644
--- a/docs/libnm-glib/html/ch02.html
+++ b/docs/libnm-glib/html/ch02.html
@@ -21,7 +21,7 @@
 
 

 

-libnm-glib API Reference

+libnm-glib API Reference

 

 

 NMClient
diff --git a/docs/libnm-glib/html/index.html b/docs/libnm-glib/html/index.html
index 70270f38..e81d55c8 100644
--- a/docs/libnm-glib/html/index.html
+++ b/docs/libnm-glib/html/index.html
@@ -29,7 +29,7 @@
     

 
Copyright © 2011 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
diff --git a/docs/libnm-glib/html/index.sgml b/docs/libnm-glib/html/index.sgml
index 3df60aeb..5f5404f7 100644
--- a/docs/libnm-glib/html/index.sgml
+++ b/docs/libnm-glib/html/index.sgml
@@ -2,6 +2,7 @@
 
 
 
+
 
 
 
@@ -37,6 +38,8 @@
 
 
 
+
+
 
 
 
@@ -66,6 +69,7 @@
 
 
 
+
 
 
 
@@ -75,6 +79,7 @@
 
 
 
+
 
 
 
@@ -82,6 +87,7 @@
 
 
 
+
 
 
 
@@ -91,11 +97,14 @@
 
 
 
+
 
 
+
 
 
 
+
 
 
 
@@ -117,6 +126,7 @@
 
 
 
+
 
 
 
@@ -136,6 +146,7 @@
 
 
 
+
 
 
 
@@ -154,6 +165,7 @@
 
 
 
+
 
 
 
@@ -161,6 +173,7 @@
 
 
 
+
 
 
 
@@ -183,6 +196,7 @@
 
 
 
+
 
 
 
@@ -217,6 +231,7 @@
 
 
 
+
 
 
 
@@ -232,6 +247,7 @@
 
 
 
+
 
 
 
@@ -251,6 +267,7 @@
 
 
 
+
 
 
 
@@ -288,6 +305,7 @@
 
 
 
+
 
 
 
@@ -310,6 +328,7 @@
 
 
 
+
 
 
 
@@ -352,6 +371,7 @@
 
 
 
+
 
 
 
@@ -377,6 +397,7 @@
 
 
 
+
 
 
 
@@ -399,6 +420,7 @@
 
 
 
+
 
 
 
@@ -413,6 +435,7 @@
 
 
 
+
 
 
 
@@ -427,6 +450,7 @@
 
 
 
+
 
 
 
@@ -442,6 +466,7 @@
 
 
 
+
 
 
 
@@ -459,7 +484,6 @@
 
 
 
-
 
 
 
@@ -467,6 +491,7 @@
 
 
 
+
 
 
 
@@ -482,6 +507,7 @@
 
 
 
+
 
 
 
@@ -491,6 +517,8 @@
 
 
 
+
+
 
 
 
@@ -522,6 +550,7 @@
 
 
 
+
 
 
 
@@ -533,11 +562,13 @@
 
 
 
+
 
 
 
 
 
+
 
 
 
diff --git a/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html b/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html
index d6ecdc55..a8f13163 100644
--- a/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html
+++ b/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html
@@ -123,15 +123,15 @@ enum                
 
enum NMVPNPluginError

 
typedef enum {
-	NM_VPN_PLUGIN_ERROR_GENERAL,
-	NM_VPN_PLUGIN_ERROR_STARTING_IN_PROGRESS,
-	NM_VPN_PLUGIN_ERROR_ALREADY_STARTED,
-	NM_VPN_PLUGIN_ERROR_STOPPING_IN_PROGRESS,
-	NM_VPN_PLUGIN_ERROR_ALREADY_STOPPED,
-	NM_VPN_PLUGIN_ERROR_WRONG_STATE,
-	NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS,
-	NM_VPN_PLUGIN_ERROR_LAUNCH_FAILED,
-	NM_VPN_PLUGIN_ERROR_CONNECTION_INVALID,
+	NM_VPN_PLUGIN_ERROR_GENERAL,              /*< nick=General >*/
+	NM_VPN_PLUGIN_ERROR_STARTING_IN_PROGRESS, /*< nick=StartingInProgress >*/
+	NM_VPN_PLUGIN_ERROR_ALREADY_STARTED,      /*< nick=AlreadyStarted >*/
+	NM_VPN_PLUGIN_ERROR_STOPPING_IN_PROGRESS, /*< nick=StoppingInProgress >*/
+	NM_VPN_PLUGIN_ERROR_ALREADY_STOPPED,      /*< nick=AlreadyStopped >*/
+	NM_VPN_PLUGIN_ERROR_WRONG_STATE,          /*< nick=WrongState >*/
+	NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS,        /*< nick=BadArguments >*/
+	NM_VPN_PLUGIN_ERROR_LAUNCH_FAILED,        /*< nick=LaunchFailed >*/
+	NM_VPN_PLUGIN_ERROR_CONNECTION_INVALID,   /*< nick=ConnectionInvalid >*/
 } NMVPNPluginError;
 

 

diff --git a/docs/libnm-glib/html/libnm-glib.devhelp2 b/docs/libnm-glib/html/libnm-glib.devhelp2
index 74226d52..edbb4a26 100644
--- a/docs/libnm-glib/html/libnm-glib.devhelp2
+++ b/docs/libnm-glib/html/libnm-glib.devhelp2
@@ -64,6 +64,8 @@
     
     
     
+    
+    
     
     
     
@@ -94,6 +96,7 @@
     
     
     
+    
     
     
     
@@ -101,6 +104,7 @@
     
     
     
+    
     
     
     
@@ -109,8 +113,10 @@
     
     
     
+    
     
     
+    
     
     
     
@@ -128,6 +134,7 @@
     
     
     
+    
     
     
     
@@ -147,6 +154,7 @@
     
     
     
+    
     
     
     
@@ -164,6 +172,7 @@
     
     
     
+    
     
     
     
@@ -372,7 +381,6 @@
     
     
     
-    
     
     
     
@@ -384,6 +392,7 @@
     
     
     
+    
     
     
     
@@ -393,6 +402,8 @@
     
     
     
+    
+    
     
     
     
@@ -408,6 +419,7 @@
     
     
     
+    
     
     
     
@@ -418,6 +430,7 @@
     
     
     
+    
     
     
     
diff --git a/docs/libnm-glib/html/object-tree.html b/docs/libnm-glib/html/object-tree.html
index 1da8b8e0..bbc78129 100644
--- a/docs/libnm-glib/html/object-tree.html
+++ b/docs/libnm-glib/html/object-tree.html
@@ -32,6 +32,10 @@
                 NMDeviceModem
                 NMDeviceBt
                 NMDeviceWimax
+                NMDeviceOlpcMesh
+                NMDeviceInfiniband
+                NMDeviceBond
+                NMDeviceVlan
             NMWimaxNsp
             NMAccessPoint
             NMIP4Config
diff --git a/docs/libnm-glib/libnm-glib-sections.txt b/docs/libnm-glib/libnm-glib-sections.txt
index 7c517f3d..25ba7b85 100644
--- a/docs/libnm-glib/libnm-glib-sections.txt
+++ b/docs/libnm-glib/libnm-glib-sections.txt
@@ -50,6 +50,7 @@ NM_ACTIVE_CONNECTION_CONNECTION
 NM_ACTIVE_CONNECTION_DEFAULT
 NM_ACTIVE_CONNECTION_DEFAULT6
 NM_ACTIVE_CONNECTION_DEVICES
+NM_ACTIVE_CONNECTION_MASTER
 NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT
 NM_ACTIVE_CONNECTION_STATE
 NM_ACTIVE_CONNECTION_UUID
@@ -57,6 +58,7 @@ nm_active_connection_get_connection
 nm_active_connection_get_default
 nm_active_connection_get_default6
 nm_active_connection_get_devices
+nm_active_connection_get_master
 nm_active_connection_get_specific_object
 nm_active_connection_get_state
 nm_active_connection_get_uuid
@@ -105,6 +107,8 @@ nm_client_get_version
 nm_client_networking_get_enabled
 nm_client_networking_set_enabled
 nm_client_new
+nm_client_new_async
+nm_client_new_finish
 nm_client_sleep
 nm_client_wimax_get_enabled
 nm_client_wimax_hardware_get_enabled
@@ -145,6 +149,7 @@ NM_DEVICE_IP_INTERFACE
 NM_DEVICE_MANAGED
 NM_DEVICE_PRODUCT
 NM_DEVICE_STATE
+NM_DEVICE_STATE_REASON
 NM_DEVICE_UDI
 NM_DEVICE_VENDOR
 nm_device_connection_valid
@@ -164,6 +169,7 @@ nm_device_get_ip_iface
 nm_device_get_managed
 nm_device_get_product
 nm_device_get_state
+nm_device_get_state_reason
 nm_device_get_udi
 nm_device_get_vendor
 nm_device_new
@@ -177,6 +183,26 @@ NM_TYPE_DEVICE
 nm_device_get_type
 
 
+

+nm-device-bond
+NMDeviceBond
+NMDeviceBond
+NMDeviceBondClass
+NM_DEVICE_BOND_CARRIER
+NM_DEVICE_BOND_HW_ADDRESS
+nm_device_bond_get_carrier
+nm_device_bond_get_hw_address
+nm_device_bond_new
+
+NM_DEVICE_BOND
+NM_DEVICE_BOND_CLASS
+NM_DEVICE_BOND_GET_CLASS
+NM_IS_DEVICE_BOND
+NM_IS_DEVICE_BOND_CLASS
+NM_TYPE_DEVICE_BOND
+nm_device_bond_get_type
+

+
 

 nm-device-bt
 NMDeviceBt
@@ -223,6 +249,31 @@ NM_TYPE_DEVICE_ETHERNET
 nm_device_ethernet_get_type
 

 
+

+nm-device-infiniband
+NMDeviceInfiniband
+NMDeviceInfiniband
+NMDeviceInfinibandClass
+NM_DEVICE_INFINIBAND_CARRIER
+NM_DEVICE_INFINIBAND_HW_ADDRESS
+nm_device_infiniband_get_carrier
+nm_device_infiniband_get_hw_address
+nm_device_infiniband_new
+
+NM_DEVICE_INFINIBAND
+NM_DEVICE_INFINIBAND_CLASS
+NM_DEVICE_INFINIBAND_GET_CLASS
+NM_IS_DEVICE_INFINIBAND
+NM_IS_DEVICE_INFINIBAND_CLASS
+NM_TYPE_DEVICE_INFINIBAND
+nm_device_infiniband_get_type
+

+
+

+nm-device-infiniband-bindings
+DBUS_GLIB_CLIENT_WRAPPERS_org_freedesktop_NetworkManager_Device_Infiniband
+

+
 

 nm-device-modem
 NMDeviceModem
@@ -242,6 +293,50 @@ NM_TYPE_DEVICE_MODEM
 nm_device_modem_get_type
 

 
+

+nm-device-olpc-mesh
+NMDeviceOlpcMesh
+NMDeviceOlpcMesh
+NMDeviceOlpcMeshClass
+NM_DEVICE_OLPC_MESH_ACTIVE_CHANNEL
+NM_DEVICE_OLPC_MESH_COMPANION
+NM_DEVICE_OLPC_MESH_HW_ADDRESS
+nm_device_olpc_mesh_get_active_channel
+nm_device_olpc_mesh_get_companion
+nm_device_olpc_mesh_get_hw_address
+nm_device_olpc_mesh_new
+
+NM_DEVICE_OLPC_MESH
+NM_DEVICE_OLPC_MESH_CLASS
+NM_DEVICE_OLPC_MESH_GET_CLASS
+NM_IS_DEVICE_OLPC_MESH
+NM_IS_DEVICE_OLPC_MESH_CLASS
+NM_TYPE_DEVICE_OLPC_MESH
+nm_device_olpc_mesh_get_type
+

+
+

+nm-device-vlan
+NMDeviceVlan
+NMDeviceVlan
+NMDeviceVlanClass
+NM_DEVICE_VLAN_CARRIER
+NM_DEVICE_VLAN_HW_ADDRESS
+NM_DEVICE_VLAN_VLAN_ID
+nm_device_vlan_get_carrier
+nm_device_vlan_get_hw_address
+nm_device_vlan_get_vlan_id
+nm_device_vlan_new
+
+NM_DEVICE_VLAN
+NM_DEVICE_VLAN_CLASS
+NM_DEVICE_VLAN_GET_CLASS
+NM_IS_DEVICE_VLAN
+NM_IS_DEVICE_VLAN_CLASS
+NM_TYPE_DEVICE_VLAN
+nm_device_vlan_get_type
+

+
 

 nm-device-wifi
 NMDeviceWifi
@@ -340,6 +435,82 @@ NM_TYPE_DHCP6_CONFIG
 nm_dhcp6_config_get_type
 

 
+

+nm-exported-connection-bindings
+DBUS_GLIB_CLIENT_WRAPPERS_org_freedesktop_NetworkManagerSettings_Connection
+DBUS_GLIB_CLIENT_WRAPPERS_org_freedesktop_NetworkManagerSettings_Connection_Secrets
+dbus_g_proxy_begin_call
+org_freedesktop_NetworkManagerSettings_Connection_Secrets_get_secrets
+org_freedesktop_NetworkManagerSettings_Connection_Secrets_get_secrets_async
+org_freedesktop_NetworkManagerSettings_Connection_Secrets_get_secrets_async_callback
+org_freedesktop_NetworkManagerSettings_Connection_Secrets_get_secrets_reply
+org_freedesktop_NetworkManagerSettings_Connection_delete
+org_freedesktop_NetworkManagerSettings_Connection_delete_async
+org_freedesktop_NetworkManagerSettings_Connection_delete_async_callback
+org_freedesktop_NetworkManagerSettings_Connection_delete_reply
+org_freedesktop_NetworkManagerSettings_Connection_get_settings
+org_freedesktop_NetworkManagerSettings_Connection_get_settings_async
+org_freedesktop_NetworkManagerSettings_Connection_get_settings_async_callback
+org_freedesktop_NetworkManagerSettings_Connection_get_settings_reply
+org_freedesktop_NetworkManagerSettings_Connection_update
+org_freedesktop_NetworkManagerSettings_Connection_update_async
+org_freedesktop_NetworkManagerSettings_Connection_update_async_callback
+org_freedesktop_NetworkManagerSettings_Connection_update_reply
+

+
+

+nm-exported-connection-glue
+dbus_glib_marshal_nm_exported_connection_BOOLEAN__POINTER_POINTER
+dbus_glib_marshal_nm_exported_connection_NONE__BOXED_POINTER
+dbus_glib_marshal_nm_exported_connection_NONE__POINTER
+dbus_glib_marshal_nm_exported_connection_NONE__STRING_BOXED_BOOLEAN_POINTER
+dbus_glib_marshal_nm_exported_connection_VOID__BOXED_POINTER
+dbus_glib_marshal_nm_exported_connection_VOID__POINTER
+dbus_glib_marshal_nm_exported_connection_VOID__STRING_BOXED_BOOLEAN_POINTER
+dbus_glib_nm_exported_connection_object_info
+g_marshal_value_peek_boolean
+g_marshal_value_peek_boxed
+g_marshal_value_peek_char
+g_marshal_value_peek_double
+g_marshal_value_peek_enum
+g_marshal_value_peek_flags
+g_marshal_value_peek_float
+g_marshal_value_peek_int
+g_marshal_value_peek_int64
+g_marshal_value_peek_long
+g_marshal_value_peek_object
+g_marshal_value_peek_param
+g_marshal_value_peek_pointer
+g_marshal_value_peek_string
+g_marshal_value_peek_uchar
+g_marshal_value_peek_uint
+g_marshal_value_peek_uint64
+g_marshal_value_peek_ulong
+g_marshal_value_peek_variant
+

+
+

+nm-glib-enum-types
+
+NM_TYPE_CLIENT_PERMISSION
+NM_TYPE_CLIENT_PERMISSION_RESULT
+NM_TYPE_REMOTE_SETTINGS_ERROR
+NM_TYPE_SECRET_AGENT_ERROR
+NM_TYPE_SECRET_AGENT_GET_SECRETS_FLAGS
+NM_TYPE_WIMAX_NSP_NETWORK_TYPE
+nm_client_permission_get_type
+nm_client_permission_result_get_type
+nm_remote_settings_error_get_type
+nm_secret_agent_error_get_type
+nm_secret_agent_get_secrets_flags_get_type
+nm_wimax_nsp_network_type_get_type
+

+
+

+nm-glib-marshal
+
+

+
 

 nm-ip4-config
 NMIP4Config
@@ -444,6 +615,7 @@ NMRemoteSettingsSaveHostnameFunc
 NM_REMOTE_SETTINGS_BUS
 NM_REMOTE_SETTINGS_CAN_MODIFY
 NM_REMOTE_SETTINGS_CONNECTIONS_READ
+NM_REMOTE_SETTINGS_ERROR
 NM_REMOTE_SETTINGS_HOSTNAME
 NM_REMOTE_SETTINGS_NEW_CONNECTION
 NM_REMOTE_SETTINGS_SERVICE_RUNNING
@@ -453,17 +625,16 @@ nm_remote_settings_get_connection_by_path
 nm_remote_settings_get_connection_by_uuid
 nm_remote_settings_list_connections
 nm_remote_settings_new
+nm_remote_settings_new_async
+nm_remote_settings_new_finish
 nm_remote_settings_save_hostname
 
 NM_IS_REMOTE_SETTINGS
 NM_IS_REMOTE_SETTINGS_CLASS
 NM_REMOTE_SETTINGS
 NM_REMOTE_SETTINGS_CLASS
-NM_REMOTE_SETTINGS_ERROR
 NM_REMOTE_SETTINGS_GET_CLASS
 NM_TYPE_REMOTE_SETTINGS
-NM_TYPE_REMOTE_SETTINGS_ERROR
-nm_remote_settings_error_get_type
 nm_remote_settings_get_type
 

 
@@ -478,6 +649,7 @@ NMSecretAgentGetSecretsFlags
 NMSecretAgentGetSecretsFunc
 NMSecretAgentSaveSecretsFunc
 NM_SECRET_AGENT_AUTO_REGISTER
+NM_SECRET_AGENT_ERROR
 NM_SECRET_AGENT_IDENTIFIER
 NM_SECRET_AGENT_REGISTRATION_RESULT
 nm_secret_agent_delete_secrets
@@ -491,11 +663,8 @@ NM_IS_SECRET_AGENT
 NM_IS_SECRET_AGENT_CLASS
 NM_SECRET_AGENT
 NM_SECRET_AGENT_CLASS
-NM_SECRET_AGENT_ERROR
 NM_SECRET_AGENT_GET_CLASS
 NM_TYPE_SECRET_AGENT
-NM_TYPE_SECRET_AGENT_ERROR
-nm_secret_agent_error_get_type
 nm_secret_agent_get_type
 
 
@@ -529,6 +698,20 @@ g_marshal_value_peek_ulong
 g_marshal_value_peek_variant
 
 
+

+nm-settings-system-bindings
+DBUS_GLIB_CLIENT_WRAPPERS_org_freedesktop_NetworkManagerSettings_System
+dbus_g_proxy_begin_call
+org_freedesktop_NetworkManagerSettings_System_get_permissions
+org_freedesktop_NetworkManagerSettings_System_get_permissions_async
+org_freedesktop_NetworkManagerSettings_System_get_permissions_async_callback
+org_freedesktop_NetworkManagerSettings_System_get_permissions_reply
+org_freedesktop_NetworkManagerSettings_System_save_hostname
+org_freedesktop_NetworkManagerSettings_System_save_hostname_async
+org_freedesktop_NetworkManagerSettings_System_save_hostname_async_callback
+org_freedesktop_NetworkManagerSettings_System_save_hostname_reply
+

+
 

 nm-types
 
@@ -568,6 +751,15 @@ NM_VPN_CONNECTION_GET_CLASS
 nm_vpn_connection_get_type
 

 
+

+nm-vpn-enum-types
+
+NM_TYPE_VPN_PLUGIN_ERROR
+NM_TYPE_VPN_PLUGIN_UI_INTERFACE_PROP
+nm_vpn_plugin_error_get_type
+nm_vpn_plugin_ui_interface_prop_get_type
+

+
 

 nm-vpn-plugin
 NMVPNPlugin
@@ -588,7 +780,6 @@ nm_vpn_plugin_set_state
 NM_IS_VPN_PLUGIN
 NM_IS_VPN_PLUGIN_CLASS
 NM_TYPE_VPN_PLUGIN
-NM_TYPE_VPN_PLUGIN_ERROR
 NM_VPN_PLUGIN
 NM_VPN_PLUGIN_CLASS
 NM_VPN_PLUGIN_ERROR
diff --git a/docs/libnm-glib/libnm-glib.types b/docs/libnm-glib/libnm-glib.types
index 8f3eba73..9f6419d9 100644
--- a/docs/libnm-glib/libnm-glib.types
+++ b/docs/libnm-glib/libnm-glib.types
@@ -6,6 +6,10 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -25,6 +29,10 @@ nm_device_wifi_get_type
 nm_device_modem_get_type
 nm_device_bt_get_type
 nm_device_wimax_get_type
+nm_device_olpc_mesh_get_type
+nm_device_infiniband_get_type
+nm_device_bond_get_type
+nm_device_vlan_get_type
 nm_wimax_nsp_get_type
 nm_access_point_get_type
 nm_ip4_config_get_type
diff --git a/docs/libnm-glib/tmpl/libnm_glib.sgml b/docs/libnm-glib/tmpl/libnm_glib.sgml
index ed0710b9..325e10cb 100644
--- a/docs/libnm-glib/tmpl/libnm_glib.sgml
+++ b/docs/libnm-glib/tmpl/libnm_glib.sgml
@@ -9,13 +9,11 @@ libnm_glib
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-access-point.sgml b/docs/libnm-glib/tmpl/nm-access-point.sgml
index 41cade52..f869ab7c 100644
--- a/docs/libnm-glib/tmpl/nm-access-point.sgml
+++ b/docs/libnm-glib/tmpl/nm-access-point.sgml
@@ -9,13 +9,11 @@ NMAccessPoint
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-active-connection.sgml b/docs/libnm-glib/tmpl/nm-active-connection.sgml
index dedfad8e..5bbb6b3b 100644
--- a/docs/libnm-glib/tmpl/nm-active-connection.sgml
+++ b/docs/libnm-glib/tmpl/nm-active-connection.sgml
@@ -9,13 +9,11 @@ NMActiveConnection
 
 
 
-
 
 
 
 
 
-
 
 
 
@@ -48,6 +46,11 @@ NMActiveConnection
 
 
 
+
+
+
+
+
 
 
 
@@ -58,6 +61,11 @@ NMActiveConnection
 
 
 
+
+
+
+
+
 
 
 
@@ -99,6 +107,13 @@ NMActiveConnection
 
 
 
+
+
+
+
+
+
+
 
 
 
@@ -156,6 +171,15 @@ NMActiveConnection
 @Returns: 
 
 
+
+
+
+
+
+@connection: 
+@Returns: 
+
+
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-client.sgml b/docs/libnm-glib/tmpl/nm-client.sgml
index b8d80874..773592de 100644
--- a/docs/libnm-glib/tmpl/nm-client.sgml
+++ b/docs/libnm-glib/tmpl/nm-client.sgml
@@ -9,13 +9,11 @@ NMClient
 
 
 
-
 
 
 
 
 
-
 
 
 
@@ -390,13 +388,33 @@ NMClient
 @Returns: 
 
 
+
+
+
+
+
+@cancellable: 
+@callback: 
+@user_data: 
+
+
+
+
+
+
+
+@result: 
+@error: 
+@Returns: 
+
+
 
 
 
 
 
 @client: 
-@sleep: 
+@sleep_: 
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device-bond.sgml b/docs/libnm-glib/tmpl/nm-device-bond.sgml
new file mode 100644
index 00000000..d719184c
--- /dev/null
+++ b/docs/libnm-glib/tmpl/nm-device-bond.sgml
@@ -0,0 +1,93 @@
+
+NMDeviceBond
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+@_reserved5: 
+@_reserved6: 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@device: 
+@Returns: 
+
+
+
+
+
+
+
+@device: 
+@Returns: 
+
+
+
+
+
+
+
+@connection: 
+@path: 
+@Returns: 
+
+
diff --git a/docs/libnm-glib/tmpl/nm-device-bt.sgml b/docs/libnm-glib/tmpl/nm-device-bt.sgml
index 9f4ad2b7..bcf2d3c6 100644
--- a/docs/libnm-glib/tmpl/nm-device-bt.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-bt.sgml
@@ -9,13 +9,11 @@ NMDeviceBt
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device-ethernet.sgml b/docs/libnm-glib/tmpl/nm-device-ethernet.sgml
index 2932ba06..b3620ab0 100644
--- a/docs/libnm-glib/tmpl/nm-device-ethernet.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-ethernet.sgml
@@ -9,13 +9,11 @@ NMDeviceEthernet
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device-infiniband-bindings.sgml b/docs/libnm-glib/tmpl/nm-device-infiniband-bindings.sgml
new file mode 100644
index 00000000..09405987
--- /dev/null
+++ b/docs/libnm-glib/tmpl/nm-device-infiniband-bindings.sgml
@@ -0,0 +1,29 @@
+
+nm-device-infiniband-bindings
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/docs/libnm-glib/tmpl/nm-device-infiniband.sgml b/docs/libnm-glib/tmpl/nm-device-infiniband.sgml
new file mode 100644
index 00000000..bd2ef58e
--- /dev/null
+++ b/docs/libnm-glib/tmpl/nm-device-infiniband.sgml
@@ -0,0 +1,93 @@
+
+NMDeviceInfiniband
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+@_reserved5: 
+@_reserved6: 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@device: 
+@Returns: 
+
+
+
+
+
+
+
+@device: 
+@Returns: 
+
+
+
+
+
+
+
+@connection: 
+@path: 
+@Returns: 
+
+
diff --git a/docs/libnm-glib/tmpl/nm-device-modem.sgml b/docs/libnm-glib/tmpl/nm-device-modem.sgml
index 9d855579..a67c4777 100644
--- a/docs/libnm-glib/tmpl/nm-device-modem.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-modem.sgml
@@ -9,13 +9,11 @@ NMDeviceModem
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device-olpc-mesh.sgml b/docs/libnm-glib/tmpl/nm-device-olpc-mesh.sgml
new file mode 100644
index 00000000..69e2cd52
--- /dev/null
+++ b/docs/libnm-glib/tmpl/nm-device-olpc-mesh.sgml
@@ -0,0 +1,114 @@
+
+NMDeviceOlpcMesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+@_reserved5: 
+@_reserved6: 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@device: 
+@Returns: 
+
+
+
+
+
+
+
+@device: 
+@Returns: 
+
+
+
+
+
+
+
+@device: 
+@Returns: 
+
+
+
+
+
+
+
+@connection: 
+@path: 
+@Returns: 
+
+
diff --git a/docs/libnm-glib/tmpl/nm-device-vlan.sgml b/docs/libnm-glib/tmpl/nm-device-vlan.sgml
new file mode 100644
index 00000000..5d38d111
--- /dev/null
+++ b/docs/libnm-glib/tmpl/nm-device-vlan.sgml
@@ -0,0 +1,114 @@
+
+NMDeviceVlan
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+@_reserved5: 
+@_reserved6: 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@device: 
+@Returns: 
+
+
+
+
+
+
+
+@device: 
+@Returns: 
+
+
+
+
+
+
+
+@device: 
+@Returns: 
+
+
+
+
+
+
+
+@connection: 
+@path: 
+@Returns: 
+
+
diff --git a/docs/libnm-glib/tmpl/nm-device-wifi.sgml b/docs/libnm-glib/tmpl/nm-device-wifi.sgml
index 1bfe346e..94cc3e9f 100644
--- a/docs/libnm-glib/tmpl/nm-device-wifi.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-wifi.sgml
@@ -9,13 +9,11 @@ NMDeviceWifi
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device-wimax.sgml b/docs/libnm-glib/tmpl/nm-device-wimax.sgml
index 220bf560..fbda3469 100644
--- a/docs/libnm-glib/tmpl/nm-device-wimax.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-wimax.sgml
@@ -9,13 +9,11 @@ NMDeviceWimax
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device.sgml b/docs/libnm-glib/tmpl/nm-device.sgml
index 0810f93a..c2d02f96 100644
--- a/docs/libnm-glib/tmpl/nm-device.sgml
+++ b/docs/libnm-glib/tmpl/nm-device.sgml
@@ -9,13 +9,11 @@ NMDevice
 
 
 
-
 
 
 
 
 
-
 
 
 
@@ -108,6 +106,11 @@ NMDevice
 
 
 
+
+
+
+
+
 
 
 
@@ -125,7 +128,7 @@ NMDevice
 
 @parent: 
 @state_changed: 
-@connection_valid: 
+@connection_compatible: 
 @_reserved1: 
 @_reserved2: 
 @_reserved3: 
@@ -241,6 +244,13 @@ NMDevice
 
 
 
+
+
+
+
+
+
+
 
 
 
@@ -411,6 +421,16 @@ NMDevice
 @Returns: 
 
 
+
+
+
+
+
+@device: 
+@reason: 
+@Returns: 
+
+
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-dhcp4-config.sgml b/docs/libnm-glib/tmpl/nm-dhcp4-config.sgml
index cef5854d..752a8b2c 100644
--- a/docs/libnm-glib/tmpl/nm-dhcp4-config.sgml
+++ b/docs/libnm-glib/tmpl/nm-dhcp4-config.sgml
@@ -9,13 +9,11 @@ NMDHCP4Config
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-dhcp6-config.sgml b/docs/libnm-glib/tmpl/nm-dhcp6-config.sgml
index 2c113261..d01ac192 100644
--- a/docs/libnm-glib/tmpl/nm-dhcp6-config.sgml
+++ b/docs/libnm-glib/tmpl/nm-dhcp6-config.sgml
@@ -9,13 +9,11 @@ NMDHCP6Config
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-exported-connection-bindings.sgml b/docs/libnm-glib/tmpl/nm-exported-connection-bindings.sgml
new file mode 100644
index 00000000..6d7bd83d
--- /dev/null
+++ b/docs/libnm-glib/tmpl/nm-exported-connection-bindings.sgml
@@ -0,0 +1,213 @@
+
+nm-exported-connection-bindings
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Param1: 
+@Returns: 
+
+
+
+
+
+
+
+@proxy: 
+@IN_setting_name: 
+@IN_hints: 
+@IN_request_new: 
+@OUT_secrets: 
+@Returns: 
+
+
+
+
+
+
+
+@proxy: 
+@IN_setting_name: 
+@IN_hints: 
+@IN_request_new: 
+@callback: 
+@Returns: 
+
+
+
+
+
+
+
+@proxy: 
+@call: 
+@user_data: 
+
+
+
+
+
+
+
+@proxy: 
+@OUT_secrets: 
+@error: 
+@userdata: 
+
+
+
+
+
+
+
+@proxy: 
+@Returns: 
+
+
+
+
+
+
+
+@proxy: 
+@callback: 
+@Returns: 
+
+
+
+
+
+
+
+@proxy: 
+@call: 
+@user_data: 
+
+
+
+
+
+
+
+@proxy: 
+@error: 
+@userdata: 
+
+
+
+
+
+
+
+@proxy: 
+@OUT_settings: 
+@Returns: 
+
+
+
+
+
+
+
+@proxy: 
+@callback: 
+@Returns: 
+
+
+
+
+
+
+
+@proxy: 
+@call: 
+@user_data: 
+
+
+
+
+
+
+
+@proxy: 
+@OUT_settings: 
+@error: 
+@userdata: 
+
+
+
+
+
+
+
+@proxy: 
+@IN_properties: 
+@Returns: 
+
+
+
+
+
+
+
+@proxy: 
+@IN_properties: 
+@callback: 
+@Returns: 
+
+
+
+
+
+
+
+@proxy: 
+@call: 
+@user_data: 
+
+
+
+
+
+
+
+@proxy: 
+@error: 
+@userdata: 
+
+
diff --git a/docs/libnm-glib/tmpl/nm-exported-connection-glue.sgml b/docs/libnm-glib/tmpl/nm-exported-connection-glue.sgml
new file mode 100644
index 00000000..fda72e2e
--- /dev/null
+++ b/docs/libnm-glib/tmpl/nm-exported-connection-glue.sgml
@@ -0,0 +1,247 @@
+
+nm-exported-connection-glue
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@closure: 
+@return_value: 
+@n_param_values: 
+@param_values: 
+@invocation_hint: 
+@marshal_data: 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@closure: 
+@return_value: 
+@n_param_values: 
+@param_values: 
+@invocation_hint: 
+@marshal_data: 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@closure: 
+@return_value: 
+@n_param_values: 
+@param_values: 
+@invocation_hint: 
+@marshal_data: 
+
+
+
+
+
+
+
+
+
+
+
+
+
+@v: 
+
+
+
+
+
+
+
+@v: 
+
+
+
+
+
+
+
+@v: 
+
+
+
+
+
+
+
+@v: 
+
+
+
+
+
+
+
+@v: 
+
+
+
+
+
+
+
+@v: 
+
+
+
+
+
+
+
+@v: 
+
+
+
+
+
+
+
+@v: 
+
+
+
+
+
+
+
+@v: 
+
+
+
+
+
+
+
+@v: 
+
+
+
+
+
+
+
+@v: 
+
+
+
+
+
+
+
+@v: 
+
+
+
+
+
+
+
+@v: 
+
+
+
+
+
+
+
+@v: 
+
+
+
+
+
+
+
+@v: 
+
+
+
+
+
+
+
+@v: 
+
+
+
+
+
+
+
+@v: 
+
+
+
+
+
+
+
+@v: 
+
+
+
+
+
+
+
+@v: 
+
+
diff --git a/docs/libnm-glib/tmpl/nm-glib-enum-types.sgml b/docs/libnm-glib/tmpl/nm-glib-enum-types.sgml
new file mode 100644
index 00000000..a60db68e
--- /dev/null
+++ b/docs/libnm-glib/tmpl/nm-glib-enum-types.sgml
@@ -0,0 +1,22 @@
+
+nm-glib-enum-types
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/docs/libnm-glib/tmpl/nm-glib-marshal.sgml b/docs/libnm-glib/tmpl/nm-glib-marshal.sgml
new file mode 100644
index 00000000..dbe72434
--- /dev/null
+++ b/docs/libnm-glib/tmpl/nm-glib-marshal.sgml
@@ -0,0 +1,22 @@
+
+nm-glib-marshal
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/docs/libnm-glib/tmpl/nm-ip4-config.sgml b/docs/libnm-glib/tmpl/nm-ip4-config.sgml
index e015c2af..0e33ca0b 100644
--- a/docs/libnm-glib/tmpl/nm-ip4-config.sgml
+++ b/docs/libnm-glib/tmpl/nm-ip4-config.sgml
@@ -9,13 +9,11 @@ NMIP4Config
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-ip6-config.sgml b/docs/libnm-glib/tmpl/nm-ip6-config.sgml
index f098e022..f2e66b71 100644
--- a/docs/libnm-glib/tmpl/nm-ip6-config.sgml
+++ b/docs/libnm-glib/tmpl/nm-ip6-config.sgml
@@ -9,13 +9,11 @@ NMIP6Config
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-object.sgml b/docs/libnm-glib/tmpl/nm-object.sgml
index eb07c0da..d79c1522 100644
--- a/docs/libnm-glib/tmpl/nm-object.sgml
+++ b/docs/libnm-glib/tmpl/nm-object.sgml
@@ -9,13 +9,11 @@ NMObject
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-remote-connection.sgml b/docs/libnm-glib/tmpl/nm-remote-connection.sgml
index 40a745c8..594371fd 100644
--- a/docs/libnm-glib/tmpl/nm-remote-connection.sgml
+++ b/docs/libnm-glib/tmpl/nm-remote-connection.sgml
@@ -9,13 +9,11 @@ NMRemoteConnection
 
 
 
-
 
 
 
 
 
-
 
 
 
@@ -55,11 +53,6 @@ NMRemoteConnection
 
 
 
-
-
-
-
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-remote-settings.sgml b/docs/libnm-glib/tmpl/nm-remote-settings.sgml
index a300d9b9..3f24a06c 100644
--- a/docs/libnm-glib/tmpl/nm-remote-settings.sgml
+++ b/docs/libnm-glib/tmpl/nm-remote-settings.sgml
@@ -9,13 +9,11 @@ NMRemoteSettings
 
 
 
-
 
 
 
 
 
-
 
 
 
@@ -129,6 +127,13 @@ NMRemoteSettings
 
 
 
+
+
+
+
+
+
+
 
 
 
@@ -209,6 +214,27 @@ NMRemoteSettings
 @Returns: 
 
 
+
+
+
+
+
+@bus: 
+@cancellable: 
+@callback: 
+@user_data: 
+
+
+
+
+
+
+
+@result: 
+@error: 
+@Returns: 
+
+
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-secret-agent-glue.sgml b/docs/libnm-glib/tmpl/nm-secret-agent-glue.sgml
index c4706cbf..f8b51d7d 100644
--- a/docs/libnm-glib/tmpl/nm-secret-agent-glue.sgml
+++ b/docs/libnm-glib/tmpl/nm-secret-agent-glue.sgml
@@ -9,13 +9,11 @@ nm-secret-agent-glue
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-secret-agent.sgml b/docs/libnm-glib/tmpl/nm-secret-agent.sgml
index 7cacb703..9f31c86b 100644
--- a/docs/libnm-glib/tmpl/nm-secret-agent.sgml
+++ b/docs/libnm-glib/tmpl/nm-secret-agent.sgml
@@ -9,13 +9,11 @@ NMSecretAgent
 
 
 
-
 
 
 
 
 
-
 
 
 
@@ -46,6 +44,11 @@ NMSecretAgent
 
 
 
+
+
+
+
+
 
 
 
@@ -126,6 +129,13 @@ NMSecretAgent
 
 
 
+
+
+
+
+
+
+
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-settings-system-bindings.sgml b/docs/libnm-glib/tmpl/nm-settings-system-bindings.sgml
new file mode 100644
index 00000000..29790794
--- /dev/null
+++ b/docs/libnm-glib/tmpl/nm-settings-system-bindings.sgml
@@ -0,0 +1,120 @@
+
+nm-settings-system-bindings
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Param1: 
+@Returns: 
+
+
+
+
+
+
+
+@proxy: 
+@OUT_permissions: 
+@Returns: 
+
+
+
+
+
+
+
+@proxy: 
+@callback: 
+@Returns: 
+
+
+
+
+
+
+
+@proxy: 
+@call: 
+@user_data: 
+
+
+
+
+
+
+
+@proxy: 
+@OUT_permissions: 
+@error: 
+@userdata: 
+
+
+
+
+
+
+
+@proxy: 
+@IN_hostname: 
+@Returns: 
+
+
+
+
+
+
+
+@proxy: 
+@IN_hostname: 
+@callback: 
+@Returns: 
+
+
+
+
+
+
+
+@proxy: 
+@call: 
+@user_data: 
+
+
+
+
+
+
+
+@proxy: 
+@error: 
+@userdata: 
+
+
diff --git a/docs/libnm-glib/tmpl/nm-types.sgml b/docs/libnm-glib/tmpl/nm-types.sgml
index 18babb0f..1469192e 100644
--- a/docs/libnm-glib/tmpl/nm-types.sgml
+++ b/docs/libnm-glib/tmpl/nm-types.sgml
@@ -9,13 +9,11 @@ nm-types
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-vpn-connection.sgml b/docs/libnm-glib/tmpl/nm-vpn-connection.sgml
index 3086909a..fe3dcbe0 100644
--- a/docs/libnm-glib/tmpl/nm-vpn-connection.sgml
+++ b/docs/libnm-glib/tmpl/nm-vpn-connection.sgml
@@ -9,13 +9,11 @@ NMVPNConnection
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-vpn-enum-types.sgml b/docs/libnm-glib/tmpl/nm-vpn-enum-types.sgml
new file mode 100644
index 00000000..83b976cd
--- /dev/null
+++ b/docs/libnm-glib/tmpl/nm-vpn-enum-types.sgml
@@ -0,0 +1,22 @@
+
+nm-vpn-enum-types
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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 70889355..cf000cae 100644
--- a/docs/libnm-glib/tmpl/nm-vpn-plugin-ui-interface.sgml
+++ b/docs/libnm-glib/tmpl/nm-vpn-plugin-ui-interface.sgml
@@ -9,13 +9,11 @@ NMVpnPluginUiWidget
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-vpn-plugin-utils.sgml b/docs/libnm-glib/tmpl/nm-vpn-plugin-utils.sgml
index ed0ab40b..a35e6a9a 100644
--- a/docs/libnm-glib/tmpl/nm-vpn-plugin-utils.sgml
+++ b/docs/libnm-glib/tmpl/nm-vpn-plugin-utils.sgml
@@ -9,13 +9,11 @@ nm-vpn-plugin-utils
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-vpn-plugin.sgml b/docs/libnm-glib/tmpl/nm-vpn-plugin.sgml
index b6b95132..08e0807c 100644
--- a/docs/libnm-glib/tmpl/nm-vpn-plugin.sgml
+++ b/docs/libnm-glib/tmpl/nm-vpn-plugin.sgml
@@ -9,13 +9,11 @@ NMVPNPlugin
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-wimax-nsp.sgml b/docs/libnm-glib/tmpl/nm-wimax-nsp.sgml
index f5dca7a3..4dd298b7 100644
--- a/docs/libnm-glib/tmpl/nm-wimax-nsp.sgml
+++ b/docs/libnm-glib/tmpl/nm-wimax-nsp.sgml
@@ -9,13 +9,11 @@ NMWimaxNsp
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-util/Makefile.in b/docs/libnm-util/Makefile.in
index f35bd85e..281aa765 100644
--- a/docs/libnm-util/Makefile.in
+++ b/docs/libnm-util/Makefile.in
@@ -114,6 +114,8 @@ GIO_LIBS = @GIO_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_LIBS = @GLIB_LIBS@
+GLIB_MAKEFILE = @GLIB_MAKEFILE@
+GLIB_MKENUMS = @GLIB_MKENUMS@
 GMODULE_CFLAGS = @GMODULE_CFLAGS@
 GMODULE_LIBS = @GMODULE_LIBS@
 GMSGFMT = @GMSGFMT@
@@ -168,11 +170,15 @@ LIBNL2_LIBS = @LIBNL2_LIBS@
 LIBNL3_CFLAGS = @LIBNL3_CFLAGS@
 LIBNL3_LIBS = @LIBNL3_LIBS@
 LIBNL_CFLAGS = @LIBNL_CFLAGS@
+LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@
+LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@
 LIBNL_LIBS = @LIBNL_LIBS@
 LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@
 LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
+LIBSOUP_LIBS = @LIBSOUP_LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
@@ -183,6 +189,7 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+MOC = @MOC@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
@@ -222,6 +229,8 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
 SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
 UDEV_BASE_DIR = @UDEV_BASE_DIR@
 USE_NLS = @USE_NLS@
diff --git a/docs/libnm-util/html/NMConnection.html b/docs/libnm-util/html/NMConnection.html
index 19914db2..45911ba8 100644
--- a/docs/libnm-util/html/NMConnection.html
+++ b/docs/libnm-util/html/NMConnection.html
@@ -49,6 +49,7 @@
                     NMConnection;
                     NMConnectionClass;
 enum                NMConnectionError;
+#define             NM_CONNECTION_ERROR
 #define             NM_CONNECTION_PATH
 void                nm_connection_add_setting           (NMConnection *connection,
                                                          NMSetting *setting);
@@ -59,11 +60,11 @@ enum                gpointer user_data);
 gboolean            nm_connection_compare               (NMConnection *a,
                                                          NMConnection *b,
-                                                         NMSettingCompareFlags flags);
+                                                         NMSettingCompareFlags flags);
 NMSetting *         nm_connection_create_setting        (const char *name);
 gboolean            nm_connection_diff                  (NMConnection *a,
                                                          NMConnection *b,
-                                                         NMSettingCompareFlags flags,
+                                                         NMSettingCompareFlags flags,
                                                          GHashTable **out_settings);
 void                nm_connection_dump                  (NMConnection *connection);
 NMConnection *      nm_connection_duplicate             (NMConnection *connection);
@@ -79,12 +80,15 @@ const char *        NMSetting8021x *    nm_connection_get_setting_802_1x    (NMConnection *connection);
 NMSettingBluetooth * nm_connection_get_setting_bluetooth
                                                         (NMConnection *connection);
+NMSettingBond *     nm_connection_get_setting_bond      (NMConnection *connection);
 NMSetting *         nm_connection_get_setting_by_name   (NMConnection *connection,
                                                          const char *name);
 NMSettingCdma *     nm_connection_get_setting_cdma      (NMConnection *connection);
 NMSettingConnection * nm_connection_get_setting_connection
                                                         (NMConnection *connection);
 NMSettingGsm *      nm_connection_get_setting_gsm       (NMConnection *connection);
+NMSettingInfiniband * nm_connection_get_setting_infiniband
+                                                        (NMConnection *connection);
 NMSettingIP4Config * nm_connection_get_setting_ip4_config
                                                         (NMConnection *connection);
 NMSettingIP6Config * nm_connection_get_setting_ip6_config
@@ -92,6 +96,8 @@ const char *        NMSettingOlpcMesh * nm_connection_get_setting_olpc_mesh (NMConnection *connection);
 NMSettingPPP *      nm_connection_get_setting_ppp       (NMConnection *connection);
 NMSettingPPPOE *    nm_connection_get_setting_pppoe     (NMConnection *connection);
+NMSettingSerial *   nm_connection_get_setting_serial    (NMConnection *connection);
+NMSettingVlan *     nm_connection_get_setting_vlan      (NMConnection *connection);
 NMSettingVPN *      nm_connection_get_setting_vpn       (NMConnection *connection);
 NMSettingWimax *    nm_connection_get_setting_wimax     (NMConnection *connection);
 NMSettingWired *    nm_connection_get_setting_wired     (NMConnection *connection);
@@ -99,6 +105,8 @@ const char *        NMSettingWirelessSecurity * nm_connection_get_setting_wireless_security
                                                         (NMConnection *connection);
 const char *        nm_connection_get_uuid              (NMConnection *connection);
+const char *        nm_connection_get_virtual_iface_name
+                                                        (NMConnection *connection);
 gboolean            nm_connection_is_type               (NMConnection *connection,
                                                          const char *type);
 GType               nm_connection_lookup_setting_type   (const char *name);
@@ -117,7 +125,7 @@ const char *        void                nm_connection_set_path              (NMConnection *connection,
                                                          const char *path);
 GHashTable *        nm_connection_to_hash               (NMConnection *connection,
-                                                         NMSettingHashFlags flags);
+                                                         NMSettingHashFlags flags);
 gboolean            nm_connection_update_secrets        (NMConnection *connection,
                                                          const char *setting_name,
                                                          GHashTable *secrets,
@@ -195,10 +203,10 @@ It should only be accessed through the functions described below.
 

 
enum NMConnectionError

 
typedef enum {
-	NM_CONNECTION_ERROR_UNKNOWN = 0,
-	NM_CONNECTION_ERROR_CONNECTION_SETTING_NOT_FOUND,
-	NM_CONNECTION_ERROR_CONNECTION_TYPE_INVALID,
-	NM_CONNECTION_ERROR_SETTING_NOT_FOUND
+	NM_CONNECTION_ERROR_UNKNOWN = 0,                  /*< nick=UnknownError >*/
+	NM_CONNECTION_ERROR_CONNECTION_SETTING_NOT_FOUND, /*< nick=ConnectionSettingNotFound >*/
+	NM_CONNECTION_ERROR_CONNECTION_TYPE_INVALID,      /*< nick=ConnectionTypeInvalid >*/
+	NM_CONNECTION_ERROR_SETTING_NOT_FOUND             /*< nick=SettingNotFound >*/
 } NMConnectionError;
 

 

@@ -238,6 +246,14 @@ Describes errors that may result from operations involving a 
 

 

+
NM_CONNECTION_ERROR

+
#define NM_CONNECTION_ERROR nm_connection_error_quark ()
+

+

+

+

+

+

 
NM_CONNECTION_PATH

 
#define NM_CONNECTION_PATH "path"
 

@@ -325,7 +341,7 @@ specific secret should be cleared or not. [
nm_connection_compare ()

 
gboolean            nm_connection_compare               (NMConnection *a,
                                                          NMConnection *b,
-                                                         NMSettingCompareFlags flags);

+                                                         NMSettingCompareFlags flags);
 

 Compares two NMConnection objects for similarity, with comparison behavior
 modified by a set of flags.  See nm_setting_compare() for a description of
@@ -383,7 +399,7 @@ Create a new 
nm_connection_diff ()

 
gboolean            nm_connection_diff                  (NMConnection *a,
                                                          NMConnection *b,
-                                                         NMSettingCompareFlags flags,
+                                                         NMSettingCompareFlags flags,
                                                          GHashTable **out_settings);

 

 Compares two NMConnection objects for similarity, with comparison behavior
@@ -414,7 +430,7 @@ No values are returned, only key names.
 if the
 connections differ, on return a hash table mapping setting names to
 second-level GHashTable (utf8 to guint32), which contains the key names that
-differ mapped to one or more of NMSettingDiffResult as a bitfield. [element-type utf8 GLib.HashTable]
+differ mapped to one or more of NMSettingDiffResult as a bitfield. [element-type utf8 GLib.HashTable]
 
 
 
@@ -637,6 +653,29 @@ A shortcut to return any 
+
nm_connection_get_setting_bond ()

+
NMSettingBond *     nm_connection_get_setting_bond      (NMConnection *connection);

+

+A shortcut to return any NMSettingBond the connection might contain.
+

+

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


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

+

+

+

 
nm_connection_get_setting_by_name ()

 
NMSetting *         nm_connection_get_setting_by_name   (NMConnection *connection,
                                                          const char *name);

@@ -737,6 +776,30 @@ A shortcut to return any 
+
nm_connection_get_setting_infiniband ()

+
NMSettingInfiniband * nm_connection_get_setting_infiniband
+                                                        (NMConnection *connection);

+

+A shortcut to return any NMSettingInfiniband the connection might contain.
+

+

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


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

+

+

+

 
nm_connection_get_setting_ip4_config ()

 
NMSettingIP4Config * nm_connection_get_setting_ip4_config
                                                         (NMConnection *connection);

@@ -854,6 +917,52 @@ A shortcut to return any NMSettingPPOE the connection
 

 

 

+
nm_connection_get_setting_serial ()

+
NMSettingSerial *   nm_connection_get_setting_serial    (NMConnection *connection);

+

+A shortcut to return any NMSettingSerial the connection might contain.
+

+

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


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

+

+

+

+
nm_connection_get_setting_vlan ()

+
NMSettingVlan *     nm_connection_get_setting_vlan      (NMConnection *connection);

+

+A shortcut to return any NMSettingVlan the connection might contain.
+

+

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


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

+

+

+

 
nm_connection_get_setting_vpn ()

 
NMSettingVPN *      nm_connection_get_setting_vpn       (NMConnection *connection);

 

@@ -992,6 +1101,32 @@ A shortcut to return the UUID from the connection's 
+
nm_connection_get_virtual_iface_name ()

+
const char *        nm_connection_get_virtual_iface_name
+                                                        (NMConnection *connection);

+

+Returns the name of the virtual kernel interface which the connection
+needs to use if specified in the settings. This function abstracts all
+connection types which require this functionality. For all other
+connection types, this function will return NULL.
+

+

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


connection :
The NMConnection
+
Returns :
Name of the kernel interface or NULL

+

+

+

 
nm_connection_is_type ()

 
gboolean            nm_connection_is_type               (NMConnection *connection,
                                                          const char *type);

@@ -1235,7 +1370,7 @@ which provides the connection
 

 
nm_connection_to_hash ()

 
GHashTable *        nm_connection_to_hash               (NMConnection *connection,
-                                                         NMSettingHashFlags flags);

+                                                         NMSettingHashFlags flags);
 

 Converts the NMConnection into a GHashTable describing the connection,
 suitable for marshalling over D-Bus or serializing.  The hash table mapping
diff --git a/docs/libnm-util/html/NMSetting.html b/docs/libnm-util/html/NMSetting.html
index 63319e1a..3e64eeb0 100644
--- a/docs/libnm-util/html/NMSetting.html
+++ b/docs/libnm-util/html/NMSetting.html
@@ -41,25 +41,26 @@
 

 

 
Synopsis

-
+
 #include <nm-setting.h>
 
                     NMSetting;
                     NMSettingClass;
 gboolean            (*NMSettingClearSecretsWithFlagsFn) (NMSetting *setting,
                                                          const char *secret,
-                                                         NMSettingSecretFlags flags,
+                                                         NMSettingSecretFlags flags,
                                                          gpointer user_data);
-enum                NMSettingCompareFlags;
-enum                NMSettingDiffResult;
+enum                NMSettingCompareFlags;
+enum                NMSettingDiffResult;
 enum                NMSettingError;
-enum                NMSettingHashFlags;
-enum                NMSettingSecretFlags;
+enum                NMSettingHashFlags;
+enum                NMSettingSecretFlags;
 void                (*NMSettingValueIterFn)             (NMSetting *setting,
                                                          const char *key,
                                                          const GValue *value,
                                                          GParamFlags flags,
                                                          gpointer user_data);
+#define             NM_SETTING_ERROR
 #define             NM_SETTING_NAME
 #define             NM_SETTING_PARAM_FUZZY_IGNORE
 #define             NM_SETTING_PARAM_REQUIRED
@@ -71,10 +72,10 @@ enum                gpointer user_data);
 gboolean            nm_setting_compare                  (NMSetting *a,
                                                          NMSetting *b,
-                                                         NMSettingCompareFlags flags);
+                                                         NMSettingCompareFlags flags);
 gboolean            nm_setting_diff                     (NMSetting *a,
                                                          NMSetting *b,
-                                                         NMSettingCompareFlags flags,
+                                                         NMSettingCompareFlags flags,
                                                          gboolean invert_results,
                                                          GHashTable **results);
 NMSetting *         nm_setting_duplicate                (NMSetting *setting);
@@ -85,17 +86,18 @@ enum                char *        nm_setting_get_name                 (NMSetting *setting);
 gboolean            nm_setting_get_secret_flags         (NMSetting *setting,
                                                          const char *secret_name,
-                                                         NMSettingSecretFlags *out_flags,
+                                                         NMSettingSecretFlags *out_flags,
                                                          GError **error);
+const char *        nm_setting_get_virtual_iface_name   (NMSetting *setting);
 GPtrArray *         nm_setting_need_secrets             (NMSetting *setting);
 NMSetting *         nm_setting_new_from_hash            (GType setting_type,
                                                          GHashTable *hash);
 gboolean            nm_setting_set_secret_flags         (NMSetting *setting,
                                                          const char *secret_name,
-                                                         NMSettingSecretFlags flags,
+                                                         NMSettingSecretFlags flags,
                                                          GError **error);
 GHashTable *        nm_setting_to_hash                  (NMSetting *setting,
-                                                         NMSettingHashFlags flags);
+                                                         NMSettingHashFlags flags);
 char *              nm_setting_to_string                (NMSetting *setting);
 gboolean            nm_setting_update_secrets           (NMSetting *setting,
                                                          GHashTable *secrets,
@@ -112,25 +114,44 @@ const char *        NMSetting8021x
          +----NMSettingBluetooth
+         +----NMSettingBond
          +----NMSettingCdma
          +----NMSettingConnection
          +----NMSettingGsm
+         +----NMSettingInfiniband
          +----NMSettingIP4Config
          +----NMSettingIP6Config
          +----NMSettingOlpcMesh
          +----NMSettingPPP
          +----NMSettingPPPOE
          +----NMSettingSerial
+         +----NMSettingVlan
          +----NMSettingVPN
          +----NMSettingWimax
          +----NMSettingWired
          +----NMSettingWireless
          +----NMSettingWirelessSecurity
 

+
+  GEnum
+   +----NMSettingCompareFlags
+

+
+  GEnum
+   +----NMSettingDiffResult
+

 
   GEnum
    +----NMSettingError
 

+
+  GEnum
+   +----NMSettingHashFlags
+

+
+  GEnum
+   +----NMSettingSecretFlags
+

 

 

 
Properties

@@ -200,9 +221,10 @@ It should only be accessed through the functions described below.
 	                                         NMSettingClearSecretsWithFlagsFn func,
 	                                         gpointer user_data);
 
+	const char *(*get_virtual_iface_name) (NMSetting *setting);
+
 	/* Padding for future expansion */
 	void (*_reserved1) (void);
-	void (*_reserved2) (void);
 } NMSettingClass;
 
 

@@ -213,7 +235,7 @@ It should only be accessed through the functions described below.
 
NMSettingClearSecretsWithFlagsFn ()

 
gboolean            (*NMSettingClearSecretsWithFlagsFn) (NMSetting *setting,
                                                          const char *secret,
-                                                         NMSettingSecretFlags flags,
+                                                         NMSettingSecretFlags flags,
                                                          gpointer user_data);

 
@@ -246,7 +268,7 @@ It should only be accessed through the functions described below.
 

-
enum NMSettingCompareFlags

+
enum NMSettingCompareFlags

 
typedef enum {
 	NM_SETTING_COMPARE_FLAG_EXACT = 0x00000000,
 	NM_SETTING_COMPARE_FLAG_FUZZY = 0x00000001,
@@ -304,7 +326,7 @@ storage (ie, the secret's flag includes NM_SETTING_S
 

-
enum NMSettingDiffResult

+
enum NMSettingDiffResult

 
typedef enum {
 	NM_SETTING_DIFF_RESULT_UNKNOWN = 0x00000000,
 	NM_SETTING_DIFF_RESULT_IN_A =    0x00000001,
@@ -339,10 +361,10 @@ These values indicate the result of a setting difference operation.
 

 
enum NMSettingError

 
typedef enum {
-	NM_SETTING_ERROR_UNKNOWN = 0,
-	NM_SETTING_ERROR_PROPERTY_NOT_FOUND,
-	NM_SETTING_ERROR_PROPERTY_NOT_SECRET,
-	NM_SETTING_ERROR_PROPERTY_TYPE_MISMATCH
+	NM_SETTING_ERROR_UNKNOWN = 0,           /*< nick=UnknownError >*/
+	NM_SETTING_ERROR_PROPERTY_NOT_FOUND,    /*< nick=PropertyNotFound >*/
+	NM_SETTING_ERROR_PROPERTY_NOT_SECRET,   /*< nick=PropertyNotSecret >*/
+	NM_SETTING_ERROR_PROPERTY_TYPE_MISMATCH /*< nick=PropertyTypeMismatch >*/
 } NMSettingError;
 

 

@@ -380,7 +402,7 @@ Describes errors that may result from operations involving a 
 

 

-
enum NMSettingHashFlags

+
enum NMSettingHashFlags

 
typedef enum {
 	NM_SETTING_HASH_FLAG_ALL = 0x00000000,
 	NM_SETTING_HASH_FLAG_NO_SECRETS = 0x00000001,
@@ -414,7 +436,7 @@ when calling 
-
enum NMSettingSecretFlags

+
enum NMSettingSecretFlags

 
typedef enum {
 	NM_SETTING_SECRET_FLAG_NONE         = 0x00000000,
 	NM_SETTING_SECRET_FLAG_AGENT_OWNED  = 0x00000001,
@@ -502,6 +524,14 @@ secret is not required
 

 

 

+
NM_SETTING_ERROR

+
#define NM_SETTING_ERROR nm_setting_error_quark ()
+

+

+

+

+

+

 
NM_SETTING_NAME

 
#define NM_SETTING_NAME "name"
 

@@ -594,10 +624,10 @@ specific secret should be cleared or not. [
nm_setting_compare ()

 
gboolean            nm_setting_compare                  (NMSetting *a,
                                                          NMSetting *b,
-                                                         NMSettingCompareFlags flags);

+                                                         NMSettingCompareFlags flags);

 

 Compares two NMSetting objects for similarity, with comparison behavior
-modified by a set of flags.  See the documentation for NMSettingCompareFlags
+modified by a set of flags.  See the documentation for NMSettingCompareFlags
 for a description of each flag's behavior.
 

 

 

 
 
 
 

@@ -630,15 +660,15 @@ for a description of each flag's behavior.
 
nm_setting_diff ()

 
gboolean            nm_setting_diff                     (NMSetting *a,
                                                          NMSetting *b,
-                                                         NMSettingCompareFlags flags,
+                                                         NMSettingCompareFlags flags,
                                                          gboolean invert_results,
                                                          GHashTable **results);

 

 Compares two NMSetting objects for similarity, with comparison behavior
-modified by a set of flags.  See the documentation for NMSettingCompareFlags
+modified by a set of flags.  See the documentation for NMSettingCompareFlags
 for a description of each flag's behavior.  If the settings differ, the keys
 of each setting that differ from the other are added to results, mapped to
-one or more NMSettingDiffResult values.
+one or more NMSettingDiffResult values.
 

 
@@ -660,13 +690,13 @@ one or more invert_results :

 
+be set to FALSE.  If TRUE inverts the meaning of the NMSettingDiffResult.
 
@@ -775,10 +805,10 @@ like 'ppp' or 'wireless' or 'wired'.
 
nm_setting_get_secret_flags ()

 
gboolean            nm_setting_get_secret_flags         (NMSetting *setting,
                                                          const char *secret_name,
-                                                         NMSettingSecretFlags *out_flags,
+                                                         NMSettingSecretFlags *out_flags,
                                                          GError **error);

 

-For a given secret, retrieves the NMSettingSecretFlags describing how to
+For a given secret, retrieves the NMSettingSecretFlags describing how to
 handle that secret.
 

 

 

this parameter is used internally by libnm-util and should
-be set to FALSE.  If TRUE inverts the meaning of the NMSettingDiffResult.

 

 
results :

 if the
 settings differ, on return a hash table mapping the differing keys to one or
-more NMSettingDiffResult values OR-ed together.  If the settings do not
+more NMSettingDiffResult values OR-ed together.  If the settings do not
 differ, any hash table passed in is unmodified.  If no hash table is passed
 in and the settings differ, a new one is created and returned. [inout][transfer full][element-type utf8 guint32]
 

@@ -795,7 +825,7 @@ handle that secret.
 
 
-
+
@@ -812,6 +842,30 @@ this setting, and if that property is secret), FALSE if not
 
 

 

+
nm_setting_get_virtual_iface_name ()

+
const char *        nm_setting_get_virtual_iface_name   (NMSetting *setting);

+

+Returns the name of the virtual kernel interface which the connection
+needs to use if specified in the settings.
+

+

 
out_flags :
on success, the NMSettingSecretFlags for the secreton success, the NMSettingSecretFlags for the secret
 

 

 
error :

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


setting :
the NMSetting
+
Returns :
Name of the virtual interface or NULL if the setting does not
+support this feature

+

+

+

 
nm_setting_need_secrets ()

 
GPtrArray *         nm_setting_need_secrets             (NMSetting *setting);

 

@@ -878,10 +932,10 @@ hash table, or NULL on failure
 
nm_setting_set_secret_flags ()

 
gboolean            nm_setting_set_secret_flags         (NMSetting *setting,
                                                          const char *secret_name,
-                                                         NMSettingSecretFlags flags,
+                                                         NMSettingSecretFlags flags,
                                                          GError **error);

 

-For a given secret, retrieves the NMSettingSecretFlags describing how to
+For a given secret, retrieves the NMSettingSecretFlags describing how to
 handle that secret.
 

 

@@ -898,7 +952,7 @@ handle that secret.
 
-
+
@@ -917,7 +971,7 @@ this setting, and if that property is secret), FALSE if not

 
nm_setting_to_hash ()

 
GHashTable *        nm_setting_to_hash                  (NMSetting *setting,
-                                                         NMSettingHashFlags flags);

+                                                         NMSettingHashFlags flags);
 

 Converts the NMSetting into a GHashTable mapping each setting property
 name to a GValue describing that property, suitable for marshalling over
diff --git a/docs/libnm-util/html/NMSetting8021x.html b/docs/libnm-util/html/NMSetting8021x.html
index 1318a65c..ba179c4a 100644
--- a/docs/libnm-util/html/NMSetting8021x.html
+++ b/docs/libnm-util/html/NMSetting8021x.html
@@ -41,12 +41,12 @@
 

 

 
flags :
the NMSettingSecretFlags for the secretthe NMSettingSecretFlags for the secret
 

 

 
error :

 

 

 
Synopsis

-
+
 #include <nm-setting-8021x.h>
 
                     NMSetting8021x;
-enum                NMSetting8021xCKFormat;
-enum                NMSetting8021xCKScheme;
+enum                NMSetting8021xCKFormat;
+enum                NMSetting8021xCKScheme;
                     NMSetting8021xClass;
 enum                NMSetting8021xError;
 #define             NM_SETTING_802_1X_ALTSUBJECT_MATCHES
@@ -55,9 +55,13 @@ enum                NM_SETTING_802_1X_CA_PATH
 #define             NM_SETTING_802_1X_CLIENT_CERT
 #define             NM_SETTING_802_1X_EAP
+#define             NM_SETTING_802_1X_ERROR
 #define             NM_SETTING_802_1X_IDENTITY
+#define             NM_SETTING_802_1X_PAC_FILE
 #define             NM_SETTING_802_1X_PASSWORD
 #define             NM_SETTING_802_1X_PASSWORD_FLAGS
+#define             NM_SETTING_802_1X_PASSWORD_RAW
+#define             NM_SETTING_802_1X_PASSWORD_RAW_FLAGS
 #define             NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING
 #define             NM_SETTING_802_1X_PHASE1_PEAPLABEL
 #define             NM_SETTING_802_1X_PHASE1_PEAPVER
@@ -100,14 +104,14 @@ const char *        NMSetting8021x *setting);
 const GByteArray *  nm_setting_802_1x_get_ca_cert_blob  (NMSetting8021x *setting);
 const char *        nm_setting_802_1x_get_ca_cert_path  (NMSetting8021x *setting);
-NMSetting8021xCKScheme nm_setting_802_1x_get_ca_cert_scheme
+NMSetting8021xCKScheme nm_setting_802_1x_get_ca_cert_scheme
                                                         (NMSetting8021x *setting);
 const char *        nm_setting_802_1x_get_ca_path       (NMSetting8021x *setting);
 const GByteArray *  nm_setting_802_1x_get_client_cert_blob
                                                         (NMSetting8021x *setting);
 const char *        nm_setting_802_1x_get_client_cert_path
                                                         (NMSetting8021x *setting);
-NMSetting8021xCKScheme nm_setting_802_1x_get_client_cert_scheme
+NMSetting8021xCKScheme nm_setting_802_1x_get_client_cert_scheme
                                                         (NMSetting8021x *setting);
 const char *        nm_setting_802_1x_get_eap_method    (NMSetting8021x *setting,
                                                          guint32 i);
@@ -118,8 +122,12 @@ const char *        NMSetting8021x *setting);
 guint32             nm_setting_802_1x_get_num_phase2_altsubject_matches
                                                         (NMSetting8021x *setting);
+const char *        nm_setting_802_1x_get_pac_file      (NMSetting8021x *setting);
 const char *        nm_setting_802_1x_get_password      (NMSetting8021x *setting);
-NMSettingSecretFlags nm_setting_802_1x_get_password_flags
+NMSettingSecretFlags nm_setting_802_1x_get_password_flags
+                                                        (NMSetting8021x *setting);
+const GByteArray *  nm_setting_802_1x_get_password_raw  (NMSetting8021x *setting);
+NMSettingSecretFlags nm_setting_802_1x_get_password_raw_flags
                                                         (NMSetting8021x *setting);
 const char *        nm_setting_802_1x_get_phase1_fast_provisioning
                                                         (NMSetting8021x *setting);
@@ -137,7 +145,7 @@ const NMSetting8021x *setting);
 const char *        nm_setting_802_1x_get_phase2_ca_cert_path
                                                         (NMSetting8021x *setting);
-NMSetting8021xCKScheme nm_setting_802_1x_get_phase2_ca_cert_scheme
+NMSetting8021xCKScheme nm_setting_802_1x_get_phase2_ca_cert_scheme
                                                         (NMSetting8021x *setting);
 const char *        nm_setting_802_1x_get_phase2_ca_path
                                                         (NMSetting8021x *setting);
@@ -145,35 +153,35 @@ const NMSetting8021x *setting);
 const char *        nm_setting_802_1x_get_phase2_client_cert_path
                                                         (NMSetting8021x *setting);
-NMSetting8021xCKScheme nm_setting_802_1x_get_phase2_client_cert_scheme
+NMSetting8021xCKScheme nm_setting_802_1x_get_phase2_client_cert_scheme
                                                         (NMSetting8021x *setting);
 const GByteArray *  nm_setting_802_1x_get_phase2_private_key_blob
                                                         (NMSetting8021x *setting);
-NMSetting8021xCKFormat nm_setting_802_1x_get_phase2_private_key_format
+NMSetting8021xCKFormat nm_setting_802_1x_get_phase2_private_key_format
                                                         (NMSetting8021x *setting);
 const char *        nm_setting_802_1x_get_phase2_private_key_password
                                                         (NMSetting8021x *setting);
-NMSettingSecretFlags nm_setting_802_1x_get_phase2_private_key_password_flags
+NMSettingSecretFlags nm_setting_802_1x_get_phase2_private_key_password_flags
                                                         (NMSetting8021x *setting);
 const char *        nm_setting_802_1x_get_phase2_private_key_path
                                                         (NMSetting8021x *setting);
-NMSetting8021xCKScheme nm_setting_802_1x_get_phase2_private_key_scheme
+NMSetting8021xCKScheme nm_setting_802_1x_get_phase2_private_key_scheme
                                                         (NMSetting8021x *setting);
 const char *        nm_setting_802_1x_get_phase2_subject_match
                                                         (NMSetting8021x *setting);
 const char *        nm_setting_802_1x_get_pin           (NMSetting8021x *setting);
-NMSettingSecretFlags nm_setting_802_1x_get_pin_flags    (NMSetting8021x *setting);
+NMSettingSecretFlags nm_setting_802_1x_get_pin_flags    (NMSetting8021x *setting);
 const GByteArray *  nm_setting_802_1x_get_private_key_blob
                                                         (NMSetting8021x *setting);
-NMSetting8021xCKFormat nm_setting_802_1x_get_private_key_format
+NMSetting8021xCKFormat nm_setting_802_1x_get_private_key_format
                                                         (NMSetting8021x *setting);
 const char *        nm_setting_802_1x_get_private_key_password
                                                         (NMSetting8021x *setting);
-NMSettingSecretFlags nm_setting_802_1x_get_private_key_password_flags
+NMSettingSecretFlags nm_setting_802_1x_get_private_key_password_flags
                                                         (NMSetting8021x *setting);
 const char *        nm_setting_802_1x_get_private_key_path
                                                         (NMSetting8021x *setting);
-NMSetting8021xCKScheme nm_setting_802_1x_get_private_key_scheme
+NMSetting8021xCKScheme nm_setting_802_1x_get_private_key_scheme
                                                         (NMSetting8021x *setting);
 const char *        nm_setting_802_1x_get_subject_match (NMSetting8021x *setting);
 gboolean            nm_setting_802_1x_get_system_ca_certs
@@ -189,38 +197,38 @@ const char *        guint32 i);
 gboolean            nm_setting_802_1x_set_ca_cert       (NMSetting8021x *setting,
                                                          const char *cert_path,
-                                                         NMSetting8021xCKScheme scheme,
-                                                         NMSetting8021xCKFormat *out_format,
+                                                         NMSetting8021xCKScheme scheme,
+                                                         NMSetting8021xCKFormat *out_format,
                                                          GError **error);
 gboolean            nm_setting_802_1x_set_client_cert   (NMSetting8021x *setting,
                                                          const char *cert_path,
-                                                         NMSetting8021xCKScheme scheme,
-                                                         NMSetting8021xCKFormat *out_format,
+                                                         NMSetting8021xCKScheme scheme,
+                                                         NMSetting8021xCKFormat *out_format,
                                                          GError **error);
 gboolean            nm_setting_802_1x_set_phase2_ca_cert
                                                         (NMSetting8021x *setting,
                                                          const char *cert_path,
-                                                         NMSetting8021xCKScheme scheme,
-                                                         NMSetting8021xCKFormat *out_format,
+                                                         NMSetting8021xCKScheme scheme,
+                                                         NMSetting8021xCKFormat *out_format,
                                                          GError **error);
 gboolean            nm_setting_802_1x_set_phase2_client_cert
                                                         (NMSetting8021x *setting,
                                                          const char *cert_path,
-                                                         NMSetting8021xCKScheme scheme,
-                                                         NMSetting8021xCKFormat *out_format,
+                                                         NMSetting8021xCKScheme scheme,
+                                                         NMSetting8021xCKFormat *out_format,
                                                          GError **error);
 gboolean            nm_setting_802_1x_set_phase2_private_key
                                                         (NMSetting8021x *setting,
                                                          const char *key_path,
                                                          const char *password,
-                                                         NMSetting8021xCKScheme scheme,
-                                                         NMSetting8021xCKFormat *out_format,
+                                                         NMSetting8021xCKScheme scheme,
+                                                         NMSetting8021xCKFormat *out_format,
                                                          GError **error);
 gboolean            nm_setting_802_1x_set_private_key   (NMSetting8021x *setting,
                                                          const char *key_path,
                                                          const char *password,
-                                                         NMSetting8021xCKScheme scheme,
-                                                         NMSetting8021xCKFormat *out_format,
+                                                         NMSetting8021xCKScheme scheme,
+                                                         NMSetting8021xCKFormat *out_format,
                                                          GError **error);
 

 

@@ -231,6 +239,14 @@ const char *        NMSetting
          +----NMSetting8021x
 
+
+  GEnum
+   +----NMSetting8021xCKFormat
+

+
+  GEnum
+   +----NMSetting8021xCKScheme
+

 
   GEnum
    +----NMSetting8021xError
@@ -246,8 +262,11 @@ const char *        client-cert"              GArray_guchar_*       : Read / Write
   "eap"                      GSList_gchararray_*   : Read / Write
   "identity"                 gchar*                : Read / Write
+  "pac-file"                 gchar*                : Read / Write
   "password"                 gchar*                : Read / Write
   "password-flags"           guint                 : Read / Write
+  "password-raw"             GArray_guchar_*       : Read / Write
+  "password-raw-flags"       guint                 : Read / Write
   "phase1-fast-provisioning" gchar*                : Read / Write
   "phase1-peaplabel"         gchar*                : Read / Write
   "phase1-peapver"           gchar*                : Read / Write
@@ -309,8 +328,9 @@ following books.
 

 

 

-
enum NMSetting8021xCKFormat

+
enum NMSetting8021xCKFormat

 
typedef enum {
+ /*< underscore_name=nm_setting_802_1x_ck_format >*/
 	NM_SETTING_802_1X_CK_FORMAT_UNKNOWN = 0,
 	NM_SETTING_802_1X_CK_FORMAT_X509,
 	NM_SETTING_802_1X_CK_FORMAT_RAW_KEY,
@@ -318,7 +338,7 @@ following books.
 } NMSetting8021xCKFormat;
 

 

-NMSetting8021xCKFormat values indicate the general type of a certificate
+NMSetting8021xCKFormat values indicate the general type of a certificate
 or private key
 

 

@@ -351,15 +371,16 @@ and private key
 

-
enum NMSetting8021xCKScheme

+
enum NMSetting8021xCKScheme

 
typedef enum {
+ /*< underscore_name=nm_setting_802_1x_ck_scheme >*/
 	NM_SETTING_802_1X_CK_SCHEME_UNKNOWN = 0,
 	NM_SETTING_802_1X_CK_SCHEME_BLOB,
 	NM_SETTING_802_1X_CK_SCHEME_PATH
 } NMSetting8021xCKScheme;
 

 

-NMSetting8021xCKScheme values indicate how a certificate or private key is
+NMSetting8021xCKScheme values indicate how a certificate or private key is
 stored in the setting properties, either as a blob of the item's data, or as
 a path to a certificate or private key file on the filesystem
 

@@ -407,9 +428,10 @@ to a file containing the certificate or key data
 

 
enum NMSetting8021xError

 
typedef enum {
-	NM_SETTING_802_1X_ERROR_UNKNOWN = 0,
-	NM_SETTING_802_1X_ERROR_INVALID_PROPERTY,
-	NM_SETTING_802_1X_ERROR_MISSING_PROPERTY
+ /*< underscore_name=nm_setting_802_1x_error >*/
+	NM_SETTING_802_1X_ERROR_UNKNOWN = 0,      /*< nick=UnknownError >*/
+	NM_SETTING_802_1X_ERROR_INVALID_PROPERTY, /*< nick=InvalidProperty >*/
+	NM_SETTING_802_1X_ERROR_MISSING_PROPERTY  /*< nick=MissingProperty >*/
 } NMSetting8021xError;
 

 

 
 

@@ -484,6 +506,14 @@ required
 

+
NM_SETTING_802_1X_ERROR

+
#define NM_SETTING_802_1X_ERROR nm_setting_802_1x_error_quark ()
+

+

+

+

+

+

 
NM_SETTING_802_1X_IDENTITY

 
#define NM_SETTING_802_1X_IDENTITY "identity"
 

@@ -492,6 +522,14 @@ required
 

+
NM_SETTING_802_1X_PAC_FILE

+
#define NM_SETTING_802_1X_PAC_FILE "pac-file"
+

+

+

+

+

+

 
NM_SETTING_802_1X_PASSWORD

 
#define NM_SETTING_802_1X_PASSWORD "password"
 

@@ -508,6 +546,22 @@ required
 

+
NM_SETTING_802_1X_PASSWORD_RAW

+
#define NM_SETTING_802_1X_PASSWORD_RAW "password-raw"
+

+

+

+

+

+

+
NM_SETTING_802_1X_PASSWORD_RAW_FLAGS

+
#define NM_SETTING_802_1X_PASSWORD_RAW_FLAGS "password-raw-flags"
+

+

+

+

+

+

 
NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING

 
#define NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING "phase1-fast-provisioning"
 

@@ -944,7 +998,7 @@ of the network cannot be confirmed by the client.
 

 

 
nm_setting_802_1x_get_ca_cert_scheme ()

-
NMSetting8021xCKScheme nm_setting_802_1x_get_ca_cert_scheme
+
NMSetting8021xCKScheme nm_setting_802_1x_get_ca_cert_scheme
                                                         (NMSetting8021x *setting);

 

 Returns the scheme used to store the CA certificate.  If the returned scheme
@@ -1045,7 +1099,7 @@ authentication method.
 

 

 
nm_setting_802_1x_get_client_cert_scheme ()

-
NMSetting8021xCKScheme nm_setting_802_1x_get_client_cert_scheme
+
NMSetting8021xCKScheme nm_setting_802_1x_get_client_cert_scheme
                                                         (NMSetting8021x *setting);

 

 Returns the scheme used to store the client certificate.  If the returned scheme
@@ -1195,6 +1249,28 @@ Returns the number of entries in the
 

 

 

+
nm_setting_802_1x_get_pac_file ()

+
const char *        nm_setting_802_1x_get_pac_file      (NMSetting8021x *setting);

+

+Returns the file containing PAC credentials used by EAP-FAST method.
+

+

 
 
 
 
 
 

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


setting :
the NMSetting8021x
+
Returns :
the PAC file

+

+

+

 
nm_setting_802_1x_get_password ()

 
const char *        nm_setting_802_1x_get_password      (NMSetting8021x *setting);

 

@@ -1216,7 +1292,7 @@ by the 
 

 
nm_setting_802_1x_get_password_flags ()

-
NMSettingSecretFlags nm_setting_802_1x_get_password_flags
+
NMSettingSecretFlags nm_setting_802_1x_get_password_flags
                                                         (NMSetting8021x *setting);

 
@@ -1228,7 +1304,50 @@ by the 
 
-
+
+
+

 


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

+

+

+

+
nm_setting_802_1x_get_password_raw ()

+
const GByteArray *  nm_setting_802_1x_get_password_raw  (NMSetting8021x *setting);

+

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


setting :
the NMSetting8021x
+
Returns :
the password used by the authentication method as a
+UTF-8-encoded array of bytes, as specified by the
+"password-raw" property

+

+

+

+
nm_setting_802_1x_get_password_raw_flags ()

+
NMSettingSecretFlags nm_setting_802_1x_get_password_raw_flags
+                                                        (NMSetting8021x *setting);

+

++
+
+
+
+
+
+
+
@@ -1431,7 +1550,7 @@ of the network cannot be confirmed by the client.
 

 
nm_setting_802_1x_get_phase2_ca_cert_scheme ()

-
NMSetting8021xCKScheme nm_setting_802_1x_get_phase2_ca_cert_scheme
+
NMSetting8021xCKScheme nm_setting_802_1x_get_phase2_ca_cert_scheme
                                                         (NMSetting8021x *setting);

 

 Returns the scheme used to store the "phase 2" CA certificate.  If the
@@ -1534,7 +1653,7 @@ authentication method.
 

 

 
nm_setting_802_1x_get_phase2_client_cert_scheme ()

-
NMSetting8021xCKScheme nm_setting_802_1x_get_phase2_client_cert_scheme
+
NMSetting8021xCKScheme nm_setting_802_1x_get_phase2_client_cert_scheme
                                                         (NMSetting8021x *setting);

 

 Returns the scheme used to store the "phase 2" client certificate.  If the
@@ -1591,7 +1710,7 @@ keys should always be encrypted with a private key password.
 

 

 
nm_setting_802_1x_get_phase2_private_key_format ()

-
NMSetting8021xCKFormat nm_setting_802_1x_get_phase2_private_key_format
+
NMSetting8021xCKFormat nm_setting_802_1x_get_phase2_private_key_format
                                                         (NMSetting8021x *setting);

 


setting :
the NMSetting8021x
+
Returns :
the NMSettingSecretFlags pertaining to the
+"password-raw"
 
 

 
 
@@ -1634,7 +1753,7 @@ previously set with 
 
nm_setting_802_1x_get_phase2_private_key_password_flags ()

-
NMSettingSecretFlags nm_setting_802_1x_get_phase2_private_key_password_flags
+
NMSettingSecretFlags nm_setting_802_1x_get_phase2_private_key_password_flags
                                                         (NMSetting8021x *setting);

 

 

@@ -1646,7 +1765,7 @@ previously set with Returns :

-
@@ -1681,7 +1800,7 @@ authentication method.
 

 

 
nm_setting_802_1x_get_phase2_private_key_scheme ()

-
NMSetting8021xCKScheme nm_setting_802_1x_get_phase2_private_key_scheme
+
NMSetting8021xCKScheme nm_setting_802_1x_get_phase2_private_key_scheme
                                                         (NMSetting8021x *setting);

 

 Returns the scheme used to store the "phase 2" private key.  If the returned
@@ -1751,7 +1870,7 @@ by the "pin" property
 

 

 
nm_setting_802_1x_get_pin_flags ()

-
NMSettingSecretFlags nm_setting_802_1x_get_pin_flags    (NMSetting8021x *setting);

+
NMSettingSecretFlags nm_setting_802_1x_get_pin_flags    (NMSetting8021x *setting);

 

 

the NMSettingSecretFlags pertaining to the
+the NMSettingSecretFlags pertaining to the
 "phase2-private-key-password"
 
 

@@ -1762,7 +1881,7 @@ by the "pin" property
-
@@ -1802,7 +1921,7 @@ keys should always be encrypted with a private key password.
 

 
nm_setting_802_1x_get_private_key_format ()

-
NMSetting8021xCKFormat nm_setting_802_1x_get_private_key_format
+
NMSetting8021xCKFormat nm_setting_802_1x_get_private_key_format
                                                         (NMSetting8021x *setting);

 

 
 
 
 

 
Returns :
the NMSettingSecretFlags pertaining to the
+the NMSettingSecretFlags pertaining to the
 "pin"
 
 

 
@@ -1845,7 +1964,7 @@ previously set with 
 
nm_setting_802_1x_get_private_key_password_flags ()

-
NMSettingSecretFlags nm_setting_802_1x_get_private_key_password_flags
+
NMSettingSecretFlags nm_setting_802_1x_get_private_key_password_flags
                                                         (NMSetting8021x *setting);

 

 

@@ -1857,7 +1976,7 @@ previously set with Returns :

-
@@ -1892,7 +2011,7 @@ authentication method.
 

 

 
nm_setting_802_1x_get_private_key_scheme ()

-
NMSetting8021xCKScheme nm_setting_802_1x_get_private_key_scheme
+
NMSetting8021xCKScheme nm_setting_802_1x_get_private_key_scheme
                                                         (NMSetting8021x *setting);

 

 Returns the scheme used to store the private key.  If the returned scheme is
@@ -2057,8 +2176,8 @@ Removes the allowed "phase 2" altSubjectName at the specified index.
 
nm_setting_802_1x_set_ca_cert ()

 
gboolean            nm_setting_802_1x_set_ca_cert       (NMSetting8021x *setting,
                                                          const char *cert_path,
-                                                         NMSetting8021xCKScheme scheme,
-                                                         NMSetting8021xCKFormat *out_format,
+                                                         NMSetting8021xCKScheme scheme,
+                                                         NMSetting8021xCKFormat *out_format,
                                                          GError **error);

 

 Reads a certificate from disk and sets the "ca-cert" property
@@ -2106,8 +2225,8 @@ clears the CA certificate.
 
nm_setting_802_1x_set_client_cert ()

 
gboolean            nm_setting_802_1x_set_client_cert   (NMSetting8021x *setting,
                                                          const char *cert_path,
-                                                         NMSetting8021xCKScheme scheme,
-                                                         NMSetting8021xCKFormat *out_format,
+                                                         NMSetting8021xCKScheme scheme,
+                                                         NMSetting8021xCKFormat *out_format,
                                                          GError **error);

 

 Reads a certificate from disk and sets the "client-cert"
@@ -2161,8 +2280,8 @@ any scheme clears the client certificate
 
gboolean            nm_setting_802_1x_set_phase2_ca_cert
                                                         (NMSetting8021x *setting,
                                                          const char *cert_path,
-                                                         NMSetting8021xCKScheme scheme,
-                                                         NMSetting8021xCKFormat *out_format,
+                                                         NMSetting8021xCKScheme scheme,
+                                                         NMSetting8021xCKFormat *out_format,
                                                          GError **error);

 

 Reads a certificate from disk and sets the "phase2-ca-cert"
@@ -2211,8 +2330,8 @@ clears the "phase2" CA certificate.
 
gboolean            nm_setting_802_1x_set_phase2_client_cert
                                                         (NMSetting8021x *setting,
                                                          const char *cert_path,
-                                                         NMSetting8021xCKScheme scheme,
-                                                         NMSetting8021xCKFormat *out_format,
+                                                         NMSetting8021xCKScheme scheme,
+                                                         NMSetting8021xCKFormat *out_format,
                                                          GError **error);

 

 Reads a certificate from disk and sets the "phase2-client-cert"
@@ -2267,8 +2386,8 @@ any scheme clears the "phase2" client ce
                                                         (NMSetting8021x *setting,
                                                          const char *key_path,
                                                          const char *password,
-                                                         NMSetting8021xCKScheme scheme,
-                                                         NMSetting8021xCKFormat *out_format,
+                                                         NMSetting8021xCKScheme scheme,
+                                                         NMSetting8021xCKFormat *out_format,
                                                          GError **error);

 

 Private keys are used to authenticate the connecting client to the network
@@ -2343,8 +2462,8 @@ an error is returned.
 
gboolean            nm_setting_802_1x_set_private_key   (NMSetting8021x *setting,
                                                          const char *key_path,
                                                          const char *password,
-                                                         NMSetting8021xCKScheme scheme,
-                                                         NMSetting8021xCKFormat *out_format,
+                                                         NMSetting8021xCKScheme scheme,
+                                                         NMSetting8021xCKFormat *out_format,
                                                          GError **error);

 

 Private keys are used to authenticate the connecting client to the network
@@ -2492,10 +2611,21 @@ user or login name.
 

+
The "pac-file" property

+
  "pac-file"                 gchar*                : Read / Write

+

+UTF-8 encoded file path containing PAC for EAP-FAST.
+

+
Default value: NULL

+

+

+

 
The "password" property

 
  "password"                 gchar*                : Read / Write

 

-Password used for EAP authentication methods.
+Password used for EAP authentication methods. If both
+"password" and "password-raw" are
+specified, "password" is preferred.
 

 
Default value: NULL

 

@@ -2511,6 +2641,27 @@ Flags indicating how to handle 
+
The "password-raw" property

+
  "password-raw"             GArray_guchar_*       : Read / Write

+

+Password used for EAP authentication methods delivered as a
+UTF-8-encoded array of bytes. If both "password"
+and "password-raw" are specified,
+"password" is preferred.
+

+
+

+

+
The "password-raw-flags" property

+
  "password-raw-flags"       guint                 : Read / Write

+

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

+
Allowed values: <= 7

+
Default value: 0

+

+

+

 
The "phase1-fast-provisioning" property

 
  "phase1-fast-provisioning" gchar*                : Read / Write

 

diff --git a/docs/libnm-util/html/NMSettingBluetooth.html b/docs/libnm-util/html/NMSettingBluetooth.html
index d6450cfc..e2f39011 100644
--- a/docs/libnm-util/html/NMSettingBluetooth.html
+++ b/docs/libnm-util/html/NMSettingBluetooth.html
@@ -48,6 +48,7 @@
                     NMSettingBluetoothClass;
 enum                NMSettingBluetoothError;
 #define             NM_SETTING_BLUETOOTH_BDADDR
+#define             NM_SETTING_BLUETOOTH_ERROR
 #define             NM_SETTING_BLUETOOTH_SETTING_NAME
 #define             NM_SETTING_BLUETOOTH_TYPE
 #define             NM_SETTING_BLUETOOTH_TYPE_DUN
@@ -115,10 +116,10 @@ Point (NAP) profiles.
 

 
enum NMSettingBluetoothError

 
typedef enum {
-	NM_SETTING_BLUETOOTH_ERROR_UNKNOWN = 0,
-	NM_SETTING_BLUETOOTH_ERROR_INVALID_PROPERTY,
-	NM_SETTING_BLUETOOTH_ERROR_MISSING_PROPERTY,
-	NM_SETTING_BLUETOOTH_ERROR_TYPE_SETTING_NOT_FOUND,
+	NM_SETTING_BLUETOOTH_ERROR_UNKNOWN = 0,            /*< nick=UnknownError >*/
+	NM_SETTING_BLUETOOTH_ERROR_INVALID_PROPERTY,       /*< nick=InvalidProperty >*/
+	NM_SETTING_BLUETOOTH_ERROR_MISSING_PROPERTY,       /*< nick=MissingProperty >*/
+	NM_SETTING_BLUETOOTH_ERROR_TYPE_SETTING_NOT_FOUND, /*< nick=TypeSettingNotFound >*/
 } NMSettingBluetoothError;
 

 

 

the NMSettingSecretFlags pertaining to the
+the NMSettingSecretFlags pertaining to the
 "private-key-password"
 
 

 
 

@@ -160,6 +161,14 @@ must also contain an 
+
NM_SETTING_BLUETOOTH_ERROR

+
#define NM_SETTING_BLUETOOTH_ERROR nm_setting_bluetooth_error_quark ()
+

+

+

+
+

+

 
NM_SETTING_BLUETOOTH_SETTING_NAME

 
#define NM_SETTING_BLUETOOTH_SETTING_NAME "bluetooth"
 

diff --git a/docs/libnm-util/html/NMSettingCdma.html b/docs/libnm-util/html/NMSettingCdma.html
index d0d5634d..ffb2f45b 100644
--- a/docs/libnm-util/html/NMSettingCdma.html
+++ b/docs/libnm-util/html/NMSettingCdma.html
@@ -47,6 +47,7 @@
                     NMSettingCdma;
                     NMSettingCdmaClass;
 enum                NMSettingCdmaError;
+#define             NM_SETTING_CDMA_ERROR
 #define             NM_SETTING_CDMA_NUMBER
 #define             NM_SETTING_CDMA_PASSWORD
 #define             NM_SETTING_CDMA_PASSWORD_FLAGS
@@ -55,7 +56,7 @@ enum                GQuark              nm_setting_cdma_error_quark         (void);
 const char *        nm_setting_cdma_get_number          (NMSettingCdma *setting);
 const char *        nm_setting_cdma_get_password        (NMSettingCdma *setting);
-NMSettingSecretFlags nm_setting_cdma_get_password_flags (NMSettingCdma *setting);
+NMSettingSecretFlags nm_setting_cdma_get_password_flags (NMSettingCdma *setting);
 const char *        nm_setting_cdma_get_username        (NMSettingCdma *setting);
 NMSetting *         nm_setting_cdma_new                 (void);
 
@@ -117,10 +118,10 @@ networks, including those using CDMA2000/EVDO technology.
 

 
enum NMSettingCdmaError

 
typedef enum {
-	NM_SETTING_CDMA_ERROR_UNKNOWN = 0,
-	NM_SETTING_CDMA_ERROR_INVALID_PROPERTY,
-	NM_SETTING_CDMA_ERROR_MISSING_PROPERTY,
-	NM_SETTING_CDMA_ERROR_MISSING_SERIAL_SETTING
+	NM_SETTING_CDMA_ERROR_UNKNOWN = 0,           /*< nick=UnknownError >*/
+	NM_SETTING_CDMA_ERROR_INVALID_PROPERTY,      /*< nick=InvalidProperty >*/
+	NM_SETTING_CDMA_ERROR_MISSING_PROPERTY,      /*< nick=MissingProperty >*/
+	NM_SETTING_CDMA_ERROR_MISSING_SERIAL_SETTING /*< nick=MissingSerialSetting >*/
 } NMSettingCdmaError;
 

 

@@ -153,6 +154,14 @@ is missing in the connection
 

+
NM_SETTING_CDMA_ERROR

+
#define NM_SETTING_CDMA_ERROR nm_setting_cdma_error_quark ()
+

+

+

+

+

+

 
NM_SETTING_CDMA_NUMBER

 
#define NM_SETTING_CDMA_NUMBER         "number"
 

@@ -247,7 +256,7 @@ Registers an error quark for 
 
nm_setting_cdma_get_password_flags ()

-
NMSettingSecretFlags nm_setting_cdma_get_password_flags (NMSettingCdma *setting);

+
NMSettingSecretFlags nm_setting_cdma_get_password_flags (NMSettingCdma *setting);

 

 
 

@@ -258,7 +267,7 @@ Registers an error quark for Returns :

-
diff --git a/docs/libnm-util/html/NMSettingConnection.html b/docs/libnm-util/html/NMSettingConnection.html
index 0089fc41..360c9743 100644
--- a/docs/libnm-util/html/NMSettingConnection.html
+++ b/docs/libnm-util/html/NMSettingConnection.html
@@ -48,13 +48,22 @@
                     NMSettingConnectionClass;
 enum                NMSettingConnectionError;
 #define             NM_SETTING_CONNECTION_AUTOCONNECT
+#define             NM_SETTING_CONNECTION_ERROR
 #define             NM_SETTING_CONNECTION_ID
+#define             NM_SETTING_CONNECTION_MASTER
 #define             NM_SETTING_CONNECTION_PERMISSIONS
 #define             NM_SETTING_CONNECTION_READ_ONLY
 #define             NM_SETTING_CONNECTION_SETTING_NAME
+#define             NM_SETTING_CONNECTION_SLAVE_TYPE
 #define             NM_SETTING_CONNECTION_TIMESTAMP
 #define             NM_SETTING_CONNECTION_TYPE
 #define             NM_SETTING_CONNECTION_UUID
+#define             NM_SETTING_CONNECTION_ZONE
+#define             NM_SETTING_CONNECTION_ZONE_BLOCK
+#define             NM_SETTING_CONNECTION_ZONE_HOME
+#define             NM_SETTING_CONNECTION_ZONE_PUBLIC
+#define             NM_SETTING_CONNECTION_ZONE_TRUSTED
+#define             NM_SETTING_CONNECTION_ZONE_WORKgbooleannm_setting_connection_add_permission
                                                         (NMSettingConnection *setting,
                                                          const char *ptype,
@@ -66,6 +75,7 @@ enum                char *        nm_setting_connection_get_connection_type
                                                         (NMSettingConnection *setting);
 const char *        nm_setting_connection_get_id        (NMSettingConnection *setting);
+const char *        nm_setting_connection_get_master    (NMSettingConnection *setting);
 guint32nm_setting_connection_get_num_permissions
                                                         (NMSettingConnection *setting);
 gbooleannm_setting_connection_get_permission
@@ -75,8 +85,13 @@ const char *        const char **out_pitem,
                                                          const char **out_detail);
 gbooleannm_setting_connection_get_read_only (NMSettingConnection *setting);
+const char *        nm_setting_connection_get_slave_type
+                                                        (NMSettingConnection *setting);
 guint64nm_setting_connection_get_timestamp (NMSettingConnection *setting);
 const char *        nm_setting_connection_get_uuid      (NMSettingConnection *setting);
+const char *        nm_setting_connection_get_zone      (NMSettingConnection *setting);
+gbooleannm_setting_connection_is_slave_type (NMSettingConnection *setting,
+                                                         const char *type);
 NMSetting *         nm_setting_connection_new           (void);
 gbooleannm_setting_connection_permissions_user_allowed
                                                         (NMSettingConnection *setting,
@@ -103,11 +118,14 @@ const char *        
   "autoconnect"              gboolean              : Read / Write / Construct
   "id"                       gchar*                : Read / Write
+  "master"                   gchar*                : Read / Write
   "permissions"              GSList_gchararray_*   : Read / Write
   "read-only"                gboolean              : Read / Write / Construct
+  "slave-type"               gchar*                : Read / Write
   "timestamp"                guint64               : Read / Write / Construct
   "type"                     gchar*                : Read / Write
   "uuid"                     gchar*                : Read / Write
+  "zone"                     gchar*                : Read / Write / Construct
 

@@ -149,10 +167,11 @@ It should only be accessed through the functions described below.
 

 
enum NMSettingConnectionError

 
typedef enum {
-	NM_SETTING_CONNECTION_ERROR_UNKNOWN = 0,
-	NM_SETTING_CONNECTION_ERROR_INVALID_PROPERTY,
-	NM_SETTING_CONNECTION_ERROR_MISSING_PROPERTY,
-	NM_SETTING_CONNECTION_ERROR_TYPE_SETTING_NOT_FOUND
+	NM_SETTING_CONNECTION_ERROR_UNKNOWN = 0,            /*< nick=UnknownError >*/
+	NM_SETTING_CONNECTION_ERROR_INVALID_PROPERTY,       /*< nick=InvalidProperty >*/
+	NM_SETTING_CONNECTION_ERROR_MISSING_PROPERTY,       /*< nick=MissingProperty >*/
+	NM_SETTING_CONNECTION_ERROR_TYPE_SETTING_NOT_FOUND, /*< nick=TypeSettingNotFound >*/
+	NM_SETTING_CONNECTION_ERROR_IP_CONFIG_NOT_ALLOWED,  /*< nick=IpConfigNotAllowed >*/
 } NMSettingConnectionError;
 

 

@@ -186,6 +205,12 @@ Describes errors that may result from operations involving a
   "type" property was not present in the NMConnection
 
 
+

+
+
+

 
 
the NMSettingSecretFlags pertaining to the "password"
+the NMSettingSecretFlags pertaining to the "password"
 
 

 
                                                                                       
 
 
NM_SETTING_CONNECTION_ERROR_IP_CONFIG_NOT_ALLOWED
ip configuration is not
+  allowed to be present.
+

 
 

 

@@ -199,6 +224,14 @@ Describes errors that may result from operations involving a
 

 

 

+
NM_SETTING_CONNECTION_ERROR

+
#define NM_SETTING_CONNECTION_ERROR nm_setting_connection_error_quark ()
+

+

+

+

+

+

 
NM_SETTING_CONNECTION_ID

 
#define NM_SETTING_CONNECTION_ID          "id"
 

@@ -207,6 +240,14 @@ Describes errors that may result from operations involving a
 

 

 

+
NM_SETTING_CONNECTION_MASTER

+
#define NM_SETTING_CONNECTION_MASTER      "master"
+

+

+

+

+

+

 
NM_SETTING_CONNECTION_PERMISSIONS

 
#define NM_SETTING_CONNECTION_PERMISSIONS "permissions"
 

@@ -231,6 +272,14 @@ Describes errors that may result from operations involving a
 

 

 

+
NM_SETTING_CONNECTION_SLAVE_TYPE

+
#define NM_SETTING_CONNECTION_SLAVE_TYPE  "slave-type"
+

+

+

+

+

+

 
NM_SETTING_CONNECTION_TIMESTAMP

 
#define NM_SETTING_CONNECTION_TIMESTAMP   "timestamp"
 

@@ -255,6 +304,54 @@ Describes errors that may result from operations involving a
 

 

 

+
NM_SETTING_CONNECTION_ZONE

+
#define NM_SETTING_CONNECTION_ZONE        "zone"
+

+

+

+

+

+

+
NM_SETTING_CONNECTION_ZONE_BLOCK

+
#define NM_SETTING_CONNECTION_ZONE_BLOCK     "block"
+

+

+

+

+

+

+
NM_SETTING_CONNECTION_ZONE_HOME

+
#define NM_SETTING_CONNECTION_ZONE_HOME      "home"
+

+

+

+

+

+

+
NM_SETTING_CONNECTION_ZONE_PUBLIC

+
#define NM_SETTING_CONNECTION_ZONE_PUBLIC    "public"
+

+

+

+

+

+

+
NM_SETTING_CONNECTION_ZONE_TRUSTED

+
#define NM_SETTING_CONNECTION_ZONE_TRUSTED   "trusted"
+

+

+

+

+

+

+
NM_SETTING_CONNECTION_ZONE_WORK

+
#define NM_SETTING_CONNECTION_ZONE_WORK      "work"
+

+

+

+

+

+

 
nm_setting_connection_add_permission ()

 
gboolean            nm_setting_connection_add_permission
                                                         (NMSettingConnection *setting,
@@ -382,6 +479,29 @@ Returns the 
+
nm_setting_connection_get_master ()

+
const char *        nm_setting_connection_get_master    (NMSettingConnection *setting);

+

+Returns the "master" property of the connection.
+

+

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


setting :
the NMSettingConnection
+
Returns :
interface name of the master device or UUID of the master
+connection.

+

+

+

 
nm_setting_connection_get_num_permissions ()

 
guint32             nm_setting_connection_get_num_permissions
                                                         (NMSettingConnection *setting);

@@ -475,6 +595,29 @@ Returns the 
+
nm_setting_connection_get_slave_type ()

+
const char *        nm_setting_connection_get_slave_type
+                                                        (NMSettingConnection *setting);

+

+Returns the "slave-type" property of the connection.
+

+

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


setting :
the NMSettingConnection
+
Returns :
the type of slave this connection is, if any

+

+

+

 
nm_setting_connection_get_timestamp ()

 
guint64             nm_setting_connection_get_timestamp (NMSettingConnection *setting);

 

@@ -519,6 +662,54 @@ Returns the 
+
nm_setting_connection_get_zone ()

+
const char *        nm_setting_connection_get_zone      (NMSettingConnection *setting);

+

+Returns the "zone" property of the connection.
+

+

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


setting :
the NMSettingConnection
+
Returns :
the trust level of a connection

+

+

+

+
nm_setting_connection_is_slave_type ()

+
gboolean            nm_setting_connection_is_slave_type (NMSettingConnection *setting,
+                                                         const char *type);

+

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


setting :
the NMSettingConnection
+
type :
the setting name (ie NM_SETTING_BOND_SETTING_NAME) to be matched
+against setting's slave type
Returns :
TRUE if connection is of the given slave type
+

+

+

+

 
nm_setting_connection_new ()

 
NMSetting *         nm_setting_connection_new           (void);

 

@@ -612,6 +803,15 @@ A human readable unique idenfier for the connection, like "Work WiFi" or
 

 

 

+
The "master" property

+
  "master"                   gchar*                : Read / Write

+

+Interface name of the master device or UUID of the master connection.
+

+
Default value: NULL

+

+

+

 
The "permissions" property

 
  "permissions"              GSList_gchararray_*   : Read / Write

 

@@ -645,6 +845,16 @@ if the connection is read-only and cannot be modified.
 

 

 

+
The "slave-type" property

+
  "slave-type"               gchar*                : Read / Write

+

+Setting name describing the type of slave device (ie
+NM_SETTING_BOND_SETTING_NAME) or NULL if this connection is not a slave.
+

+
Default value: NULL

+

+

+

 
The "timestamp" property

 
  "timestamp"                guint64               : Read / Write / Construct

 

@@ -686,6 +896,18 @@ be generated by 
+
The "zone" property

+
  "zone"                     gchar*                : Read / Write / Construct

+

+The trust level of a the connection.
+Free form case-insensitive string (for example "Home", "Work", "Public").
+NULL or unspecified zone means the connection will be placed in the
+default zone as defined by the firewall.
+

+
Default value: NULL

+

 

 

 

diff --git a/docs/libnm-util/html/NMSettingGsm.html b/docs/libnm-util/html/NMSettingGsm.html
index ce1012f4..f2522cdc 100644
--- a/docs/libnm-util/html/NMSettingGsm.html
+++ b/docs/libnm-util/html/NMSettingGsm.html
@@ -41,16 +41,17 @@
 

 

 
Synopsis

-
+
 #include <nm-setting-gsm.h>
 
                     NMSettingGsm;
                     NMSettingGsmClass;
 enum                NMSettingGsmError;
-enum                NMSettingGsmNetworkBand;
-enum                NMSettingGsmNetworkType;
+enum                NMSettingGsmNetworkBand;
+enum                NMSettingGsmNetworkType;
 #define             NM_SETTING_GSM_ALLOWED_BANDS
 #define             NM_SETTING_GSM_APN
+#define             NM_SETTING_GSM_ERROR
 #define             NM_SETTING_GSM_HOME_ONLY
 #define             NM_SETTING_GSM_NETWORK_ID
 #define             NM_SETTING_GSM_NETWORK_TYPE
@@ -69,9 +70,9 @@ const char *        int                 nm_setting_gsm_get_network_type     (NMSettingGsm *setting);
 const char *        nm_setting_gsm_get_number           (NMSettingGsm *setting);
 const char *        nm_setting_gsm_get_password         (NMSettingGsm *setting);
-NMSettingSecretFlags nm_setting_gsm_get_password_flags  (NMSettingGsm *setting);
+NMSettingSecretFlags nm_setting_gsm_get_password_flags  (NMSettingGsm *setting);
 const char *        nm_setting_gsm_get_pin              (NMSettingGsm *setting);
-NMSettingSecretFlags nm_setting_gsm_get_pin_flags       (NMSettingGsm *setting);
+NMSettingSecretFlags nm_setting_gsm_get_pin_flags       (NMSettingGsm *setting);
 const char *        nm_setting_gsm_get_username         (NMSettingGsm *setting);
 NMSetting *         nm_setting_gsm_new                  (void);
 

@@ -87,6 +88,14 @@ const char *        
+  GEnum
+   +----NMSettingGsmNetworkBand
+

+
+  GEnum
+   +----NMSettingGsmNetworkType
+

 

 

 
Properties

@@ -140,10 +149,10 @@ networks, including those using GPRS/EDGE and UMTS/HSPA technology.
 

 
enum NMSettingGsmError

 
typedef enum {
-	NM_SETTING_GSM_ERROR_UNKNOWN = 0,
-	NM_SETTING_GSM_ERROR_INVALID_PROPERTY,
-	NM_SETTING_GSM_ERROR_MISSING_PROPERTY,
-	NM_SETTING_GSM_ERROR_MISSING_SERIAL_SETTING
+	NM_SETTING_GSM_ERROR_UNKNOWN = 0,           /*< nick=UnknownError >*/
+	NM_SETTING_GSM_ERROR_INVALID_PROPERTY,      /*< nick=InvalidProperty >*/
+	NM_SETTING_GSM_ERROR_MISSING_PROPERTY,      /*< nick=MissingProperty >*/
+	NM_SETTING_GSM_ERROR_MISSING_SERIAL_SETTING /*< nick=MissingSerialSetting >*/
 } NMSettingGsmError;
 

 

@@ -176,7 +185,7 @@ is missing in the connection
 

-
enum NMSettingGsmNetworkBand

+
enum NMSettingGsmNetworkBand

 
typedef enum {
 	NM_SETTING_GSM_BAND_UNKNOWN      = 0x00000000,
 	NM_SETTING_GSM_BAND_ANY          = 0x00000001,
@@ -196,7 +205,7 @@ is missing in the connection
 } NMSettingGsmNetworkBand;
 

 

-NMSettingGsmNetworkBand values indicate the allowed frequency bands
+NMSettingGsmNetworkBand values indicate the allowed frequency bands
 the device may use when connecting to this network.
 

 

 
 

@@ -282,7 +291,7 @@ the device may use when connecting to this network.
 

-
enum NMSettingGsmNetworkType

+
enum NMSettingGsmNetworkType

 
typedef enum {
 	NM_SETTING_GSM_NETWORK_TYPE_ANY = -1,
 	NM_SETTING_GSM_NETWORK_TYPE_UMTS_HSPA = 0,
@@ -292,7 +301,7 @@ the device may use when connecting to this network.
 } NMSettingGsmNetworkType;
 

 

-NMSettingGsmNetworkType values indicate the allowed access technologies
+NMSettingGsmNetworkType values indicate the allowed access technologies
 the device may use when connecting to this network.
 

 

 
 

@@ -348,6 +357,14 @@ preferred but 3G-type technologies may be used as a fallback
 

+
NM_SETTING_GSM_ERROR

+
#define NM_SETTING_GSM_ERROR nm_setting_gsm_error_quark ()
+

+

+

+

+

+

 
NM_SETTING_GSM_HOME_ONLY

 
#define NM_SETTING_GSM_HOME_ONLY      "home-only"
 

@@ -577,7 +594,7 @@ Registers an error quark for 
 
nm_setting_gsm_get_password_flags ()

-
NMSettingSecretFlags nm_setting_gsm_get_password_flags  (NMSettingGsm *setting);

+
NMSettingSecretFlags nm_setting_gsm_get_password_flags  (NMSettingGsm *setting);

 

 
 

@@ -588,7 +605,7 @@ Registers an error quark for Returns :

-
@@ -616,7 +633,7 @@ Registers an error quark for 
 
nm_setting_gsm_get_pin_flags ()

-
NMSettingSecretFlags nm_setting_gsm_get_pin_flags       (NMSettingGsm *setting);

+
NMSettingSecretFlags nm_setting_gsm_get_pin_flags       (NMSettingGsm *setting);

 
 
the NMSettingSecretFlags pertaining to the "password"
+the NMSettingSecretFlags pertaining to the "password"
 
 

 
 

@@ -627,7 +644,7 @@ Registers an error quark for Returns :

-
@@ -676,7 +693,7 @@ Creates a new 
 Bitfield of allowed frequency bands.  Note that not all devices allow
 frequency band control.  Permitted values are those specified by
-NMSettingGsmNetworkBand.
+NMSettingGsmNetworkBand.
 
Allowed values: <= 1
Default value: 1

@@ -726,7 +743,7 @@ roaming control of the device is not otherwise possible.
 

 Network preference to force the device to only use specific network
 technologies.  Permitted values are those specified by
-NMSettingGsmNetworkType.  Note that not all devices allow network
+NMSettingGsmNetworkType.  Note that not all devices allow network
 preference control.
 
Allowed values: [G_MAXULONG,3]

diff --git a/docs/libnm-util/html/NMSettingIP4Config.html b/docs/libnm-util/html/NMSettingIP4Config.html
index aee7ddc8..1f9e666b 100644
--- a/docs/libnm-util/html/NMSettingIP4Config.html
+++ b/docs/libnm-util/html/NMSettingIP4Config.html
@@ -55,6 +55,7 @@ enum                NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME
 #define             NM_SETTING_IP4_CONFIG_DNS
 #define             NM_SETTING_IP4_CONFIG_DNS_SEARCH
+#define             NM_SETTING_IP4_CONFIG_ERROR
 #define             NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS
 #define             NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES
 #define             NM_SETTING_IP4_CONFIG_MAY_FAIL
@@ -247,10 +248,10 @@ properties related to IPv4 addressing, routing, and Domain Name Service
 

 
enum NMSettingIP4ConfigError

 
typedef enum {
-	NM_SETTING_IP4_CONFIG_ERROR_UNKNOWN = 0,
-	NM_SETTING_IP4_CONFIG_ERROR_INVALID_PROPERTY,
-	NM_SETTING_IP4_CONFIG_ERROR_MISSING_PROPERTY,
-	NM_SETTING_IP4_CONFIG_ERROR_NOT_ALLOWED_FOR_METHOD
+	NM_SETTING_IP4_CONFIG_ERROR_UNKNOWN = 0,           /*< nick=UnknownError >*/
+	NM_SETTING_IP4_CONFIG_ERROR_INVALID_PROPERTY,      /*< nick=InvalidProperty >*/
+	NM_SETTING_IP4_CONFIG_ERROR_MISSING_PROPERTY,      /*< nick=MissingProperty >*/
+	NM_SETTING_IP4_CONFIG_ERROR_NOT_ALLOWED_FOR_METHOD /*< nick=NotAllowedForMethod >*/
 } NMSettingIP4ConfigError;
 

 

 
 
the NMSettingSecretFlags pertaining to the "pin"
+the NMSettingSecretFlags pertaining to the "pin"
 
 

 
 
 
 

@@ -331,6 +332,14 @@ not valid with the given IP4 method
 

+
NM_SETTING_IP4_CONFIG_ERROR

+
#define NM_SETTING_IP4_CONFIG_ERROR nm_setting_ip4_config_error_quark ()
+

+

+

+

+

+

 
NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS

 
#define NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS    "ignore-auto-dns"
 

@@ -1753,7 +1762,7 @@ example, in IPv6-only networks, setting this property to TRUE allows
 the overall network configuration to succeed if IPv4 configuration fails
 but IPv6 configuration completes successfully.
 

-
Default value: FALSE

+
Default value: TRUE

 

diff --git a/docs/libnm-util/html/NMSettingIP6Config.html b/docs/libnm-util/html/NMSettingIP6Config.html
index e0d39277..b053bd27 100644
--- a/docs/libnm-util/html/NMSettingIP6Config.html
+++ b/docs/libnm-util/html/NMSettingIP6Config.html
@@ -41,7 +41,7 @@
 

 
 
 
 

 

 
Synopsis

-
+
 #include <nm-setting-ip6-config.h>
 
 typedef             NMIP6Address;
@@ -49,11 +49,14 @@ typedef             NM
                     NMSettingIP6Config;
                     NMSettingIP6ConfigClass;
 enum                NMSettingIP6ConfigError;
+enum                NMSettingIP6ConfigPrivacy;
 #define             NM_SETTING_IP6_CONFIG_ADDRESSES
 #define             NM_SETTING_IP6_CONFIG_DNS
 #define             NM_SETTING_IP6_CONFIG_DNS_SEARCH
+#define             NM_SETTING_IP6_CONFIG_ERROR
 #define             NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS
 #define             NM_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES
+#define             NM_SETTING_IP6_CONFIG_IP6_PRIVACY
 #define             NM_SETTING_IP6_CONFIG_MAY_FAIL
 #define             NM_SETTING_IP6_CONFIG_METHOD
 #define             NM_SETTING_IP6_CONFIG_METHOD_AUTO
@@ -125,6 +128,8 @@ const char *        NMSettingIP6Config *setting);
 gboolean            nm_setting_ip6_config_get_ignore_auto_routes
                                                         (NMSettingIP6Config *setting);
+NMSettingIP6ConfigPrivacy nm_setting_ip6_config_get_ip6_privacy
+                                                        (NMSettingIP6Config *setting);
 gboolean            nm_setting_ip6_config_get_may_fail  (NMSettingIP6Config *setting);
 const char *        nm_setting_ip6_config_get_method    (NMSettingIP6Config *setting);
 gboolean            nm_setting_ip6_config_get_never_default
@@ -170,6 +175,10 @@ const char *        
+  GEnum
+   +----NMSettingIP6ConfigPrivacy
+

 

 

 
Properties

@@ -179,6 +188,7 @@ const char *        dns-search"               GSList_gchararray_*   : Read / Write
   "ignore-auto-dns"          gboolean              : Read / Write / Construct
   "ignore-auto-routes"       gboolean              : Read / Write / Construct
+  "ip6-privacy"              gint                  : Read / Write / Construct
   "may-fail"                 gboolean              : Read / Write / Construct
   "method"                   gchar*                : Read / Write
   "never-default"            gboolean              : Read / Write / Construct
@@ -236,10 +246,10 @@ properties related to IPv6 addressing, routing, and Domain Name Service
 

 
enum NMSettingIP6ConfigError

 
typedef enum {
-	NM_SETTING_IP6_CONFIG_ERROR_UNKNOWN = 0,
-	NM_SETTING_IP6_CONFIG_ERROR_INVALID_PROPERTY,
-	NM_SETTING_IP6_CONFIG_ERROR_MISSING_PROPERTY,
-	NM_SETTING_IP6_CONFIG_ERROR_NOT_ALLOWED_FOR_METHOD
+	NM_SETTING_IP6_CONFIG_ERROR_UNKNOWN = 0,           /*< nick=UnknownError >*/
+	NM_SETTING_IP6_CONFIG_ERROR_INVALID_PROPERTY,      /*< nick=InvalidProperty >*/
+	NM_SETTING_IP6_CONFIG_ERROR_MISSING_PROPERTY,      /*< nick=MissingProperty >*/
+	NM_SETTING_IP6_CONFIG_ERROR_NOT_ALLOWED_FOR_METHOD /*< nick=NotAllowedForMethod >*/
 } NMSettingIP6ConfigError;
 

 

@@ -272,6 +282,48 @@ not valid with the given IPv6 method
 

+
enum NMSettingIP6ConfigPrivacy

+
typedef enum {
+	NM_SETTING_IP6_CONFIG_PRIVACY_UNKNOWN = -1,
+	NM_SETTING_IP6_CONFIG_PRIVACY_DISABLED = 0,
+	NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_PUBLIC_ADDR = 1,
+	NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_TEMP_ADDR = 2
+} NMSettingIP6ConfigPrivacy;
+

+

+NMSettingIP6ConfigPrivacy values indicate if and how IPv6 Privacy
+Extensions are used (RFC4941).
+

+

 
 

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


NM_SETTING_IP6_CONFIG_PRIVACY_UNKNOWN
unknown or no value specified
+
NM_SETTING_IP6_CONFIG_PRIVACY_DISABLED
IPv6 Privacy Extensions are disabled
+
NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_PUBLIC_ADDR
IPv6 Privacy Extensions
+are enabled, but public addresses are preferred over temporary addresses
+
NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_TEMP_ADDR
IPv6 Privacy Extensions
+are enabled and temporary addresses are preferred over public addresses
+

+

+

+

 
NM_SETTING_IP6_CONFIG_ADDRESSES

 
#define NM_SETTING_IP6_CONFIG_ADDRESSES          "addresses"
 

@@ -296,6 +348,14 @@ not valid with the given IPv6 method
 

 

 

+
NM_SETTING_IP6_CONFIG_ERROR

+
#define NM_SETTING_IP6_CONFIG_ERROR nm_setting_ip6_config_error_quark ()
+

+

+

+

+

+

 
NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS

 
#define NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS    "ignore-auto-dns"
 

@@ -312,6 +372,14 @@ not valid with the given IPv6 method
 

 

 

+
NM_SETTING_IP6_CONFIG_IP6_PRIVACY

+
#define NM_SETTING_IP6_CONFIG_IP6_PRIVACY        "ip6-privacy"
+

+

+

+

+

+

 
NM_SETTING_IP6_CONFIG_MAY_FAIL

 
#define NM_SETTING_IP6_CONFIG_MAY_FAIL           "may-fail"
 

@@ -1262,6 +1330,30 @@ ignored.
 

 

 

+
nm_setting_ip6_config_get_ip6_privacy ()

+
NMSettingIP6ConfigPrivacy nm_setting_ip6_config_get_ip6_privacy
+                                                        (NMSettingIP6Config *setting);

+

+Returns the value contained in the "ip6-privacy"
+property.
+

+

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


setting :
the NMSettingIP6Config
+
Returns :
IPv6 Privacy Extensions configuration value (NMSettingIP6ConfigPrivacy).

+

+

+

 
nm_setting_ip6_config_get_may_fail ()

 
gboolean            nm_setting_ip6_config_get_may_fail  (NMSettingIP6Config *setting);

 

@@ -1615,6 +1707,22 @@ specified in 
+
The "ip6-privacy" property

+
  "ip6-privacy"              gint                  : Read / Write / Construct

+

+Configure IPv6 Privacy Extensions for SLAAC, described in RFC4941.
+If enabled, it makes the kernel generate a temporary IPv6 address
+in addition to the public one generated from MAC address via
+modified EUI-64.  This enhances privacy, but could cause problems
+in some applications, on the other hand.  The permitted values
+are: 0: disabled, 1: enabled (prefer public address),
+2: enabled (prefer temporary addresses).
+

+
Allowed values: [G_MAXULONG,2]

+
Default value: -1

+

+

+

 
The "may-fail" property

 
  "may-fail"                 gboolean              : Read / Write / Construct

 

diff --git a/docs/libnm-util/html/NMSettingOlpcMesh.html b/docs/libnm-util/html/NMSettingOlpcMesh.html
index 1f24e2a5..15992600 100644
--- a/docs/libnm-util/html/NMSettingOlpcMesh.html
+++ b/docs/libnm-util/html/NMSettingOlpcMesh.html
@@ -46,6 +46,7 @@
 enum                NMSettingOlpcMeshError;
 #define             NM_SETTING_OLPC_MESH_CHANNEL
 #define             NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS
+#define             NM_SETTING_OLPC_MESH_ERROR
 #define             NM_SETTING_OLPC_MESH_SETTING_NAME
 #define             NM_SETTING_OLPC_MESH_SSID
 GQuark              nm_setting_olpc_mesh_error_quark    (void);
@@ -109,9 +110,9 @@ const 
 
enum NMSettingOlpcMeshError

 
typedef enum {
-	NM_SETTING_OLPC_MESH_ERROR_UNKNOWN = 0,
-	NM_SETTING_OLPC_MESH_ERROR_INVALID_PROPERTY,
-	NM_SETTING_OLPC_MESH_ERROR_MISSING_PROPERTY
+	NM_SETTING_OLPC_MESH_ERROR_UNKNOWN = 0,      /*< nick=UnknownError >*/
+	NM_SETTING_OLPC_MESH_ERROR_INVALID_PROPERTY, /*< nick=InvalidProperty >*/
+	NM_SETTING_OLPC_MESH_ERROR_MISSING_PROPERTY  /*< nick=MissingProperty >*/
 } NMSettingOlpcMeshError;
 

 

@@ -135,6 +136,14 @@ const 
+
NM_SETTING_OLPC_MESH_ERROR

+
#define NM_SETTING_OLPC_MESH_ERROR nm_setting_olpc_mesh_error_quark ()
+

+

+

+

+

+

 
NM_SETTING_OLPC_MESH_SETTING_NAME

 
#define NM_SETTING_OLPC_MESH_SETTING_NAME "802-11-olpc-mesh"
 

diff --git a/docs/libnm-util/html/NMSettingPPP.html b/docs/libnm-util/html/NMSettingPPP.html
index c1d73ead..0f95d8f6 100644
--- a/docs/libnm-util/html/NMSettingPPP.html
+++ b/docs/libnm-util/html/NMSettingPPP.html
@@ -50,6 +50,7 @@ that require PPP to deliver IP capability

 enum                NMSettingPPPError;
 #define             NM_SETTING_PPP_BAUD
 #define             NM_SETTING_PPP_CRTSCTS
+#define             NM_SETTING_PPP_ERROR
 #define             NM_SETTING_PPP_LCP_ECHO_FAILURE
 #define             NM_SETTING_PPP_LCP_ECHO_INTERVAL
 #define             NM_SETTING_PPP_MPPE_STATEFUL
@@ -161,10 +162,10 @@ cable and DSL modems and some mobile broadband devices.
 

 
enum NMSettingPPPError

 
typedef enum {
-	NM_SETTING_PPP_ERROR_UNKNOWN = 0,
-	NM_SETTING_PPP_ERROR_INVALID_PROPERTY,
-	NM_SETTING_PPP_ERROR_MISSING_PROPERTY,
-	NM_SETTING_PPP_ERROR_REQUIRE_MPPE_NOT_ALLOWED
+	NM_SETTING_PPP_ERROR_UNKNOWN = 0,             /*< nick=UnknownError >*/
+	NM_SETTING_PPP_ERROR_INVALID_PROPERTY,        /*< nick=InvalidProperty >*/
+	NM_SETTING_PPP_ERROR_MISSING_PROPERTY,        /*< nick=MissingProperty >*/
+	NM_SETTING_PPP_ERROR_REQUIRE_MPPE_NOT_ALLOWED /*< nick=RequireMPPENotAllowed >*/
 } NMSettingPPPError;
 

 

@@ -213,6 +214,14 @@ with other setting configuration parameters
 

+
NM_SETTING_PPP_ERROR

+
#define NM_SETTING_PPP_ERROR nm_setting_ppp_error_quark ()
+

+

+

+

+

+

 
NM_SETTING_PPP_LCP_ECHO_FAILURE

 
#define NM_SETTING_PPP_LCP_ECHO_FAILURE  "lcp-echo-failure"
 

diff --git a/docs/libnm-util/html/NMSettingPPPOE.html b/docs/libnm-util/html/NMSettingPPPOE.html
index 43c795db..bdbeeead 100644
--- a/docs/libnm-util/html/NMSettingPPPOE.html
+++ b/docs/libnm-util/html/NMSettingPPPOE.html
@@ -47,6 +47,7 @@
                     NMSettingPPPOE;
                     NMSettingPPPOEClass;
 enum                NMSettingPPPOEError;
+#define             NM_SETTING_PPPOE_ERROR
 #define             NM_SETTING_PPPOE_PASSWORD
 #define             NM_SETTING_PPPOE_PASSWORD_FLAGS
 #define             NM_SETTING_PPPOE_SERVICE
@@ -54,7 +55,7 @@ enum                NM_SETTING_PPPOE_USERNAME
 GQuark              nm_setting_pppoe_error_quark        (void);
 const char *        nm_setting_pppoe_get_password       (NMSettingPPPOE *setting);
-NMSettingSecretFlags nm_setting_pppoe_get_password_flags
+NMSettingSecretFlags nm_setting_pppoe_get_password_flags
                                                         (NMSettingPPPOE *setting);
 const char *        nm_setting_pppoe_get_service        (NMSettingPPPOE *setting);
 const char *        nm_setting_pppoe_get_username       (NMSettingPPPOE *setting);
@@ -118,10 +119,10 @@ to provide IP transport, for example cable or DSL modems.
 

 
enum NMSettingPPPOEError

 
typedef enum {
-	NM_SETTING_PPPOE_ERROR_UNKNOWN = 0,
-	NM_SETTING_PPPOE_ERROR_INVALID_PROPERTY,
-	NM_SETTING_PPPOE_ERROR_MISSING_PROPERTY,
-	NM_SETTING_PPPOE_ERROR_MISSING_PPP_SETTING
+	NM_SETTING_PPPOE_ERROR_UNKNOWN = 0,        /*< nick=UnknownError >*/
+	NM_SETTING_PPPOE_ERROR_INVALID_PROPERTY,   /*< nick=InvalidProperty >*/
+	NM_SETTING_PPPOE_ERROR_MISSING_PROPERTY,   /*< nick=MissingProperty >*/
+	NM_SETTING_PPPOE_ERROR_MISSING_PPP_SETTING /*< nick=MissingPPPSetting >*/
 } NMSettingPPPOEError;
 

 

 
 

@@ -154,6 +155,14 @@ did not contain a required PPP setting for PPP related options
 

+
NM_SETTING_PPPOE_ERROR

+
#define NM_SETTING_PPPOE_ERROR nm_setting_pppoe_error_quark ()
+

+

+

+

+

+

 
NM_SETTING_PPPOE_PASSWORD

 
#define NM_SETTING_PPPOE_PASSWORD       "password"
 

@@ -217,7 +226,7 @@ Registers an error quark for 
 
nm_setting_pppoe_get_password_flags ()

-
NMSettingSecretFlags nm_setting_pppoe_get_password_flags
+
NMSettingSecretFlags nm_setting_pppoe_get_password_flags
                                                         (NMSettingPPPOE *setting);

 

 
 
@@ -229,7 +238,7 @@ Registers an error quark for Returns :

-
diff --git a/docs/libnm-util/html/NMSettingSerial.html b/docs/libnm-util/html/NMSettingSerial.html
index e3d2b43d..e68a2609 100644
--- a/docs/libnm-util/html/NMSettingSerial.html
+++ b/docs/libnm-util/html/NMSettingSerial.html
@@ -50,6 +50,7 @@ serial communications

 enum                NMSettingSerialError;
 #define             NM_SETTING_SERIAL_BAUD
 #define             NM_SETTING_SERIAL_BITS
+#define             NM_SETTING_SERIAL_ERROR
 #define             NM_SETTING_SERIAL_PARITY
 #define             NM_SETTING_SERIAL_SEND_DELAY
 #define             NM_SETTING_SERIAL_SETTING_NAME
@@ -121,10 +122,10 @@ such as mobile broadband or analog telephone connections.
 

 
enum NMSettingSerialError

 
typedef enum {
-	NM_SETTING_SERIAL_ERROR_UNKNOWN = 0,
-	NM_SETTING_SERIAL_ERROR_INVALID_PROPERTY,
-	NM_SETTING_SERIAL_ERROR_MISSING_PROPERTY,
-	NM_SETTING_SERIAL_ERROR_MISSING_PPP_SETTING
+	NM_SETTING_SERIAL_ERROR_UNKNOWN = 0,        /*< nick=UnknownError >*/
+	NM_SETTING_SERIAL_ERROR_INVALID_PROPERTY,   /*< nick=InvalidProperty >*/
+	NM_SETTING_SERIAL_ERROR_MISSING_PROPERTY,   /*< nick=MissingProperty >*/
+	NM_SETTING_SERIAL_ERROR_MISSING_PPP_SETTING /*< nick=MissingPPPSetting >*/
 } NMSettingSerialError;
 

 

 

the NMSettingSecretFlags pertaining to the "password"
+the NMSettingSecretFlags pertaining to the "password"
 
 

 

@@ -173,6 +174,14 @@ setting requires the connection to contain an 
+
NM_SETTING_SERIAL_ERROR

+
#define NM_SETTING_SERIAL_ERROR nm_setting_serial_error_quark ()
+

+

+

+
+

+

 
NM_SETTING_SERIAL_PARITY

 
#define NM_SETTING_SERIAL_PARITY "parity"
 

diff --git a/docs/libnm-util/html/NMSettingVPN.html b/docs/libnm-util/html/NMSettingVPN.html
index 4f397cc3..d686803b 100644
--- a/docs/libnm-util/html/NMSettingVPN.html
+++ b/docs/libnm-util/html/NMSettingVPN.html
@@ -51,6 +51,7 @@ enum                const char *value,
                                                          gpointer user_data);
 #define             NM_SETTING_VPN_DATA
+#define             NM_SETTING_VPN_ERROR
 #define             NM_SETTING_VPN_SECRETS
 #define             NM_SETTING_VPN_SERVICE_TYPE
 #define             NM_SETTING_VPN_SETTING_NAME
@@ -70,6 +71,8 @@ enum                gpointer user_data);
 const char *        nm_setting_vpn_get_data_item        (NMSettingVPN *setting,
                                                          const char *key);
+guint32             nm_setting_vpn_get_num_data_items   (NMSettingVPN *setting);
+guint32             nm_setting_vpn_get_num_secrets      (NMSettingVPN *setting);
 const char *        nm_setting_vpn_get_secret           (NMSettingVPN *setting,
                                                          const char *key);
 const char *        nm_setting_vpn_get_service_type     (NMSettingVPN *setting);
@@ -142,9 +145,9 @@ properties.
 

 
enum NMSettingVpnError

 
typedef enum {
-	NM_SETTING_VPN_ERROR_UNKNOWN = 0,
-	NM_SETTING_VPN_ERROR_INVALID_PROPERTY,
-	NM_SETTING_VPN_ERROR_MISSING_PROPERTY,
+	NM_SETTING_VPN_ERROR_UNKNOWN = 0,      /*< nick=UnknownError >*/
+	NM_SETTING_VPN_ERROR_INVALID_PROPERTY, /*< nick=InvalidProperty >*/
+	NM_SETTING_VPN_ERROR_MISSING_PROPERTY, /*< nick=MissingProperty >*/
 } NMSettingVpnError;
 

 

@@ -205,6 +208,14 @@ required
 

+
NM_SETTING_VPN_ERROR

+
#define NM_SETTING_VPN_ERROR nm_setting_vpn_error_quark ()
+

+

+

+

+

+

 
NM_SETTING_VPN_SECRETS

 
#define NM_SETTING_VPN_SECRETS      "secrets"
 

@@ -407,6 +418,50 @@ by 
+
nm_setting_vpn_get_num_data_items ()

+
guint32             nm_setting_vpn_get_num_data_items   (NMSettingVPN *setting);

+

+Gets number of key/value pairs of VPN configuration data.
+

+

 
 

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


setting :
the NMSettingVPN
+
Returns :
the number of VPN plugin specific configuration data items

+

+

+

+
nm_setting_vpn_get_num_secrets ()

+
guint32             nm_setting_vpn_get_num_secrets      (NMSettingVPN *setting);

+

+Gets number of VPN plugin specific secrets in the setting.
+

+

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


setting :
the NMSettingVPN
+
Returns :
the number of VPN plugin specific secrets

+

+

+

 
nm_setting_vpn_get_secret ()

 
const char *        nm_setting_vpn_get_secret           (NMSettingVPN *setting,
                                                          const char *key);

@@ -574,7 +629,14 @@ plugin.
 

 
The "user-name" property

 
  "user-name"                gchar*                : Read / Write

-
If the VPN connection requires a user name for authentication, that name should be provided here.  If the connection is available to more than one user, and the VPN requires each user to supply a different name, then leave this property empty.  If this property is empty, NetworkManager will automatically supply the username of the user which requested the VPN connection.

+

+If the VPN connection requires a user name for authentication, that name
+should be provided here.  If the connection is available to more than
+one user, and the VPN requires each user to supply a different name, then
+leave this property empty.  If this property is empty, NetworkManager
+will automatically supply the username of the user which requested the
+VPN connection.
+

 
Default value: NULL

 

 

diff --git a/docs/libnm-util/html/NMSettingWimax.html b/docs/libnm-util/html/NMSettingWimax.html
index abaa48d8..66f68ba9 100644
--- a/docs/libnm-util/html/NMSettingWimax.html
+++ b/docs/libnm-util/html/NMSettingWimax.html
@@ -47,6 +47,7 @@
                     NMSettingWimax;
                     NMSettingWimaxClass;
 enum                NMSettingWimaxError;
+#define             NM_SETTING_WIMAX_ERROR
 #define             NM_SETTING_WIMAX_MAC_ADDRESS
 #define             NM_SETTING_WIMAX_NETWORK_NAME
 #define             NM_SETTING_WIMAX_SETTING_NAME
@@ -104,9 +105,9 @@ necessary for connection to 802.16e Mobile WiMAX networks.
 

 
enum NMSettingWimaxError

 
typedef enum {
-	NM_SETTING_WIMAX_ERROR_UNKNOWN = 0,
-	NM_SETTING_WIMAX_ERROR_INVALID_PROPERTY,
-	NM_SETTING_WIMAX_ERROR_MISSING_PROPERTY
+	NM_SETTING_WIMAX_ERROR_UNKNOWN = 0,      /*< nick=UnknownError >*/
+	NM_SETTING_WIMAX_ERROR_INVALID_PROPERTY, /*< nick=InvalidProperty >*/
+	NM_SETTING_WIMAX_ERROR_MISSING_PROPERTY  /*< nick=MissingProperty >*/
 } NMSettingWimaxError;
 

 

@@ -133,6 +134,14 @@ required
 

+
NM_SETTING_WIMAX_ERROR

+
#define NM_SETTING_WIMAX_ERROR nm_setting_wimax_error_quark ()
+

+

+

+

+

+

 
NM_SETTING_WIMAX_MAC_ADDRESS

 
#define NM_SETTING_WIMAX_MAC_ADDRESS  "mac-address"
 

diff --git a/docs/libnm-util/html/NMSettingWired.html b/docs/libnm-util/html/NMSettingWired.html
index f2b70999..d56f053f 100644
--- a/docs/libnm-util/html/NMSettingWired.html
+++ b/docs/libnm-util/html/NMSettingWired.html
@@ -50,6 +50,7 @@ enum                NM_SETTING_WIRED_AUTO_NEGOTIATE
 #define             NM_SETTING_WIRED_CLONED_MAC_ADDRESS
 #define             NM_SETTING_WIRED_DUPLEX
+#define             NM_SETTING_WIRED_ERROR
 #define             NM_SETTING_WIRED_MAC_ADDRESS
 #define             NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST
 #define             NM_SETTING_WIRED_MTU
@@ -153,9 +154,9 @@ necessary for connection to Ethernet networks.
 

 
enum NMSettingWiredError

 
typedef enum {
-	NM_SETTING_WIRED_ERROR_UNKNOWN = 0,
-	NM_SETTING_WIRED_ERROR_INVALID_PROPERTY,
-	NM_SETTING_WIRED_ERROR_MISSING_PROPERTY
+	NM_SETTING_WIRED_ERROR_UNKNOWN = 0,      /*< nick=UnknownError >*/
+	NM_SETTING_WIRED_ERROR_INVALID_PROPERTY, /*< nick=InvalidProperty >*/
+	NM_SETTING_WIRED_ERROR_MISSING_PROPERTY  /*< nick=MissingProperty >*/
 } NMSettingWiredError;
 

 

 
 

@@ -206,6 +207,14 @@ required
 

+
NM_SETTING_WIRED_ERROR

+
#define NM_SETTING_WIRED_ERROR nm_setting_wired_error_quark ()
+

+

+

+

+

+

 
NM_SETTING_WIRED_MAC_ADDRESS

 
#define NM_SETTING_WIRED_MAC_ADDRESS "mac-address"
 

diff --git a/docs/libnm-util/html/NMSettingWireless.html b/docs/libnm-util/html/NMSettingWireless.html
index a860f226..ab05340e 100644
--- a/docs/libnm-util/html/NMSettingWireless.html
+++ b/docs/libnm-util/html/NMSettingWireless.html
@@ -51,6 +51,7 @@ enum                NM_SETTING_WIRELESS_BSSID
 #define             NM_SETTING_WIRELESS_CHANNEL
 #define             NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS
+#define             NM_SETTING_WIRELESS_ERROR
 #define             NM_SETTING_WIRELESS_MAC_ADDRESS
 #define             NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST
 #define             NM_SETTING_WIRELESS_MODE
@@ -159,11 +160,11 @@ necessary for connection to 802.11 WiFi networks.
 

 
enum NMSettingWirelessError

 
typedef enum {
-	NM_SETTING_WIRELESS_ERROR_UNKNOWN = 0,
-	NM_SETTING_WIRELESS_ERROR_INVALID_PROPERTY,
-	NM_SETTING_WIRELESS_ERROR_MISSING_PROPERTY,
-	NM_SETTING_WIRELESS_ERROR_MISSING_SECURITY_SETTING,
-	NM_SETTING_WIRELESS_ERROR_CHANNEL_REQUIRES_BAND
+	NM_SETTING_WIRELESS_ERROR_UNKNOWN = 0,              /*< nick=UnknownError >*/
+	NM_SETTING_WIRELESS_ERROR_INVALID_PROPERTY,         /*< nick=InvalidProperty >*/
+	NM_SETTING_WIRELESS_ERROR_MISSING_PROPERTY,         /*< nick=MissingProperty >*/
+	NM_SETTING_WIRELESS_ERROR_MISSING_SECURITY_SETTING, /*< nick=MissingSecuritySetting >*/
+	NM_SETTING_WIRELESS_ERROR_CHANNEL_REQUIRES_BAND     /*< nick=ChannelRequiresBand >*/
 } NMSettingWirelessError;
 

 

 
 

@@ -234,6 +235,14 @@ set to a value that requires the 
+
NM_SETTING_WIRELESS_ERROR

+
#define NM_SETTING_WIRELESS_ERROR nm_setting_wireless_error_quark ()
+

+

+

+
+

+

 
NM_SETTING_WIRELESS_MAC_ADDRESS

 
#define NM_SETTING_WIRELESS_MAC_ADDRESS "mac-address"
 

diff --git a/docs/libnm-util/html/NMSettingWirelessSecurity.html b/docs/libnm-util/html/NMSettingWirelessSecurity.html
index c9b8d399..b9022091 100644
--- a/docs/libnm-util/html/NMSettingWirelessSecurity.html
+++ b/docs/libnm-util/html/NMSettingWirelessSecurity.html
@@ -42,14 +42,15 @@ use WEP, LEAP, WPA or WPA2/RSN security

 

 

 
Synopsis

-
+
 #include <nm-setting-wireless-security.h>
 
                     NMSettingWirelessSecurity;
                     NMSettingWirelessSecurityClass;
 enum                NMSettingWirelessSecurityError;
-enum                NMWepKeyType;
+enum                NMWepKeyType;
 #define             NM_SETTING_WIRELESS_SECURITY_AUTH_ALG
+#define             NM_SETTING_WIRELESS_SECURITY_ERROR
 #define             NM_SETTING_WIRELESS_SECURITY_GROUP
 #define             NM_SETTING_WIRELESS_SECURITY_KEY_MGMT
 #define             NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD
@@ -93,7 +94,7 @@ const char *        NMSettingWirelessSecurity *setting);
 const char *        nm_setting_wireless_security_get_leap_password
                                                         (NMSettingWirelessSecurity *setting);
-NMSettingSecretFlags nm_setting_wireless_security_get_leap_password_flags
+NMSettingSecretFlags nm_setting_wireless_security_get_leap_password_flags
                                                         (NMSettingWirelessSecurity *setting);
 const char *        nm_setting_wireless_security_get_leap_username
                                                         (NMSettingWirelessSecurity *setting);
@@ -111,14 +112,14 @@ const char *        guint32 i);
 const char *        nm_setting_wireless_security_get_psk
                                                         (NMSettingWirelessSecurity *setting);
-NMSettingSecretFlags nm_setting_wireless_security_get_psk_flags
+NMSettingSecretFlags nm_setting_wireless_security_get_psk_flags
                                                         (NMSettingWirelessSecurity *setting);
 const char *        nm_setting_wireless_security_get_wep_key
                                                         (NMSettingWirelessSecurity *setting,
                                                          guint32 idx);
-NMSettingSecretFlags nm_setting_wireless_security_get_wep_key_flags
+NMSettingSecretFlags nm_setting_wireless_security_get_wep_key_flags
                                                         (NMSettingWirelessSecurity *setting);
-NMWepKeyType        nm_setting_wireless_security_get_wep_key_type
+NMWepKeyType        nm_setting_wireless_security_get_wep_key_type
                                                         (NMSettingWirelessSecurity *setting);
 guint32             nm_setting_wireless_security_get_wep_tx_keyidx
                                                         (NMSettingWirelessSecurity *setting);
@@ -149,6 +150,10 @@ const char *        
+  GEnum
+   +----NMWepKeyType
+

 

 

 
Properties

@@ -223,13 +228,13 @@ of how WiFi security works, you may want to get copies of the following books.
 

 
enum NMSettingWirelessSecurityError

 
typedef enum {
-	NM_SETTING_WIRELESS_SECURITY_ERROR_UNKNOWN = 0,
-	NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY,
-	NM_SETTING_WIRELESS_SECURITY_ERROR_MISSING_PROPERTY,
-	NM_SETTING_WIRELESS_SECURITY_ERROR_MISSING_802_1X_SETTING,
-	NM_SETTING_WIRELESS_SECURITY_ERROR_LEAP_REQUIRES_802_1X,
-	NM_SETTING_WIRELESS_SECURITY_ERROR_LEAP_REQUIRES_USERNAME,
-	NM_SETTING_WIRELESS_SECURITY_ERROR_SHARED_KEY_REQUIRES_WEP
+	NM_SETTING_WIRELESS_SECURITY_ERROR_UNKNOWN = 0,            /*< nick=UnknownError >*/
+	NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY,       /*< nick=InvalidProperty >*/
+	NM_SETTING_WIRELESS_SECURITY_ERROR_MISSING_PROPERTY,       /*< nick=MissingProperty >*/
+	NM_SETTING_WIRELESS_SECURITY_ERROR_MISSING_802_1X_SETTING, /*< nick=Missing8021xSetting >*/
+	NM_SETTING_WIRELESS_SECURITY_ERROR_LEAP_REQUIRES_802_1X,   /*< nick=LEAPRequires8021x >*/
+	NM_SETTING_WIRELESS_SECURITY_ERROR_LEAP_REQUIRES_USERNAME, /*< nick=LEAPRequiresUsername >*/
+	NM_SETTING_WIRELESS_SECURITY_ERROR_SHARED_KEY_REQUIRES_WEP /*< nick=SharedKeyRequiresWEP >*/
 } NMSettingWirelessSecurityError;
 

 

@@ -281,7 +286,7 @@ encryption protocol
 

-
enum NMWepKeyType

+
enum NMWepKeyType

 
typedef enum {
 	NM_WEP_KEY_TYPE_UNKNOWN = 0,
 	NM_WEP_KEY_TYPE_KEY = 1,          /* Hex or ASCII */
@@ -291,7 +296,7 @@ encryption protocol
 } NMWepKeyType;
 

 

-The NMWepKeyType values specify how any WEP keys present in the setting
+The NMWepKeyType values specify how any WEP keys present in the setting
 are intepreted.  There are no standards governing how to hash the various WEP
 key/passphrase formats into the actual WEP key.  Unfortunately some WEP keys
 can be interpreted in multiple ways, requring the setting to specify how to
@@ -343,6 +348,14 @@ the actual WEP key using the MD5 hash algorithm.
 

+
NM_SETTING_WIRELESS_SECURITY_ERROR

+
#define NM_SETTING_WIRELESS_SECURITY_ERROR nm_setting_wireless_security_error_quark ()
+

+

+

+

+

+

 
NM_SETTING_WIRELESS_SECURITY_GROUP

 
#define NM_SETTING_WIRELESS_SECURITY_GROUP "group"
 

@@ -735,7 +748,7 @@ list.
 

 

 
nm_setting_wireless_security_get_leap_password_flags ()

-
NMSettingSecretFlags nm_setting_wireless_security_get_leap_password_flags
+
NMSettingSecretFlags nm_setting_wireless_security_get_leap_password_flags
                                                         (NMSettingWirelessSecurity *setting);

 

 
 
 
 
@@ -747,7 +760,7 @@ list.
 
-
@@ -914,7 +927,7 @@ list.
 

 
nm_setting_wireless_security_get_psk_flags ()

-
NMSettingSecretFlags nm_setting_wireless_security_get_psk_flags
+
NMSettingSecretFlags nm_setting_wireless_security_get_psk_flags
                                                         (NMSettingWirelessSecurity *setting);

 

 

 

 
Returns :
the NMSettingSecretFlags pertaining to the
+the NMSettingSecretFlags pertaining to the
 "leap-password"
 
 

 
@@ -926,7 +939,7 @@ list.
 
-
@@ -961,7 +974,7 @@ list.
 

 
nm_setting_wireless_security_get_wep_key_flags ()

-
NMSettingSecretFlags nm_setting_wireless_security_get_wep_key_flags
+
NMSettingSecretFlags nm_setting_wireless_security_get_wep_key_flags
                                                         (NMSettingWirelessSecurity *setting);

 

 

 

 
Returns :
the NMSettingSecretFlags pertaining to the
+the NMSettingSecretFlags pertaining to the
 "psk"
 
 

 
@@ -973,7 +986,7 @@ list.
 
-
+

 

 

 
Returns :
the NMSettingSecretFlags pertaining to the all WEP keysthe NMSettingSecretFlags pertaining to the all WEP keys
 

 
 

@@ -981,7 +994,7 @@ list.
 

 

 
nm_setting_wireless_security_get_wep_key_type ()

-
NMWepKeyType        nm_setting_wireless_security_get_wep_key_type
+
NMWepKeyType        nm_setting_wireless_security_get_wep_key_type
                                                         (NMSettingWirelessSecurity *setting);

 
@@ -1266,7 +1279,7 @@ Flags indicating how to handle   "wep-key-type"             guint                 : Read / Write / Construct

 Controls the interpretation of WEP keys.  Allowed values are those given
-by NMWepKeyType.  If set to 1 and the keys are hexadecimal, they must be
+by NMWepKeyType.  If set to 1 and the keys are hexadecimal, they must be
 either 10 or 26 characters in length.  If set to 1 and the keys are
 ASCII keys, they must be either 5 or 13 characters in length.  If set to
 2, the passphrase is hashed using the de-facto MD5 method to derive the
diff --git a/docs/libnm-util/html/api-index-full.html b/docs/libnm-util/html/api-index-full.html
index 728129f1..9f287353 100644
--- a/docs/libnm-util/html/api-index-full.html
+++ b/docs/libnm-util/html/api-index-full.html
@@ -95,6 +95,10 @@
 
 

+NM_CONNECTION_ERROR, macro in NMConnection
+

+

+

 nm_connection_error_quark, function in NMConnection
 

@@ -123,6 +127,10 @@
 

+nm_connection_get_setting_bond, function in NMConnection
+

+

+

 nm_connection_get_setting_by_name, function in NMConnection
 

@@ -139,6 +147,10 @@
 

+nm_connection_get_setting_infiniband, function in NMConnection
+

+

+

 nm_connection_get_setting_ip4_config, function in NMConnection
 

@@ -159,6 +171,14 @@
 

+nm_connection_get_setting_serial, function in NMConnection
+

+

+

+nm_connection_get_setting_vlan, function in NMConnection
+

+

+

 nm_connection_get_setting_vpn, function in NMConnection
 

@@ -183,6 +203,10 @@
 

+nm_connection_get_virtual_iface_name, function in NMConnection
+

+

+

 nm_connection_is_type, function in NMConnection
 

@@ -481,6 +505,10 @@
 

+NMSetting8021x:pac-file, object property in NMSetting8021x
+

+

+

 NMSetting8021x:password, object property in NMSetting8021x
 

@@ -489,6 +517,14 @@
 

+NMSetting8021x:password-raw, object property in NMSetting8021x
+

+

+

+NMSetting8021x:password-raw-flags, object property in NMSetting8021x
+

+

+

 NMSetting8021x:phase1-fast-provisioning, object property in NMSetting8021x
 

@@ -561,11 +597,11 @@
 

-NMSetting8021xCKFormat, enum in NMSetting8021x
+NMSetting8021xCKFormat, enum in NMSetting8021x
 

-NMSetting8021xCKScheme, enum in NMSetting8021x
+NMSetting8021xCKScheme, enum in NMSetting8021x
 

@@ -601,6 +637,26 @@
 

+NMSettingBond, struct in NMSettingBond
+

+

+

+NMSettingBond:interface-name, object property in NMSettingBond
+

+

+

+NMSettingBond:options, object property in NMSettingBond
+

+

+

+NMSettingBondClass, struct in NMSettingBond
+

+

+

+NMSettingBondError, enum in NMSettingBond
+

+

+

 NMSettingCdma, struct in NMSettingCdma
 

@@ -637,7 +693,7 @@
 

-NMSettingCompareFlags, enum in NMSetting
+NMSettingCompareFlags, enum in NMSetting
 

@@ -653,6 +709,10 @@
 

+NMSettingConnection:master, object property in NMSettingConnection
+

+

+

 NMSettingConnection:permissions, object property in NMSettingConnection
 

@@ -661,6 +721,10 @@
 

+NMSettingConnection:slave-type, object property in NMSettingConnection
+

+

+

 NMSettingConnection:timestamp, object property in NMSettingConnection
 

@@ -673,6 +737,10 @@
 

+NMSettingConnection:zone, object property in NMSettingConnection
+

+

+

 NMSettingConnectionClass, struct in NMSettingConnection
 

@@ -681,7 +749,7 @@
 

-NMSettingDiffResult, enum in NMSetting
+NMSettingDiffResult, enum in NMSetting
 

@@ -745,15 +813,39 @@
 

-NMSettingGsmNetworkBand, enum in NMSettingGsm
+NMSettingGsmNetworkBand, enum in NMSettingGsm
+

+

+

+NMSettingGsmNetworkType, enum in NMSettingGsm
+

+

+

+NMSettingHashFlags, enum in NMSetting
+

+

+

+NMSettingInfiniband, struct in NMSettingInfiniband
+

+

+

+NMSettingInfiniband:mac-address, object property in NMSettingInfiniband
 

-NMSettingGsmNetworkType, enum in NMSettingGsm
+NMSettingInfiniband:mtu, object property in NMSettingInfiniband
 

-NMSettingHashFlags, enum in NMSetting
+NMSettingInfiniband:transport-mode, object property in NMSettingInfiniband
+

+

+

+NMSettingInfinibandClass, struct in NMSettingInfiniband
+

+

+

+NMSettingInfinibandError, enum in NMSettingInfiniband
 

@@ -841,6 +933,10 @@
 

+NMSettingIP6Config:ip6-privacy, object property in NMSettingIP6Config
+

+

+

 NMSettingIP6Config:may-fail, object property in NMSettingIP6Config
 

@@ -865,6 +961,10 @@
 

+NMSettingIP6ConfigPrivacy, enum in NMSettingIP6Config
+

+

+

 NMSettingOlpcMesh, struct in NMSettingOlpcMesh
 

@@ -1001,7 +1101,7 @@
 

-NMSettingSecretFlags, enum in NMSetting
+NMSettingSecretFlags, enum in NMSetting
 

@@ -1041,6 +1141,42 @@
 

+NMSettingVlan, struct in NMSettingVlan
+

+

+

+NMSettingVlan:egress-priority-map, object property in NMSettingVlan
+

+

+

+NMSettingVlan:flags, object property in NMSettingVlan
+

+

+

+NMSettingVlan:id, object property in NMSettingVlan
+

+

+

+NMSettingVlan:ingress-priority-map, object property in NMSettingVlan
+

+

+

+NMSettingVlan:interface-name, object property in NMSettingVlan
+

+

+

+NMSettingVlan:parent, object property in NMSettingVlan
+

+

+

+NMSettingVlanClass, struct in NMSettingVlan
+

+

+

+NMSettingVlanError, enum in NMSettingVlan
+

+

+

 NMSettingVPN, struct in NMSettingVPN
 

@@ -1337,6 +1473,10 @@
 

+NM_SETTING_802_1X_ERROR, macro in NMSetting8021x
+

+

+

 nm_setting_802_1x_error_quark, function in NMSetting8021x
 

@@ -1397,6 +1537,10 @@
 

+nm_setting_802_1x_get_pac_file, function in NMSetting8021x
+

+

+

 nm_setting_802_1x_get_password, function in NMSetting8021x
 

@@ -1405,6 +1549,14 @@
 

+nm_setting_802_1x_get_password_raw, function in NMSetting8021x
+

+

+

+nm_setting_802_1x_get_password_raw_flags, function in NMSetting8021x
+

+

+

 nm_setting_802_1x_get_phase1_fast_provisioning, function in NMSetting8021x
 

@@ -1533,6 +1685,10 @@
 

+NM_SETTING_802_1X_PAC_FILE, macro in NMSetting8021x
+

+

+

 NM_SETTING_802_1X_PASSWORD, macro in NMSetting8021x
 

@@ -1541,6 +1697,14 @@
 

+NM_SETTING_802_1X_PASSWORD_RAW, macro in NMSetting8021x
+

+

+

+NM_SETTING_802_1X_PASSWORD_RAW_FLAGS, macro in NMSetting8021x
+

+

+

 NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING, macro in NMSetting8021x
 

@@ -1665,6 +1829,10 @@
 

+NM_SETTING_BLUETOOTH_ERROR, macro in NMSettingBluetooth
+

+

+

 nm_setting_bluetooth_error_quark, function in NMSettingBluetooth
 

@@ -1697,6 +1865,90 @@
 

+nm_setting_bond_add_option, function in NMSettingBond
+

+

+

+NM_SETTING_BOND_ERROR, macro in NMSettingBond
+

+

+

+nm_setting_bond_error_quark, function in NMSettingBond
+

+

+

+nm_setting_bond_get_interface_name, function in NMSettingBond
+

+

+

+nm_setting_bond_get_num_options, function in NMSettingBond
+

+

+

+nm_setting_bond_get_option, function in NMSettingBond
+

+

+

+nm_setting_bond_get_option_by_name, function in NMSettingBond
+

+

+

+nm_setting_bond_get_option_default, function in NMSettingBond
+

+

+

+nm_setting_bond_get_valid_options, function in NMSettingBond
+

+

+

+NM_SETTING_BOND_INTERFACE_NAME, macro in NMSettingBond
+

+

+

+nm_setting_bond_new, function in NMSettingBond
+

+

+

+NM_SETTING_BOND_OPTIONS, macro in NMSettingBond
+

+

+

+NM_SETTING_BOND_OPTION_ARP_INTERVAL, macro in NMSettingBond
+

+

+

+NM_SETTING_BOND_OPTION_ARP_IP_TARGET, macro in NMSettingBond
+

+

+

+NM_SETTING_BOND_OPTION_DOWNDELAY, macro in NMSettingBond
+

+

+

+NM_SETTING_BOND_OPTION_MIIMON, macro in NMSettingBond
+

+

+

+NM_SETTING_BOND_OPTION_MODE, macro in NMSettingBond
+

+

+

+NM_SETTING_BOND_OPTION_UPDELAY, macro in NMSettingBond
+

+

+

+nm_setting_bond_remove_option, function in NMSettingBond
+

+

+

+NM_SETTING_BOND_SETTING_NAME, macro in NMSettingBond
+

+

+

+NM_SETTING_CDMA_ERROR, macro in NMSettingCdma
+

+

+

 nm_setting_cdma_error_quark, function in NMSettingCdma
 

@@ -1761,6 +2013,10 @@
 

+NM_SETTING_CONNECTION_ERROR, macro in NMSettingConnection
+

+

+

 nm_setting_connection_error_quark, function in NMSettingConnection
 

@@ -1777,6 +2033,10 @@
 

+nm_setting_connection_get_master, function in NMSettingConnection
+

+

+

 nm_setting_connection_get_num_permissions, function in NMSettingConnection
 

@@ -1789,6 +2049,10 @@
 

+nm_setting_connection_get_slave_type, function in NMSettingConnection
+

+

+

 nm_setting_connection_get_timestamp, function in NMSettingConnection
 

@@ -1797,10 +2061,22 @@
 

+nm_setting_connection_get_zone, function in NMSettingConnection
+

+

+

 NM_SETTING_CONNECTION_ID, macro in NMSettingConnection
 

+nm_setting_connection_is_slave_type, function in NMSettingConnection
+

+

+

+NM_SETTING_CONNECTION_MASTER, macro in NMSettingConnection
+

+

+

 nm_setting_connection_new, function in NMSettingConnection
 

@@ -1825,6 +2101,10 @@
 

+NM_SETTING_CONNECTION_SLAVE_TYPE, macro in NMSettingConnection
+

+

+

 NM_SETTING_CONNECTION_TIMESTAMP, macro in NMSettingConnection
 

@@ -1837,6 +2117,30 @@
 

+NM_SETTING_CONNECTION_ZONE, macro in NMSettingConnection
+

+

+

+NM_SETTING_CONNECTION_ZONE_BLOCK, macro in NMSettingConnection
+

+

+

+NM_SETTING_CONNECTION_ZONE_HOME, macro in NMSettingConnection
+

+

+

+NM_SETTING_CONNECTION_ZONE_PUBLIC, macro in NMSettingConnection
+

+

+

+NM_SETTING_CONNECTION_ZONE_TRUSTED, macro in NMSettingConnection
+

+

+

+NM_SETTING_CONNECTION_ZONE_WORK, macro in NMSettingConnection
+

+

+

 nm_setting_diff, function in NMSetting
 

@@ -1849,6 +2153,10 @@
 

+NM_SETTING_ERROR, macro in NMSetting
+

+

+

 nm_setting_error_quark, function in NMSetting
 

@@ -1861,6 +2169,10 @@
 

+nm_setting_get_virtual_iface_name, function in NMSetting
+

+

+

 NM_SETTING_GSM_ALLOWED_BANDS, macro in NMSettingGsm
 

@@ -1869,6 +2181,10 @@
 

+NM_SETTING_GSM_ERROR, macro in NMSettingGsm
+

+

+

 nm_setting_gsm_error_quark, function in NMSettingGsm
 

@@ -1961,6 +2277,46 @@
 

+NM_SETTING_INFINIBAND_ERROR, macro in NMSettingInfiniband
+

+

+

+nm_setting_infiniband_error_quark, function in NMSettingInfiniband
+

+

+

+nm_setting_infiniband_get_mac_address, function in NMSettingInfiniband
+

+

+

+nm_setting_infiniband_get_mtu, function in NMSettingInfiniband
+

+

+

+nm_setting_infiniband_get_transport_mode, function in NMSettingInfiniband
+

+

+

+NM_SETTING_INFINIBAND_MAC_ADDRESS, macro in NMSettingInfiniband
+

+

+

+NM_SETTING_INFINIBAND_MTU, macro in NMSettingInfiniband
+

+

+

+nm_setting_infiniband_new, function in NMSettingInfiniband
+

+

+

+NM_SETTING_INFINIBAND_SETTING_NAME, macro in NMSettingInfiniband
+

+

+

+NM_SETTING_INFINIBAND_TRANSPORT_MODE, macro in NMSettingInfiniband
+

+

+

 NM_SETTING_IP4_CONFIG_ADDRESSES, macro in NMSettingIP4Config
 

@@ -2017,6 +2373,10 @@
 

+NM_SETTING_IP4_CONFIG_ERROR, macro in NMSettingIP4Config
+

+

+

 nm_setting_ip4_config_error_quark, function in NMSettingIP4Config
 

@@ -2197,6 +2557,10 @@
 

+NM_SETTING_IP6_CONFIG_ERROR, macro in NMSettingIP6Config
+

+

+

 nm_setting_ip6_config_error_quark, function in NMSettingIP6Config
 

@@ -2221,6 +2585,10 @@
 

+nm_setting_ip6_config_get_ip6_privacy, function in NMSettingIP6Config
+

+

+

 nm_setting_ip6_config_get_may_fail, function in NMSettingIP6Config
 

@@ -2261,6 +2629,10 @@
 

+NM_SETTING_IP6_CONFIG_IP6_PRIVACY, macro in NMSettingIP6Config
+

+

+

 NM_SETTING_IP6_CONFIG_MAY_FAIL, macro in NMSettingIP6Config
 

@@ -2345,6 +2717,10 @@
 

+NM_SETTING_OLPC_MESH_ERROR, macro in NMSettingOlpcMesh
+

+

+

 nm_setting_olpc_mesh_error_quark, function in NMSettingOlpcMesh
 

@@ -2389,6 +2765,10 @@
 

+NM_SETTING_PPPOE_ERROR, macro in NMSettingPPPOE
+

+

+

 nm_setting_pppoe_error_quark, function in NMSettingPPPOE
 

@@ -2441,6 +2821,10 @@
 

+NM_SETTING_PPP_ERROR, macro in NMSettingPPP
+

+

+

 nm_setting_ppp_error_quark, function in NMSettingPPP
 

@@ -2601,6 +2985,10 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 

+NM_SETTING_SERIAL_ERROR, macro in NMSettingSerial
+

+

+

 nm_setting_serial_error_quark, function in NMSettingSerial
 

@@ -2665,6 +3053,86 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 

+nm_setting_vlan_add_priority, function in NMSettingVlan
+

+

+

+nm_setting_vlan_add_priority_str, function in NMSettingVlan
+

+

+

+nm_setting_vlan_clear_priorities, function in NMSettingVlan
+

+

+

+NM_SETTING_VLAN_EGRESS_PRIORITY_MAP, macro in NMSettingVlan
+

+

+

+NM_SETTING_VLAN_ERROR, macro in NMSettingVlan
+

+

+

+nm_setting_vlan_error_quark, function in NMSettingVlan
+

+

+

+NM_SETTING_VLAN_FLAGS, macro in NMSettingVlan
+

+

+

+nm_setting_vlan_get_flags, function in NMSettingVlan
+

+

+

+nm_setting_vlan_get_id, function in NMSettingVlan
+

+

+

+nm_setting_vlan_get_interface_name, function in NMSettingVlan
+

+

+

+nm_setting_vlan_get_num_priorities, function in NMSettingVlan
+

+

+

+nm_setting_vlan_get_parent, function in NMSettingVlan
+

+

+

+nm_setting_vlan_get_priority, function in NMSettingVlan
+

+

+

+NM_SETTING_VLAN_ID, macro in NMSettingVlan
+

+

+

+NM_SETTING_VLAN_INGRESS_PRIORITY_MAP, macro in NMSettingVlan
+

+

+

+NM_SETTING_VLAN_INTERFACE_NAME, macro in NMSettingVlan
+

+

+

+nm_setting_vlan_new, function in NMSettingVlan
+

+

+

+NM_SETTING_VLAN_PARENT, macro in NMSettingVlan
+

+

+

+nm_setting_vlan_remove_priority, function in NMSettingVlan
+

+

+

+NM_SETTING_VLAN_SETTING_NAME, macro in NMSettingVlan
+

+

+

 nm_setting_vpn_add_data_item, function in NMSettingVPN
 

@@ -2677,6 +3145,10 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 

+NM_SETTING_VPN_ERROR, macro in NMSettingVPN
+

+

+

 nm_setting_vpn_error_quark, function in NMSettingVPN
 

@@ -2693,6 +3165,14 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 

+nm_setting_vpn_get_num_data_items, function in NMSettingVPN
+

+

+

+nm_setting_vpn_get_num_secrets, function in NMSettingVPN
+

+

+

 nm_setting_vpn_get_secret, function in NMSettingVPN
 

@@ -2733,6 +3213,10 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 

+NM_SETTING_WIMAX_ERROR, macro in NMSettingWimax
+

+

+

 nm_setting_wimax_error_quark, function in NMSettingWimax
 

@@ -2777,6 +3261,10 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 

+NM_SETTING_WIRED_ERROR, macro in NMSettingWired
+

+

+

 nm_setting_wired_error_quark, function in NMSettingWired
 

@@ -2901,6 +3389,10 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 

+NM_SETTING_WIRELESS_ERROR, macro in NMSettingWireless
+

+

+

 nm_setting_wireless_error_quark, function in NMSettingWireless
 

@@ -3025,6 +3517,10 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 

+NM_SETTING_WIRELESS_SECURITY_ERROR, macro in NMSettingWirelessSecurity
+

+

+

 nm_setting_wireless_security_error_quark, function in NMSettingWirelessSecurity
 

@@ -3202,7 +3698,7 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 
U

-NMUtilsSecurityType, enum in nm-utils
+NMUtilsSecurityType, enum in nm-utils
 

@@ -3218,6 +3714,30 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 

+nm_utils_hwaddr_atoba, function in nm-utils
+

+

+

+nm_utils_hwaddr_aton, function in nm-utils
+

+

+

+nm_utils_hwaddr_len, function in nm-utils
+

+

+

+NM_UTILS_HWADDR_LEN_MAX, macro in nm-utils
+

+

+

+nm_utils_hwaddr_ntoa, function in nm-utils
+

+

+

+nm_utils_hwaddr_type, function in nm-utils
+

+

+

 nm_utils_init, function in nm-utils
 

@@ -3323,12 +3843,20 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 
V

+NMVlanFlags, enum in NMSettingVlan
+

+

+

+NMVlanPriorityMap, enum in NMSettingVlan
+

+

+

 NMVPNIterFunc, user_function in NMSettingVPN
 
W

-NMWepKeyType, enum in NMSettingWirelessSecurity
+NMWepKeyType, enum in NMSettingWirelessSecurity
 

diff --git a/docs/libnm-util/html/ch01.html b/docs/libnm-util/html/ch01.html
index f16de7b0..c23e7223 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
diff --git a/docs/libnm-util/html/index.sgml b/docs/libnm-util/html/index.sgml
index d8ff5d80..18260e91 100644
--- a/docs/libnm-util/html/index.sgml
+++ b/docs/libnm-util/html/index.sgml
@@ -14,6 +14,7 @@
 
 
 
+
 
 
 
@@ -30,21 +31,26 @@
 
 
 
+
 
 
 
 
+
 
 
 
 
 
+
+
 
 
 
 
 
 
+
 
 
 
@@ -64,7 +70,11 @@
 
 
 
+
+
 
+
+
 
 
 
@@ -72,14 +82,14 @@
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
@@ -88,16 +98,17 @@
 
 
 
-
+
 
 
 
-
+
 
 
 
 
 
+
 
 
 
@@ -112,6 +123,7 @@
 
 
 
+
 
 
 
@@ -135,35 +147,52 @@
 
 
 
+
 
+
 
+
 
 
 
+
 
 
 
+
+
+
+
+
+
 
 
 
 
 
+
 
 
 
+
 
 
+
+
 
 
 
 
 
 
+
 
 
+
 
 
 
+
 
 
 
@@ -180,6 +209,7 @@
 
 
 
+
 
 
 
@@ -237,6 +267,7 @@
 
 
 
+
 
 
 
@@ -284,6 +315,7 @@
 
 
 
+
 
 
 
@@ -298,12 +330,13 @@
 
 
 
-
+
 
 
 
 
 
+
 
 
 
@@ -383,6 +416,7 @@
 
 
 
+
 
 
 
@@ -410,6 +444,7 @@
 
 
 
+
 
 
 
@@ -441,6 +476,7 @@
 
 
 
+
 
 
 
@@ -460,6 +496,8 @@
 
 
 
+
+
 
 
 
@@ -471,7 +509,7 @@
 
 
 
-
+
 
 
 
@@ -487,7 +525,7 @@
 
 
 
-
+
 
 
 
@@ -495,6 +533,7 @@
 
 
 
+
 
 
 
@@ -543,6 +582,7 @@
 
 
 
+
 
 
 
@@ -565,6 +605,7 @@
 
 
 
+
 
 
 
@@ -578,18 +619,20 @@
 
 
 
+
+
 
 
 
 
 
 
-
+
 
 
 
 
-
+
 
 
 
@@ -604,9 +647,13 @@
 
 
 
+
 
+
 
 
+
+
 
 
 
@@ -649,8 +696,11 @@
 
 
 
+
 
 
+
+
 
 
 
@@ -699,8 +749,11 @@
 
 
 
+
 
 
+
+
 
 
 
@@ -743,6 +796,7 @@
 
 
 
+
 
 
 
@@ -827,6 +881,7 @@
 
 
 
+
 
 
 
@@ -840,11 +895,18 @@
 
 
 
+
+
+
+
+
 
 
 
+
 
 
+
 
 
 
@@ -894,6 +956,7 @@
 
 
 
+
 
 
 
@@ -913,6 +976,7 @@
 
 
 
+
 
 
 
@@ -933,6 +997,7 @@
 
 
 
+
 
 
 
@@ -1003,6 +1068,7 @@
 
 
 
+
 
 
 
@@ -1034,6 +1100,7 @@
 
 
 
+
 
 
 
@@ -1044,6 +1111,8 @@
 
 
 
+
+
 
 
 
@@ -1057,9 +1126,11 @@
 
 
 
+
+
 
 
-
+
 
 
 
@@ -1069,9 +1140,15 @@
 
 
 
+
 
 
 
+
+
+
+
+
 
 
 
diff --git a/docs/libnm-util/html/libnm-util-nm-utils.html b/docs/libnm-util/html/libnm-util-nm-utils.html
index c9aa3d53..a17c1ece 100644
--- a/docs/libnm-util/html/libnm-util-nm-utils.html
+++ b/docs/libnm-util/html/libnm-util-nm-utils.html
@@ -24,6 +24,8 @@
 Top
                    | 
                   Description
+                   | 
+                  Object Hierarchy
 
 
 

@@ -37,14 +39,24 @@
 

 

 
Synopsis

-
+
 #include <nm-utils.h>
 
-enum                NMUtilsSecurityType;
+enum                NMUtilsSecurityType;
+#define             NM_UTILS_HWADDR_LEN_MAX
 void                nm_utils_deinit                     (void);
 const char *        nm_utils_escape_ssid                (const guint8 *ssid,
                                                          guint32 len);
 GHashTable *        nm_utils_gvalue_hash_dup            (GHashTable *hash);
+GByteArray *        nm_utils_hwaddr_atoba               (const char *asc,
+                                                         int type);
+guint8 *            nm_utils_hwaddr_aton                (const char *asc,
+                                                         int type,
+                                                         gpointer buffer);
+int                 nm_utils_hwaddr_len                 (int type);
+char *              nm_utils_hwaddr_ntoa                (gconstpointer addr,
+                                                         int type);
+int                 nm_utils_hwaddr_type                (int len);
 gboolean            nm_utils_init                       (GError **error);
 GSList *            nm_utils_ip4_addresses_from_gvalue  (const GValue *value);
 void                nm_utils_ip4_addresses_to_gvalue    (GSList *list,
@@ -73,7 +85,7 @@ const char *        gboolean            nm_utils_same_ssid                  (const GByteArray *ssid1,
                                                          const GByteArray *ssid2,
                                                          gboolean ignore_trailing_null);
-gboolean            nm_utils_security_valid             (NMUtilsSecurityType type,
+gboolean            nm_utils_security_valid             (NMUtilsSecurityType type,
                                                          NMDeviceWifiCapabilities wifi_caps,
                                                          gboolean have_ap,
                                                          gboolean adhoc,
@@ -96,6 +108,13 @@ const char *        
+
Object Hierarchy

+
+  GEnum
+   +----NMUtilsSecurityType
+

+

+

 
Description

 

 A collection of utility functions for working SSIDs, IP addresses, WiFi
@@ -105,7 +124,7 @@ access points and devices, among other things.
 

 
Details

 

-
enum NMUtilsSecurityType

+
enum NMUtilsSecurityType

 
typedef enum {
 	NMU_SEC_INVALID = 0,
 	NMU_SEC_NONE,
@@ -178,6 +197,17 @@ generating the dynamic WEP keys automatically
 

 

 

+
NM_UTILS_HWADDR_LEN_MAX

+
#define NM_UTILS_HWADDR_LEN_MAX 20 /* INFINIBAND_ALEN */
+

+

+The maximum length of a hardware address of a type known by
+nm_utils_hwaddr_len() or nm_utils_hwaddr_aton(). This can be used
+as the size of the buffer passed to nm_utils_hwaddr_aton().
+

+

+

+

 
nm_utils_deinit ()

 
void                nm_utils_deinit                     (void);

 

@@ -243,6 +273,144 @@ returned hash with 
+
nm_utils_hwaddr_atoba ()

+
GByteArray *        nm_utils_hwaddr_atoba               (const char *asc,
+                                                         int type);

+

+Parses asc and converts it to binary form in a GByteArray. See
+nm_utils_hwaddr_aton() if you don't want a GByteArray.
+

+

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


asc :
the ASCII representation of a hardware address
type :
the type of address; either ARPHRD_ETHER or ARPHRD_INFINIBAND
+
Returns :
a new GByteArray, or NULL if asc couldn't
+be parsed. [transfer full]
+

+

+

+

+
nm_utils_hwaddr_aton ()

+
guint8 *            nm_utils_hwaddr_aton                (const char *asc,
+                                                         int type,
+                                                         gpointer buffer);

+

+Parses asc and converts it to binary form in buffer. See
+nm_utils_hwaddr_atoba() if you'd rather have the result in a
+GByteArray.
+

+

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


asc :
the ASCII representation of a hardware address
type :
the type of address; either ARPHRD_ETHER or ARPHRD_INFINIBAND
+
buffer :
buffer to store the result into
Returns :

+buffer, or NULL if asc couldn't be parsed

+

+

+

+
nm_utils_hwaddr_len ()

+
int                 nm_utils_hwaddr_len                 (int type);

+

+Returns the length in octets of a hardware address of type type.
+

+

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


type :
the type of address; either ARPHRD_ETHER or ARPHRD_INFINIBAND
+
Returns :
the length

+

+

+

+
nm_utils_hwaddr_ntoa ()

+
char *              nm_utils_hwaddr_ntoa                (gconstpointer addr,
+                                                         int type);

+

+Converts addr to textual form.
+

+

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


addr :
a binary hardware address
type :
the type of address; either ARPHRD_ETHER or ARPHRD_INFINIBAND
+
Returns :
the textual form of addr. [transfer full]
+

+

+

+

+
nm_utils_hwaddr_type ()

+
int                 nm_utils_hwaddr_type                (int len);

+

+Returns the type (either ARPHRD_ETHER or ARPHRD_INFINIBAND) of the raw
+address given its length.
+

+

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


len :
the length of hardware address in bytes
Returns :
the type, either ARPHRD_ETHER or ARPHRD_INFINIBAND, or -1 if
+the address length was not recognized

+

+

+

 
nm_utils_init ()

 
gboolean            nm_utils_init                       (GError **error);

 

@@ -673,7 +841,7 @@ NULLs, even though that is functionally pointless.
 

 

 
nm_utils_security_valid ()

-
gboolean            nm_utils_security_valid             (NMUtilsSecurityType type,
+
gboolean            nm_utils_security_valid             (NMUtilsSecurityType type,
                                                          NMDeviceWifiCapabilities wifi_caps,
                                                          gboolean have_ap,
                                                          gboolean adhoc,
diff --git a/docs/libnm-util/html/libnm-util.devhelp2 b/docs/libnm-util/html/libnm-util.devhelp2
index 021b34e1..993a29d7 100644
--- a/docs/libnm-util/html/libnm-util.devhelp2
+++ b/docs/libnm-util/html/libnm-util.devhelp2
@@ -31,6 +31,7 @@
     
     
     
+    
     
     
     
@@ -47,21 +48,26 @@
     
     
     
+    
     
     
     
     
+    
     
     
     
     
     
+    
+    
     
     
     
     
     
     
+    
     
     
     
@@ -80,12 +86,13 @@
     
     
     
-    
-    
+    
+    
     
-    
-    
+    
+    
     
+    
     
     
     
@@ -100,6 +107,7 @@
     
     
     
+    
     
     
     
@@ -112,39 +120,56 @@
     
     
     
+    
     
+    
     
     
     
+    
     
     
     
+    
+    
+    
+    
+    
+    
     
     
     
     
     
+    
     
     
     
+    
     
     
+    
+    
     
     
     
     
     
+    
     
     
+    
     
     
     
+    
     
     
     
     
     
     
+    
     
     
     
@@ -189,6 +214,7 @@
     
     
     
+    
     
     
     
@@ -235,8 +261,9 @@
     
     
     
-    
+    
     
+    
     
     
     
@@ -304,6 +331,7 @@
     
     
     
+    
     
     
     
@@ -319,6 +347,7 @@
     
     
     
+    
     
     
     
@@ -338,6 +367,7 @@
     
     
     
+    
     
     
     
@@ -356,10 +386,11 @@
     
     
     
-    
-    
+    
+    
     
     
+    
     
     
     
@@ -397,6 +428,7 @@
     
     
     
+    
     
     
     
@@ -411,6 +443,7 @@
     
     
     
+    
     
     
     
@@ -422,8 +455,8 @@
     
     
     
-    
-    
+    
+    
     
     
     
@@ -432,9 +465,13 @@
     
     
     
+    
     
+    
     
     
+    
+    
     
     
     
@@ -477,8 +514,11 @@
     
     
     
+    
     
     
+    
+    
     
     
     
@@ -526,8 +566,11 @@
     
     
     
+    
     
     
+    
+    
     
     
     
@@ -557,6 +600,7 @@
     
     
     
+    
     
     
     
@@ -640,11 +684,14 @@
     
     
     
+    
     
     
     
+    
     
     
+    
     
     
     
@@ -694,6 +741,7 @@
     
     
     
+    
     
     
     
@@ -712,6 +760,7 @@
     
     
     
+    
     
     
     
@@ -721,6 +770,7 @@
     
     
     
+    
     
     
     
@@ -779,6 +829,7 @@
     
     
     
+    
     
     
     
@@ -799,6 +850,7 @@
     
     
     
+    
     
     
     
@@ -809,6 +861,8 @@
     
     
     
+    
+    
     
     
     
@@ -819,10 +873,16 @@
     
     
     
-    
+    
+    
     
     
     
+    
+    
+    
+    
+    
     
     
     
@@ -877,6 +937,7 @@
     
     
     
+    
     
     
     
@@ -953,6 +1014,10 @@
     
     
     
+    
+    
+    
+    
     
     
     
diff --git a/docs/libnm-util/html/object-tree.html b/docs/libnm-util/html/object-tree.html
index e0e26418..8670ba6c 100644
--- a/docs/libnm-util/html/object-tree.html
+++ b/docs/libnm-util/html/object-tree.html
@@ -28,15 +28,18 @@
         NMSetting
             NMSetting8021x
             NMSettingBluetooth
+            NMSettingBond
             NMSettingCdma
             NMSettingConnection
             NMSettingGsm
+            NMSettingInfiniband
             NMSettingIP4Config
             NMSettingIP6Config
             NMSettingOlpcMesh
             NMSettingPPP
             NMSettingPPPOE
             NMSettingSerial
+            NMSettingVlan
             NMSettingVPN
             NMSettingWimax
             NMSettingWired
@@ -44,23 +47,39 @@
             NMSettingWirelessSecurity
     GEnum
         NMConnectionError
+        NMSetting8021xCKFormat
+        NMSetting8021xCKScheme
         NMSetting8021xError
         NMSettingBluetoothError
+        NMSettingBondError
         NMSettingCdmaError
+        NMSettingCompareFlags
         NMSettingConnectionError
+        NMSettingDiffResult
         NMSettingError
         NMSettingGsmError
+        NMSettingGsmNetworkBand
+        NMSettingGsmNetworkType
+        NMSettingHashFlags
+        NMSettingInfinibandError
         NMSettingIP4ConfigError
         NMSettingIP6ConfigError
+        NMSettingIP6ConfigPrivacy
         NMSettingOlpcMeshError
         NMSettingPPPError
         NMSettingPPPOEError
+        NMSettingSecretFlags
         NMSettingSerialError
+        NMSettingVlanError
         NMSettingVpnError
         NMSettingWimaxError
         NMSettingWiredError
         NMSettingWirelessError
         NMSettingWirelessSecurityError
+        NMUtilsSecurityType
+        NMVlanFlags
+        NMVlanPriorityMap
+        NMWepKeyType
     GBoxed
         NMIP4Address
         NMIP4Route
diff --git a/docs/libnm-util/libnm-util-sections.txt b/docs/libnm-util/libnm-util-sections.txt
index 2977214c..a278e8e8 100644
--- a/docs/libnm-util/libnm-util-sections.txt
+++ b/docs/libnm-util/libnm-util-sections.txt
@@ -4,6 +4,7 @@
 NMConnection
 NMConnectionClass
 NMConnectionError
+NM_CONNECTION_ERROR
 NM_CONNECTION_PATH
 nm_connection_add_setting
 nm_connection_clear_secrets
@@ -20,21 +21,26 @@ nm_connection_get_path
 nm_connection_get_setting
 nm_connection_get_setting_802_1x
 nm_connection_get_setting_bluetooth
+nm_connection_get_setting_bond
 nm_connection_get_setting_by_name
 nm_connection_get_setting_cdma
 nm_connection_get_setting_connection
 nm_connection_get_setting_gsm
+nm_connection_get_setting_infiniband
 nm_connection_get_setting_ip4_config
 nm_connection_get_setting_ip6_config
 nm_connection_get_setting_olpc_mesh
 nm_connection_get_setting_ppp
 nm_connection_get_setting_pppoe
+nm_connection_get_setting_serial
+nm_connection_get_setting_vlan
 nm_connection_get_setting_vpn
 nm_connection_get_setting_wimax
 nm_connection_get_setting_wired
 nm_connection_get_setting_wireless
 nm_connection_get_setting_wireless_security
 nm_connection_get_uuid
+nm_connection_get_virtual_iface_name
 nm_connection_is_type
 nm_connection_lookup_setting_type
 nm_connection_lookup_setting_type_by_quark
@@ -50,13 +56,10 @@ nm_connection_verify
 
 NM_CONNECTION
 NM_CONNECTION_CLASS
-NM_CONNECTION_ERROR
 NM_CONNECTION_GET_CLASS
 NM_IS_CONNECTION
 NM_IS_CONNECTION_CLASS
 NM_TYPE_CONNECTION
-NM_TYPE_CONNECTION_ERROR
-nm_connection_error_get_type
 nm_connection_get_type
 
 
@@ -72,6 +75,7 @@ NMSettingError
 NMSettingHashFlags
 NMSettingSecretFlags
 NMSettingValueIterFn
+NM_SETTING_ERROR
 NM_SETTING_NAME
 NM_SETTING_PARAM_FUZZY_IGNORE
 NM_SETTING_PARAM_REQUIRED
@@ -86,6 +90,7 @@ nm_setting_enumerate_values
 nm_setting_error_quark
 nm_setting_get_name
 nm_setting_get_secret_flags
+nm_setting_get_virtual_iface_name
 nm_setting_need_secrets
 nm_setting_new_from_hash
 nm_setting_set_secret_flags
@@ -98,11 +103,8 @@ NM_IS_SETTING
 NM_IS_SETTING_CLASS
 NM_SETTING
 NM_SETTING_CLASS
-NM_SETTING_ERROR
 NM_SETTING_GET_CLASS
 NM_TYPE_SETTING
-NM_TYPE_SETTING_ERROR
-nm_setting_error_get_type
 nm_setting_get_type
 
 
@@ -120,9 +122,13 @@ NM_SETTING_802_1X_CA_CERT
 NM_SETTING_802_1X_CA_PATH
 NM_SETTING_802_1X_CLIENT_CERT
 NM_SETTING_802_1X_EAP
+NM_SETTING_802_1X_ERROR
 NM_SETTING_802_1X_IDENTITY
+NM_SETTING_802_1X_PAC_FILE
 NM_SETTING_802_1X_PASSWORD
 NM_SETTING_802_1X_PASSWORD_FLAGS
+NM_SETTING_802_1X_PASSWORD_RAW
+NM_SETTING_802_1X_PASSWORD_RAW_FLAGS
 NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING
 NM_SETTING_802_1X_PHASE1_PEAPLABEL
 NM_SETTING_802_1X_PHASE1_PEAPVER
@@ -165,8 +171,11 @@ nm_setting_802_1x_get_identity
 nm_setting_802_1x_get_num_altsubject_matches
 nm_setting_802_1x_get_num_eap_methods
 nm_setting_802_1x_get_num_phase2_altsubject_matches
+nm_setting_802_1x_get_pac_file
 nm_setting_802_1x_get_password
 nm_setting_802_1x_get_password_flags
+nm_setting_802_1x_get_password_raw
+nm_setting_802_1x_get_password_raw_flags
 nm_setting_802_1x_get_phase1_fast_provisioning
 nm_setting_802_1x_get_phase1_peaplabel
 nm_setting_802_1x_get_phase1_peapver
@@ -212,11 +221,8 @@ NM_IS_SETTING_802_1X
 NM_IS_SETTING_802_1X_CLASS
 NM_SETTING_802_1X
 NM_SETTING_802_1X_CLASS
-NM_SETTING_802_1X_ERROR
 NM_SETTING_802_1X_GET_CLASS
 NM_TYPE_SETTING_802_1X
-NM_TYPE_SETTING_802_1X_ERROR
-nm_setting_802_1x_error_get_type
 nm_setting_802_1x_get_type
 
 
@@ -227,6 +233,7 @@ NMSettingBluetooth
 NMSettingBluetoothClass
 NMSettingBluetoothError
 NM_SETTING_BLUETOOTH_BDADDR
+NM_SETTING_BLUETOOTH_ERROR
 NM_SETTING_BLUETOOTH_SETTING_NAME
 NM_SETTING_BLUETOOTH_TYPE
 NM_SETTING_BLUETOOTH_TYPE_DUN
@@ -240,20 +247,54 @@ NM_IS_SETTING_BLUETOOTH
 NM_IS_SETTING_BLUETOOTH_CLASS
 NM_SETTING_BLUETOOTH
 NM_SETTING_BLUETOOTH_CLASS
-NM_SETTING_BLUETOOTH_ERROR
 NM_SETTING_BLUETOOTH_GET_CLASS
 NM_TYPE_SETTING_BLUETOOTH
-NM_TYPE_SETTING_BLUETOOTH_ERROR
-nm_setting_bluetooth_error_get_type
 nm_setting_bluetooth_get_type
 
 
+

+nm-setting-bond
+NMSettingBond
+NMSettingBond
+NMSettingBondClass
+NMSettingBondError
+NM_SETTING_BOND_ERROR
+NM_SETTING_BOND_INTERFACE_NAME
+NM_SETTING_BOND_OPTIONS
+NM_SETTING_BOND_OPTION_ARP_INTERVAL
+NM_SETTING_BOND_OPTION_ARP_IP_TARGET
+NM_SETTING_BOND_OPTION_DOWNDELAY
+NM_SETTING_BOND_OPTION_MIIMON
+NM_SETTING_BOND_OPTION_MODE
+NM_SETTING_BOND_OPTION_UPDELAY
+NM_SETTING_BOND_SETTING_NAME
+nm_setting_bond_add_option
+nm_setting_bond_error_quark
+nm_setting_bond_get_interface_name
+nm_setting_bond_get_num_options
+nm_setting_bond_get_option
+nm_setting_bond_get_option_by_name
+nm_setting_bond_get_option_default
+nm_setting_bond_get_valid_options
+nm_setting_bond_new
+nm_setting_bond_remove_option
+
+NM_IS_SETTING_BOND
+NM_IS_SETTING_BOND_CLASS
+NM_SETTING_BOND
+NM_SETTING_BOND_CLASS
+NM_SETTING_BOND_GET_CLASS
+NM_TYPE_SETTING_BOND
+nm_setting_bond_get_type
+

+
 

 nm-setting-cdma
 NMSettingCdma
 NMSettingCdma
 NMSettingCdmaClass
 NMSettingCdmaError
+NM_SETTING_CDMA_ERROR
 NM_SETTING_CDMA_NUMBER
 NM_SETTING_CDMA_PASSWORD
 NM_SETTING_CDMA_PASSWORD_FLAGS
@@ -270,11 +311,8 @@ NM_IS_SETTING_CDMA
 NM_IS_SETTING_CDMA_CLASS
 NM_SETTING_CDMA
 NM_SETTING_CDMA_CLASS
-NM_SETTING_CDMA_ERROR
 NM_SETTING_CDMA_GET_CLASS
 NM_TYPE_SETTING_CDMA
-NM_TYPE_SETTING_CDMA_ERROR
-nm_setting_cdma_error_get_type
 nm_setting_cdma_get_type
 

 
@@ -285,23 +323,36 @@ NMSettingConnection
 NMSettingConnectionClass
 NMSettingConnectionError
 NM_SETTING_CONNECTION_AUTOCONNECT
+NM_SETTING_CONNECTION_ERROR
 NM_SETTING_CONNECTION_ID
+NM_SETTING_CONNECTION_MASTER
 NM_SETTING_CONNECTION_PERMISSIONS
 NM_SETTING_CONNECTION_READ_ONLY
 NM_SETTING_CONNECTION_SETTING_NAME
+NM_SETTING_CONNECTION_SLAVE_TYPE
 NM_SETTING_CONNECTION_TIMESTAMP
 NM_SETTING_CONNECTION_TYPE
 NM_SETTING_CONNECTION_UUID
+NM_SETTING_CONNECTION_ZONE
+NM_SETTING_CONNECTION_ZONE_BLOCK
+NM_SETTING_CONNECTION_ZONE_HOME
+NM_SETTING_CONNECTION_ZONE_PUBLIC
+NM_SETTING_CONNECTION_ZONE_TRUSTED
+NM_SETTING_CONNECTION_ZONE_WORK
 nm_setting_connection_add_permission
 nm_setting_connection_error_quark
 nm_setting_connection_get_autoconnect
 nm_setting_connection_get_connection_type
 nm_setting_connection_get_id
+nm_setting_connection_get_master
 nm_setting_connection_get_num_permissions
 nm_setting_connection_get_permission
 nm_setting_connection_get_read_only
+nm_setting_connection_get_slave_type
 nm_setting_connection_get_timestamp
 nm_setting_connection_get_uuid
+nm_setting_connection_get_zone
+nm_setting_connection_is_slave_type
 nm_setting_connection_new
 nm_setting_connection_permissions_user_allowed
 nm_setting_connection_remove_permission
@@ -310,11 +361,8 @@ NM_IS_SETTING_CONNECTION
 NM_IS_SETTING_CONNECTION_CLASS
 NM_SETTING_CONNECTION
 NM_SETTING_CONNECTION_CLASS
-NM_SETTING_CONNECTION_ERROR
 NM_SETTING_CONNECTION_GET_CLASS
 NM_TYPE_SETTING_CONNECTION
-NM_TYPE_SETTING_CONNECTION_ERROR
-nm_setting_connection_error_get_type
 nm_setting_connection_get_type
 
 
@@ -328,6 +376,7 @@ NMSettingGsmNetworkBand
 NMSettingGsmNetworkType
 NM_SETTING_GSM_ALLOWED_BANDS
 NM_SETTING_GSM_APN
+NM_SETTING_GSM_ERROR
 NM_SETTING_GSM_HOME_ONLY
 NM_SETTING_GSM_NETWORK_ID
 NM_SETTING_GSM_NETWORK_TYPE
@@ -356,14 +405,37 @@ NM_IS_SETTING_GSM
 NM_IS_SETTING_GSM_CLASS
 NM_SETTING_GSM
 NM_SETTING_GSM_CLASS
-NM_SETTING_GSM_ERROR
 NM_SETTING_GSM_GET_CLASS
 NM_TYPE_SETTING_GSM
-NM_TYPE_SETTING_GSM_ERROR
-nm_setting_gsm_error_get_type
 nm_setting_gsm_get_type
 
 
+

+nm-setting-infiniband
+NMSettingInfiniband
+NMSettingInfiniband
+NMSettingInfinibandClass
+NMSettingInfinibandError
+NM_SETTING_INFINIBAND_ERROR
+NM_SETTING_INFINIBAND_MAC_ADDRESS
+NM_SETTING_INFINIBAND_MTU
+NM_SETTING_INFINIBAND_SETTING_NAME
+NM_SETTING_INFINIBAND_TRANSPORT_MODE
+nm_setting_infiniband_error_quark
+nm_setting_infiniband_get_mac_address
+nm_setting_infiniband_get_mtu
+nm_setting_infiniband_get_transport_mode
+nm_setting_infiniband_new
+
+NM_IS_SETTING_INFINIBAND
+NM_IS_SETTING_INFINIBAND_CLASS
+NM_SETTING_INFINIBAND
+NM_SETTING_INFINIBAND_CLASS
+NM_SETTING_INFINIBAND_GET_CLASS
+NM_TYPE_SETTING_INFINIBAND
+nm_setting_infiniband_get_type
+

+
 

 nm-setting-ip4-config
 NMSettingIP4Config
@@ -378,6 +450,7 @@ NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME
 NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME
 NM_SETTING_IP4_CONFIG_DNS
 NM_SETTING_IP4_CONFIG_DNS_SEARCH
+NM_SETTING_IP4_CONFIG_ERROR
 NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS
 NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES
 NM_SETTING_IP4_CONFIG_MAY_FAIL
@@ -449,13 +522,10 @@ NM_IS_SETTING_IP4_CONFIG
 NM_IS_SETTING_IP4_CONFIG_CLASS
 NM_SETTING_IP4_CONFIG
 NM_SETTING_IP4_CONFIG_CLASS
-NM_SETTING_IP4_CONFIG_ERROR
 NM_SETTING_IP4_CONFIG_GET_CLASS
 NM_TYPE_SETTING_IP4_CONFIG
-NM_TYPE_SETTING_IP4_CONFIG_ERROR
 nm_ip4_address_get_type
 nm_ip4_route_get_type
-nm_setting_ip4_config_error_get_type
 nm_setting_ip4_config_get_type
 

 
@@ -467,11 +537,14 @@ NMIP6Route
 NMSettingIP6Config
 NMSettingIP6ConfigClass
 NMSettingIP6ConfigError
+NMSettingIP6ConfigPrivacy
 NM_SETTING_IP6_CONFIG_ADDRESSES
 NM_SETTING_IP6_CONFIG_DNS
 NM_SETTING_IP6_CONFIG_DNS_SEARCH
+NM_SETTING_IP6_CONFIG_ERROR
 NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS
 NM_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES
+NM_SETTING_IP6_CONFIG_IP6_PRIVACY
 NM_SETTING_IP6_CONFIG_MAY_FAIL
 NM_SETTING_IP6_CONFIG_METHOD
 NM_SETTING_IP6_CONFIG_METHOD_AUTO
@@ -521,6 +594,7 @@ nm_setting_ip6_config_get_dns
 nm_setting_ip6_config_get_dns_search
 nm_setting_ip6_config_get_ignore_auto_dns
 nm_setting_ip6_config_get_ignore_auto_routes
+nm_setting_ip6_config_get_ip6_privacy
 nm_setting_ip6_config_get_may_fail
 nm_setting_ip6_config_get_method
 nm_setting_ip6_config_get_never_default
@@ -539,13 +613,10 @@ NM_IS_SETTING_IP6_CONFIG
 NM_IS_SETTING_IP6_CONFIG_CLASS
 NM_SETTING_IP6_CONFIG
 NM_SETTING_IP6_CONFIG_CLASS
-NM_SETTING_IP6_CONFIG_ERROR
 NM_SETTING_IP6_CONFIG_GET_CLASS
 NM_TYPE_SETTING_IP6_CONFIG
-NM_TYPE_SETTING_IP6_CONFIG_ERROR
 nm_ip6_address_get_type
 nm_ip6_route_get_type
-nm_setting_ip6_config_error_get_type
 nm_setting_ip6_config_get_type
 
 
@@ -557,6 +628,7 @@ NMSettingOlpcMeshClass
 NMSettingOlpcMeshError
 NM_SETTING_OLPC_MESH_CHANNEL
 NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS
+NM_SETTING_OLPC_MESH_ERROR
 NM_SETTING_OLPC_MESH_SETTING_NAME
 NM_SETTING_OLPC_MESH_SSID
 nm_setting_olpc_mesh_error_quark
@@ -569,11 +641,8 @@ NM_IS_SETTING_OLPC_MESH
 NM_IS_SETTING_OLPC_MESH_CLASS
 NM_SETTING_OLPC_MESH
 NM_SETTING_OLPC_MESH_CLASS
-NM_SETTING_OLPC_MESH_ERROR
 NM_SETTING_OLPC_MESH_GET_CLASS
 NM_TYPE_SETTING_OLPC_MESH
-NM_TYPE_SETTING_OLPC_MESH_ERROR
-nm_setting_olpc_mesh_error_get_type
 nm_setting_olpc_mesh_get_type
 
 
@@ -585,6 +654,7 @@ NMSettingPPPClass
 NMSettingPPPError
 NM_SETTING_PPP_BAUD
 NM_SETTING_PPP_CRTSCTS
+NM_SETTING_PPP_ERROR
 NM_SETTING_PPP_LCP_ECHO_FAILURE
 NM_SETTING_PPP_LCP_ECHO_INTERVAL
 NM_SETTING_PPP_MPPE_STATEFUL
@@ -627,11 +697,8 @@ NM_IS_SETTING_PPP
 NM_IS_SETTING_PPP_CLASS
 NM_SETTING_PPP
 NM_SETTING_PPP_CLASS
-NM_SETTING_PPP_ERROR
 NM_SETTING_PPP_GET_CLASS
 NM_TYPE_SETTING_PPP
-NM_TYPE_SETTING_PPP_ERROR
-nm_setting_ppp_error_get_type
 nm_setting_ppp_get_type
 
 
@@ -641,6 +708,7 @@ nm_setting_ppp_get_type
 NMSettingPPPOE
 NMSettingPPPOEClass
 NMSettingPPPOEError
+NM_SETTING_PPPOE_ERROR
 NM_SETTING_PPPOE_PASSWORD
 NM_SETTING_PPPOE_PASSWORD_FLAGS
 NM_SETTING_PPPOE_SERVICE
@@ -657,11 +725,8 @@ NM_IS_SETTING_PPPOE
 NM_IS_SETTING_PPPOE_CLASS
 NM_SETTING_PPPOE
 NM_SETTING_PPPOE_CLASS
-NM_SETTING_PPPOE_ERROR
 NM_SETTING_PPPOE_GET_CLASS
 NM_TYPE_SETTING_PPPOE
-NM_TYPE_SETTING_PPPOE_ERROR
-nm_setting_pppoe_error_get_type
 nm_setting_pppoe_get_type
 
 
@@ -678,6 +743,7 @@ NMSettingSerialClass
 NMSettingSerialError
 NM_SETTING_SERIAL_BAUD
 NM_SETTING_SERIAL_BITS
+NM_SETTING_SERIAL_ERROR
 NM_SETTING_SERIAL_PARITY
 NM_SETTING_SERIAL_SEND_DELAY
 NM_SETTING_SERIAL_SETTING_NAME
@@ -694,14 +760,49 @@ NM_IS_SETTING_SERIAL
 NM_IS_SETTING_SERIAL_CLASS
 NM_SETTING_SERIAL
 NM_SETTING_SERIAL_CLASS
-NM_SETTING_SERIAL_ERROR
 NM_SETTING_SERIAL_GET_CLASS
 NM_TYPE_SETTING_SERIAL
-NM_TYPE_SETTING_SERIAL_ERROR
-nm_setting_serial_error_get_type
 nm_setting_serial_get_type
 
 
+

+nm-setting-vlan
+NMSettingVlan
+NMSettingVlan
+NMSettingVlanClass
+NMSettingVlanError
+NMVlanFlags
+NMVlanPriorityMap
+NM_SETTING_VLAN_EGRESS_PRIORITY_MAP
+NM_SETTING_VLAN_ERROR
+NM_SETTING_VLAN_FLAGS
+NM_SETTING_VLAN_ID
+NM_SETTING_VLAN_INGRESS_PRIORITY_MAP
+NM_SETTING_VLAN_INTERFACE_NAME
+NM_SETTING_VLAN_PARENT
+NM_SETTING_VLAN_SETTING_NAME
+nm_setting_vlan_add_priority
+nm_setting_vlan_add_priority_str
+nm_setting_vlan_clear_priorities
+nm_setting_vlan_error_quark
+nm_setting_vlan_get_flags
+nm_setting_vlan_get_id
+nm_setting_vlan_get_interface_name
+nm_setting_vlan_get_num_priorities
+nm_setting_vlan_get_parent
+nm_setting_vlan_get_priority
+nm_setting_vlan_new
+nm_setting_vlan_remove_priority
+
+NM_IS_SETTING_VLAN
+NM_IS_SETTING_VLAN_CLASS
+NM_SETTING_VLAN
+NM_SETTING_VLAN_CLASS
+NM_SETTING_VLAN_GET_CLASS
+NM_TYPE_SETTING_VLAN
+nm_setting_vlan_get_type
+

+
 

 nm-setting-vpn
 NMSettingVPN
@@ -710,6 +811,7 @@ NMSettingVPNClass
 NMSettingVpnError
 NMVPNIterFunc
 NM_SETTING_VPN_DATA
+NM_SETTING_VPN_ERROR
 NM_SETTING_VPN_SECRETS
 NM_SETTING_VPN_SERVICE_TYPE
 NM_SETTING_VPN_SETTING_NAME
@@ -720,6 +822,8 @@ nm_setting_vpn_error_quark
 nm_setting_vpn_foreach_data_item
 nm_setting_vpn_foreach_secret
 nm_setting_vpn_get_data_item
+nm_setting_vpn_get_num_data_items
+nm_setting_vpn_get_num_secrets
 nm_setting_vpn_get_secret
 nm_setting_vpn_get_service_type
 nm_setting_vpn_get_user_name
@@ -731,11 +835,8 @@ NM_IS_SETTING_VPN
 NM_IS_SETTING_VPN_CLASS
 NM_SETTING_VPN
 NM_SETTING_VPN_CLASS
-NM_SETTING_VPN_ERROR
 NM_SETTING_VPN_GET_CLASS
 NM_TYPE_SETTING_VPN
-NM_TYPE_SETTING_VPN_ERROR
-nm_setting_vpn_error_get_type
 nm_setting_vpn_get_type
 

 
@@ -745,6 +846,7 @@ nm_setting_vpn_get_type
 NMSettingWimax
 NMSettingWimaxClass
 NMSettingWimaxError
+NM_SETTING_WIMAX_ERROR
 NM_SETTING_WIMAX_MAC_ADDRESS
 NM_SETTING_WIMAX_NETWORK_NAME
 NM_SETTING_WIMAX_SETTING_NAME
@@ -757,11 +859,8 @@ NM_IS_SETTING_WIMAX
 NM_IS_SETTING_WIMAX_CLASS
 NM_SETTING_WIMAX
 NM_SETTING_WIMAX_CLASS
-NM_SETTING_WIMAX_ERROR
 NM_SETTING_WIMAX_GET_CLASS
 NM_TYPE_SETTING_WIMAX
-NM_TYPE_SETTING_WIMAX_ERROR
-nm_setting_wimax_error_get_type
 nm_setting_wimax_get_type
 
 
@@ -774,6 +873,7 @@ NMSettingWiredError
 NM_SETTING_WIRED_AUTO_NEGOTIATE
 NM_SETTING_WIRED_CLONED_MAC_ADDRESS
 NM_SETTING_WIRED_DUPLEX
+NM_SETTING_WIRED_ERROR
 NM_SETTING_WIRED_MAC_ADDRESS
 NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST
 NM_SETTING_WIRED_MTU
@@ -805,11 +905,8 @@ NM_IS_SETTING_WIRED
 NM_IS_SETTING_WIRED_CLASS
 NM_SETTING_WIRED
 NM_SETTING_WIRED_CLASS
-NM_SETTING_WIRED_ERROR
 NM_SETTING_WIRED_GET_CLASS
 NM_TYPE_SETTING_WIRED
-NM_TYPE_SETTING_WIRED_ERROR
-nm_setting_wired_error_get_type
 nm_setting_wired_get_type
 
 
@@ -823,6 +920,7 @@ NM_SETTING_WIRELESS_BAND
 NM_SETTING_WIRELESS_BSSID
 NM_SETTING_WIRELESS_CHANNEL
 NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS
+NM_SETTING_WIRELESS_ERROR
 NM_SETTING_WIRELESS_MAC_ADDRESS
 NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST
 NM_SETTING_WIRELESS_MODE
@@ -858,11 +956,8 @@ NM_IS_SETTING_WIRELESS
 NM_IS_SETTING_WIRELESS_CLASS
 NM_SETTING_WIRELESS
 NM_SETTING_WIRELESS_CLASS
-NM_SETTING_WIRELESS_ERROR
 NM_SETTING_WIRELESS_GET_CLASS
 NM_TYPE_SETTING_WIRELESS
-NM_TYPE_SETTING_WIRELESS_ERROR
-nm_setting_wireless_error_get_type
 nm_setting_wireless_get_type
 
 
@@ -874,6 +969,7 @@ NMSettingWirelessSecurityClass
 NMSettingWirelessSecurityError
 NMWepKeyType
 NM_SETTING_WIRELESS_SECURITY_AUTH_ALG
+NM_SETTING_WIRELESS_SECURITY_ERROR
 NM_SETTING_WIRELESS_SECURITY_GROUP
 NM_SETTING_WIRELESS_SECURITY_KEY_MGMT
 NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD
@@ -925,20 +1021,23 @@ NM_IS_SETTING_WIRELESS_SECURITY
 NM_IS_SETTING_WIRELESS_SECURITY_CLASS
 NM_SETTING_WIRELESS_SECURITY
 NM_SETTING_WIRELESS_SECURITY_CLASS
-NM_SETTING_WIRELESS_SECURITY_ERROR
 NM_SETTING_WIRELESS_SECURITY_GET_CLASS
 NM_TYPE_SETTING_WIRELESS_SECURITY
-NM_TYPE_SETTING_WIRELESS_SECURITY_ERROR
-nm_setting_wireless_security_error_get_type
 nm_setting_wireless_security_get_type
 
 
 

 nm-utils
 NMUtilsSecurityType
+NM_UTILS_HWADDR_LEN_MAX
 nm_utils_deinit
 nm_utils_escape_ssid
 nm_utils_gvalue_hash_dup
+nm_utils_hwaddr_atoba
+nm_utils_hwaddr_aton
+nm_utils_hwaddr_len
+nm_utils_hwaddr_ntoa
+nm_utils_hwaddr_type
 nm_utils_init
 nm_utils_ip4_addresses_from_gvalue
 nm_utils_ip4_addresses_to_gvalue
@@ -967,3 +1066,76 @@ nm_utils_wifi_freq_to_channel
 nm_utils_wifi_is_channel_valid
 

 
+

+nm-utils-enum-types
+
+NM_TYPE_CONNECTION_ERROR
+NM_TYPE_SETTING_802_1X_CK_FORMAT
+NM_TYPE_SETTING_802_1X_CK_SCHEME
+NM_TYPE_SETTING_802_1X_ERROR
+NM_TYPE_SETTING_BLUETOOTH_ERROR
+NM_TYPE_SETTING_BOND_ERROR
+NM_TYPE_SETTING_CDMA_ERROR
+NM_TYPE_SETTING_COMPARE_FLAGS
+NM_TYPE_SETTING_CONNECTION_ERROR
+NM_TYPE_SETTING_DIFF_RESULT
+NM_TYPE_SETTING_ERROR
+NM_TYPE_SETTING_GSM_ERROR
+NM_TYPE_SETTING_GSM_NETWORK_BAND
+NM_TYPE_SETTING_GSM_NETWORK_TYPE
+NM_TYPE_SETTING_HASH_FLAGS
+NM_TYPE_SETTING_INFINIBAND_ERROR
+NM_TYPE_SETTING_IP4_CONFIG_ERROR
+NM_TYPE_SETTING_IP6_CONFIG_ERROR
+NM_TYPE_SETTING_IP6_CONFIG_PRIVACY
+NM_TYPE_SETTING_OLPC_MESH_ERROR
+NM_TYPE_SETTING_PPPOE_ERROR
+NM_TYPE_SETTING_PPP_ERROR
+NM_TYPE_SETTING_SECRET_FLAGS
+NM_TYPE_SETTING_SERIAL_ERROR
+NM_TYPE_SETTING_VLAN_ERROR
+NM_TYPE_SETTING_VPN_ERROR
+NM_TYPE_SETTING_WIMAX_ERROR
+NM_TYPE_SETTING_WIRED_ERROR
+NM_TYPE_SETTING_WIRELESS_ERROR
+NM_TYPE_SETTING_WIRELESS_SECURITY_ERROR
+NM_TYPE_UTILS_SECURITY_TYPE
+NM_TYPE_VLAN_FLAGS
+NM_TYPE_VLAN_PRIORITY_MAP
+NM_TYPE_WEP_KEY_TYPE
+nm_connection_error_get_type
+nm_setting_802_1x_ck_format_get_type
+nm_setting_802_1x_ck_scheme_get_type
+nm_setting_802_1x_error_get_type
+nm_setting_bluetooth_error_get_type
+nm_setting_bond_error_get_type
+nm_setting_cdma_error_get_type
+nm_setting_compare_flags_get_type
+nm_setting_connection_error_get_type
+nm_setting_diff_result_get_type
+nm_setting_error_get_type
+nm_setting_gsm_error_get_type
+nm_setting_gsm_network_band_get_type
+nm_setting_gsm_network_type_get_type
+nm_setting_hash_flags_get_type
+nm_setting_infiniband_error_get_type
+nm_setting_ip4_config_error_get_type
+nm_setting_ip6_config_error_get_type
+nm_setting_ip6_config_privacy_get_type
+nm_setting_olpc_mesh_error_get_type
+nm_setting_ppp_error_get_type
+nm_setting_pppoe_error_get_type
+nm_setting_secret_flags_get_type
+nm_setting_serial_error_get_type
+nm_setting_vlan_error_get_type
+nm_setting_vpn_error_get_type
+nm_setting_wimax_error_get_type
+nm_setting_wired_error_get_type
+nm_setting_wireless_error_get_type
+nm_setting_wireless_security_error_get_type
+nm_utils_security_type_get_type
+nm_vlan_flags_get_type
+nm_vlan_priority_map_get_type
+nm_wep_key_type_get_type
+

+
diff --git a/docs/libnm-util/libnm-util.types b/docs/libnm-util/libnm-util.types
index af48d52a..72f62e06 100644
--- a/docs/libnm-util/libnm-util.types
+++ b/docs/libnm-util/libnm-util.types
@@ -4,30 +4,45 @@ nm_ip4_address_get_type
 nm_ip4_route_get_type
 nm_ip6_address_get_type
 nm_ip6_route_get_type
+nm_setting_802_1x_ck_format_get_type
+nm_setting_802_1x_ck_scheme_get_type
 nm_setting_802_1x_error_get_type
 nm_setting_802_1x_get_type
 nm_setting_bluetooth_error_get_type
 nm_setting_bluetooth_get_type
+nm_setting_bond_error_get_type
+nm_setting_bond_get_type
 nm_setting_cdma_error_get_type
 nm_setting_cdma_get_type
+nm_setting_compare_flags_get_type
 nm_setting_connection_error_get_type
 nm_setting_connection_get_type
+nm_setting_diff_result_get_type
 nm_setting_error_get_type
 nm_setting_get_type
 nm_setting_gsm_error_get_type
 nm_setting_gsm_get_type
+nm_setting_gsm_network_band_get_type
+nm_setting_gsm_network_type_get_type
+nm_setting_hash_flags_get_type
+nm_setting_infiniband_error_get_type
+nm_setting_infiniband_get_type
 nm_setting_ip4_config_error_get_type
 nm_setting_ip4_config_get_type
 nm_setting_ip6_config_error_get_type
 nm_setting_ip6_config_get_type
+nm_setting_ip6_config_privacy_get_type
 nm_setting_olpc_mesh_error_get_type
 nm_setting_olpc_mesh_get_type
 nm_setting_ppp_error_get_type
 nm_setting_ppp_get_type
 nm_setting_pppoe_error_get_type
 nm_setting_pppoe_get_type
+nm_setting_secret_flags_get_type
 nm_setting_serial_error_get_type
 nm_setting_serial_get_type
+nm_setting_vlan_error_get_type
+nm_setting_vlan_get_type
 nm_setting_vpn_error_get_type
 nm_setting_vpn_get_type
 nm_setting_wimax_error_get_type
@@ -38,3 +53,7 @@ nm_setting_wireless_error_get_type
 nm_setting_wireless_get_type
 nm_setting_wireless_security_error_get_type
 nm_setting_wireless_security_get_type
+nm_utils_security_type_get_type
+nm_vlan_flags_get_type
+nm_vlan_priority_map_get_type
+nm_wep_key_type_get_type
diff --git a/docs/libnm-util/tmpl/libnm-util-unused.sgml b/docs/libnm-util/tmpl/libnm-util-unused.sgml
index e69de29b..26fd8b52 100644
--- a/docs/libnm-util/tmpl/libnm-util-unused.sgml
+++ b/docs/libnm-util/tmpl/libnm-util-unused.sgml
@@ -0,0 +1,260 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+NMSettingAdsl
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+
+
+
+
+
+
+@NM_SETTING_ADSL_ERROR_UNKNOWN: 
+@NM_SETTING_ADSL_ERROR_INVALID_PROPERTY: 
+@NM_SETTING_ADSL_ERROR_MISSING_PROPERTY: 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@connection: 
+@Returns: 
+
+
+
+
+
+
+@void: 
+@Returns: 
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+@void: 
+@Returns: 
+
diff --git a/docs/libnm-util/tmpl/nm-connection.sgml b/docs/libnm-util/tmpl/nm-connection.sgml
index ddbbcf74..434e0d1b 100644
--- a/docs/libnm-util/tmpl/nm-connection.sgml
+++ b/docs/libnm-util/tmpl/nm-connection.sgml
@@ -9,13 +9,11 @@ NMConnection
 
 
 
-
 
 
 
 
 
-
 
 
 
@@ -66,6 +64,13 @@ NMConnection
 @NM_CONNECTION_ERROR_CONNECTION_TYPE_INVALID: 
 @NM_CONNECTION_ERROR_SETTING_NOT_FOUND: 
 
+
+
+
+
+
+
+
 
 
 
@@ -214,6 +219,15 @@ NMConnection
 @Returns: 
 
 
+
+
+
+
+
+@connection: 
+@Returns: 
+
+
 
 
 
@@ -251,6 +265,15 @@ NMConnection
 @Returns: 
 
 
+
+
+
+
+
+@connection: 
+@Returns: 
+
+
 
 
 
@@ -296,6 +319,24 @@ NMConnection
 @Returns: 
 
 
+
+
+
+
+
+@connection: 
+@Returns: 
+
+
+
+
+
+
+
+@connection: 
+@Returns: 
+
+
 
 
 
@@ -350,6 +391,15 @@ NMConnection
 @Returns: 
 
 
+
+
+
+
+
+@connection: 
+@Returns: 
+
+
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-8021x.sgml b/docs/libnm-util/tmpl/nm-setting-8021x.sgml
index 50256d11..10775224 100644
--- a/docs/libnm-util/tmpl/nm-setting-8021x.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-8021x.sgml
@@ -9,13 +9,11 @@ NMSetting8021x
 
 
 
-
 
 
 
 
 
-
 
 
 
@@ -63,6 +61,11 @@ NMSetting8021x
 
 
 
+
+
+
+
+
 
 
 
@@ -73,6 +76,16 @@ NMSetting8021x
 
 
 
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -244,6 +257,13 @@ NMSetting8021x
 
 
 
+
+
+
+
+
+
+
 
 
 
@@ -251,6 +271,13 @@ NMSetting8021x
 
 
 
+
+
+
+
+
+
+
 
 
 
@@ -265,6 +292,20 @@ NMSetting8021x
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -603,6 +644,15 @@ NMSetting8021x
 @Returns: 
 
 
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
 
 
 
@@ -621,6 +671,24 @@ NMSetting8021x
 @Returns: 
 
 
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-adsl.sgml b/docs/libnm-util/tmpl/nm-setting-adsl.sgml
new file mode 100644
index 00000000..d81ae07f
--- /dev/null
+++ b/docs/libnm-util/tmpl/nm-setting-adsl.sgml
@@ -0,0 +1,262 @@
+
+NMSettingAdsl
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+
+
+
+
+
+
+@NM_SETTING_ADSL_ERROR_UNKNOWN: 
+@NM_SETTING_ADSL_ERROR_INVALID_PROPERTY: 
+@NM_SETTING_ADSL_ERROR_MISSING_PROPERTY: 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@void: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@void: 
+@Returns: 
+
+
diff --git a/docs/libnm-util/tmpl/nm-setting-bluetooth.sgml b/docs/libnm-util/tmpl/nm-setting-bluetooth.sgml
index ef059fad..9ab1b4b2 100644
--- a/docs/libnm-util/tmpl/nm-setting-bluetooth.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-bluetooth.sgml
@@ -9,13 +9,11 @@ NMSettingBluetooth
 
 
 
-
 
 
 
 
 
-
 
 
 
@@ -66,6 +64,13 @@ NMSettingBluetooth
 
 
 
+
+
+
+
+
+
+
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-bond.sgml b/docs/libnm-util/tmpl/nm-setting-bond.sgml
new file mode 100644
index 00000000..8f7dbfc1
--- /dev/null
+++ b/docs/libnm-util/tmpl/nm-setting-bond.sgml
@@ -0,0 +1,228 @@
+
+NMSettingBond
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+
+
+
+
+
+
+@NM_SETTING_BOND_ERROR_UNKNOWN: 
+@NM_SETTING_BOND_ERROR_INVALID_PROPERTY: 
+@NM_SETTING_BOND_ERROR_MISSING_PROPERTY: 
+@NM_SETTING_BOND_ERROR_INVALID_OPTION: 
+@NM_SETTING_BOND_ERROR_MISSING_OPTION: 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@setting: 
+@name: 
+@value: 
+@Returns: 
+
+
+
+
+
+
+
+@void: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@idx: 
+@out_name: 
+@out_value: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@name: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@name: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@void: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@name: 
+@Returns: 
+
+
diff --git a/docs/libnm-util/tmpl/nm-setting-cdma.sgml b/docs/libnm-util/tmpl/nm-setting-cdma.sgml
index 9a23158a..7837016d 100644
--- a/docs/libnm-util/tmpl/nm-setting-cdma.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-cdma.sgml
@@ -9,13 +9,11 @@ NMSettingCdma
 
 
 
-
 
 
 
 
 
-
 
 
 
@@ -69,6 +67,13 @@ NMSettingCdma
 @NM_SETTING_CDMA_ERROR_MISSING_PROPERTY: 
 @NM_SETTING_CDMA_ERROR_MISSING_SERIAL_SETTING: 
 
+
+
+
+
+
+
+
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-connection.sgml b/docs/libnm-util/tmpl/nm-setting-connection.sgml
index 7bbce879..cee42ea4 100644
--- a/docs/libnm-util/tmpl/nm-setting-connection.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-connection.sgml
@@ -9,13 +9,11 @@ NMSettingConnection
 
 
 
-
 
 
 
 
 
-
 
 
 
@@ -38,6 +36,11 @@ NMSettingConnection
 
 
 
+
+
+
+
+
 
 
 
@@ -48,6 +51,11 @@ NMSettingConnection
 
 
 
+
+
+
+
+
 
 
 
@@ -63,6 +71,11 @@ NMSettingConnection
 
 
 
+
+
+
+
+
 
 
 
@@ -83,6 +96,7 @@ NMSettingConnection
 @NM_SETTING_CONNECTION_ERROR_INVALID_PROPERTY: 
 @NM_SETTING_CONNECTION_ERROR_MISSING_PROPERTY: 
 @NM_SETTING_CONNECTION_ERROR_TYPE_SETTING_NOT_FOUND: 
+@NM_SETTING_CONNECTION_ERROR_IP_CONFIG_NOT_ALLOWED: 
 
 
 
@@ -91,6 +105,13 @@ NMSettingConnection
 
 
 
+
+
+
+
+
+
+
 
 
 
@@ -98,6 +119,13 @@ NMSettingConnection
 
 
 
+
+
+
+
+
+
+
 
 
 
@@ -119,6 +147,13 @@ NMSettingConnection
 
 
 
+
+
+
+
+
+
+
 
 
 
@@ -140,6 +175,48 @@ NMSettingConnection
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -188,6 +265,15 @@ NMSettingConnection
 @Returns: 
 
 
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
 
 
 
@@ -219,6 +305,15 @@ NMSettingConnection
 @Returns: 
 
 
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
 
 
 
@@ -237,6 +332,25 @@ NMSettingConnection
 @Returns: 
 
 
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@type: 
+@Returns: 
+
+
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-gsm.sgml b/docs/libnm-util/tmpl/nm-setting-gsm.sgml
index 7d572ddb..5a6a3c48 100644
--- a/docs/libnm-util/tmpl/nm-setting-gsm.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-gsm.sgml
@@ -9,13 +9,11 @@ NMSettingGsm
 
 
 
-
 
 
 
 
 
-
 
 
 
@@ -150,6 +148,13 @@ NMSettingGsm
 
 
 
+
+
+
+
+
+
+
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-infiniband.sgml b/docs/libnm-util/tmpl/nm-setting-infiniband.sgml
new file mode 100644
index 00000000..ba7117c0
--- /dev/null
+++ b/docs/libnm-util/tmpl/nm-setting-infiniband.sgml
@@ -0,0 +1,143 @@
+
+NMSettingInfiniband
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+
+
+
+
+
+
+@NM_SETTING_INFINIBAND_ERROR_UNKNOWN: 
+@NM_SETTING_INFINIBAND_ERROR_INVALID_PROPERTY: 
+@NM_SETTING_INFINIBAND_ERROR_MISSING_PROPERTY: 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@void: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@void: 
+@Returns: 
+
+
diff --git a/docs/libnm-util/tmpl/nm-setting-ip4-config.sgml b/docs/libnm-util/tmpl/nm-setting-ip4-config.sgml
index 9d710571..fbc1b4cc 100644
--- a/docs/libnm-util/tmpl/nm-setting-ip4-config.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-ip4-config.sgml
@@ -9,13 +9,11 @@ NMSettingIP4Config
 
 
 
-
 
 
 
 
 
-
 
 
 
@@ -163,6 +161,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 959a0e28..400bfced 100644
--- a/docs/libnm-util/tmpl/nm-setting-ip6-config.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-ip6-config.sgml
@@ -9,13 +9,11 @@ NMSettingIP6Config
 
 
 
-
 
 
 
 
 
-
 
 
 
@@ -65,6 +63,11 @@ NMSettingIP6Config
 
 
 
+
+
+
+
+
 
 
 
@@ -106,6 +109,16 @@ NMSettingIP6Config
 @NM_SETTING_IP6_CONFIG_ERROR_MISSING_PROPERTY: 
 @NM_SETTING_IP6_CONFIG_ERROR_NOT_ALLOWED_FOR_METHOD: 
 
+
+
+
+
+
+@NM_SETTING_IP6_CONFIG_PRIVACY_UNKNOWN: 
+@NM_SETTING_IP6_CONFIG_PRIVACY_DISABLED: 
+@NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_PUBLIC_ADDR: 
+@NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_TEMP_ADDR: 
+
 
 
 
@@ -127,6 +140,13 @@ NMSettingIP6Config
 
 
 
+
+
+
+
+
+
+
 
 
 
@@ -141,6 +161,13 @@ NMSettingIP6Config
 
 
 
+
+
+
+
+
+
+
 
 
 
@@ -561,6 +588,15 @@ NMSettingIP6Config
 @Returns: 
 
 
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml b/docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml
index 4db8508e..744c87e3 100644
--- a/docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml
@@ -9,13 +9,11 @@ NMSettingOlpcMesh
 
 
 
-
 
 
 
 
 
-
 
 
 
@@ -77,6 +75,13 @@ NMSettingOlpcMesh
 
 
 
+
+
+
+
+
+
+
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-ppp.sgml b/docs/libnm-util/tmpl/nm-setting-ppp.sgml
index 34647654..f26d56fa 100644
--- a/docs/libnm-util/tmpl/nm-setting-ppp.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-ppp.sgml
@@ -9,13 +9,11 @@ NMSettingPPP
 
 
 
-
 
 
 
 
 
-
 
 
 
@@ -153,6 +151,13 @@ NMSettingPPP
 
 
 
+
+
+
+
+
+
+
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-pppoe.sgml b/docs/libnm-util/tmpl/nm-setting-pppoe.sgml
index d5772a87..942b5a04 100644
--- a/docs/libnm-util/tmpl/nm-setting-pppoe.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-pppoe.sgml
@@ -9,13 +9,11 @@ NMSettingPPPOE
 
 
 
-
 
 
 
 
 
-
 
 
 
@@ -69,6 +67,13 @@ NMSettingPPPOE
 @NM_SETTING_PPPOE_ERROR_MISSING_PROPERTY: 
 @NM_SETTING_PPPOE_ERROR_MISSING_PPP_SETTING: 
 
+
+
+
+
+
+
+
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-private.sgml b/docs/libnm-util/tmpl/nm-setting-private.sgml
index b9740165..b5cdc70e 100644
--- a/docs/libnm-util/tmpl/nm-setting-private.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-private.sgml
@@ -9,13 +9,11 @@ nm-setting-private
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-serial.sgml b/docs/libnm-util/tmpl/nm-setting-serial.sgml
index 6a43dc3f..542b9fbc 100644
--- a/docs/libnm-util/tmpl/nm-setting-serial.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-serial.sgml
@@ -9,13 +9,11 @@ NMSettingSerial
 
 
 
-
 
 
 
 
 
-
 
 
 
@@ -88,6 +86,13 @@ NMSettingSerial
 
 
 
+
+
+
+
+
+
+
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-vlan.sgml b/docs/libnm-util/tmpl/nm-setting-vlan.sgml
new file mode 100644
index 00000000..79cb88db
--- /dev/null
+++ b/docs/libnm-util/tmpl/nm-setting-vlan.sgml
@@ -0,0 +1,270 @@
+
+NMSettingVlan
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+
+
+
+
+
+
+@NM_SETTING_VLAN_ERROR_UNKNOWN: 
+@NM_SETTING_VLAN_ERROR_INVALID_PROPERTY: 
+@NM_SETTING_VLAN_ERROR_MISSING_PROPERTY: 
+
+
+
+
+
+
+@NM_VLAN_FLAG_REORDER_HEADERS: 
+@NM_VLAN_FLAG_GVRP: 
+@NM_VLAN_FLAG_LOOSE_BINDING: 
+
+
+
+
+
+
+@NM_VLAN_INGRESS_MAP: 
+@NM_VLAN_EGRESS_MAP: 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@setting: 
+@map: 
+@from: 
+@to: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@map: 
+@str: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@map: 
+
+
+
+
+
+
+
+@void: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@map: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@map: 
+@idx: 
+@out_from: 
+@out_to: 
+@Returns: 
+
+
+
+
+
+
+
+@void: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@map: 
+@idx: 
+
+
diff --git a/docs/libnm-util/tmpl/nm-setting-vpn.sgml b/docs/libnm-util/tmpl/nm-setting-vpn.sgml
index e7b724f2..e29dfff9 100644
--- a/docs/libnm-util/tmpl/nm-setting-vpn.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-vpn.sgml
@@ -9,13 +9,11 @@ NMSettingVPN
 
 
 
-
 
 
 
 
 
-
 
 
 
@@ -85,6 +83,13 @@ NMSettingVPN
 
 
 
+
+
+
+
+
+
+
 
 
 
@@ -172,6 +177,24 @@ NMSettingVPN
 @Returns: 
 
 
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-wimax.sgml b/docs/libnm-util/tmpl/nm-setting-wimax.sgml
index 733fe165..9225504a 100644
--- a/docs/libnm-util/tmpl/nm-setting-wimax.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-wimax.sgml
@@ -9,13 +9,11 @@ NMSettingWimax
 
 
 
-
 
 
 
 
 
-
 
 
 
@@ -54,6 +52,13 @@ NMSettingWimax
 @NM_SETTING_WIMAX_ERROR_INVALID_PROPERTY: 
 @NM_SETTING_WIMAX_ERROR_MISSING_PROPERTY: 
 
+
+
+
+
+
+
+
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-wired.sgml b/docs/libnm-util/tmpl/nm-setting-wired.sgml
index c3872575..cff79594 100644
--- a/docs/libnm-util/tmpl/nm-setting-wired.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-wired.sgml
@@ -9,13 +9,11 @@ NMSettingWired
 
 
 
-
 
 
 
 
 
-
 
 
 
@@ -124,6 +122,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 6fec769c..d653c682 100644
--- a/docs/libnm-util/tmpl/nm-setting-wireless-security.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-wireless-security.sgml
@@ -9,13 +9,11 @@ NMSettingWirelessSecurity
 
 
 
-
 
 
 
 
 
-
 
 
 
@@ -154,6 +152,13 @@ NMSettingWirelessSecurity
 
 
 
+
+
+
+
+
+
+
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-wireless.sgml b/docs/libnm-util/tmpl/nm-setting-wireless.sgml
index d3ce038f..3790e252 100644
--- a/docs/libnm-util/tmpl/nm-setting-wireless.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-wireless.sgml
@@ -9,13 +9,11 @@ NMSettingWireless
 
 
 
-
 
 
 
 
 
-
 
 
 
@@ -143,6 +141,13 @@ NMSettingWireless
 
 
 
+
+
+
+
+
+
+
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting.sgml b/docs/libnm-util/tmpl/nm-setting.sgml
index 912a47c6..a5198c10 100644
--- a/docs/libnm-util/tmpl/nm-setting.sgml
+++ b/docs/libnm-util/tmpl/nm-setting.sgml
@@ -9,13 +9,11 @@ NMSetting
 
 
 
-
 
 
 
 
 
-
 
 
 
@@ -46,8 +44,8 @@ NMSetting
 @set_secret_flags: 
 @compare_property: 
 @clear_secrets_with_flags: 
+@get_virtual_iface_name: 
 @_reserved1: 
-@_reserved2: 
 
 
 
@@ -123,6 +121,13 @@ NMSetting
 @user_data: 
 
 
+
+
+
+
+
+
+
 
 
 
@@ -249,6 +254,15 @@ NMSetting
 @Returns: 
 
 
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-utils-enum-types.sgml b/docs/libnm-util/tmpl/nm-utils-enum-types.sgml
new file mode 100644
index 00000000..5171db34
--- /dev/null
+++ b/docs/libnm-util/tmpl/nm-utils-enum-types.sgml
@@ -0,0 +1,22 @@
+
+nm-utils-enum-types
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/docs/libnm-util/tmpl/nm-utils.sgml b/docs/libnm-util/tmpl/nm-utils.sgml
index 0d77c832..9195b502 100644
--- a/docs/libnm-util/tmpl/nm-utils.sgml
+++ b/docs/libnm-util/tmpl/nm-utils.sgml
@@ -9,13 +9,11 @@ nm-utils
 
 
 
-
 
 
 
 
 
-
 
 
 
@@ -37,6 +35,13 @@ nm-utils
 @NMU_SEC_WPA2_PSK: 
 @NMU_SEC_WPA2_ENTERPRISE: 
 
+
+
+
+
+
+
+
 
 
 
@@ -64,6 +69,55 @@ nm-utils
 @Returns: 
 
 
+
+
+
+
+
+@asc: 
+@type: 
+@Returns: 
+
+
+
+
+
+
+
+@asc: 
+@type: 
+@buffer: 
+@Returns: 
+
+
+
+
+
+
+
+@type: 
+@Returns: 
+
+
+
+
+
+
+
+@addr: 
+@type: 
+@Returns: 
+
+
+
+
+
+
+
+@len: 
+@Returns: 
+
+
 
 
 
-- 
cgit 1.3.0-6-gf8a5